Merge branch 'master' into glitch-soc/merge-upstream

2019-02-17 15:43:12 +01:00
parent ec18359c3d 1a1b8170bb
commit f6a4493a58
2 changed files with 32 additions and 14 deletions
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -150,8 +150,7 @@ class ActivityPub::Activity
      end
    end

-    # If the status is not from the actor, try to fetch it
-    return fetch_remote_original_status if value_or_id(first_of_value(@json['attributedTo'])) == @account.uri
+    fetch_remote_original_status
  end

  def fetch_remote_original_status