Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00:00
parent 8ee6ed358f 74c1c9ec01
commit 0c7dc6c781
13 changed files with 51 additions and 13 deletions
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -30,7 +30,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
  end

  def actor_id
-    first_of_value(@json['attributedTo'])
+    value_or_id(first_of_value(@json['attributedTo']))
  end

  def trustworthy_attribution?(uri, attributed_to)