Revert "Fix handling of ActivityPub activities lacking some attributes (

mastodon#8864)" This reverts commit c2f31d9.
akane-blue · Nov 1, 2018 · c68b915 · c68b915
1 parent 9fcd9b3
commit c68b915
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb
@@ -26,7 +26,7 @@ def accept_follow_for_relay
   end
 
   def relay
-    @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
+    @relay ||= Relay.find_by(follow_activity_id: object_uri)
   end
 
   def relay_follow?

diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
@@ -17,8 +17,6 @@ def delete_person
   end
 
   def delete_note
-    return if object_uri.nil?
-
     @status   = Status.find_by(uri: object_uri, account: @account)
     @status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
 

diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
@@ -28,7 +28,7 @@ def reject_follow_for_relay
   end
 
   def relay
-    @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
+    @relay ||= Relay.find_by(follow_activity_id: object_uri)
   end
 
   def relay_follow?

diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb
@@ -19,8 +19,6 @@ def perform
   private
 
   def undo_announce
-    return if object_uri.nil?
-
     status   = Status.find_by(uri: object_uri, account: @account)
     status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?