Skip to content

Commit

Permalink
Fix mention processing for unknwon accounts on incoming ActivityPub N…
Browse files Browse the repository at this point in the history
…otes (mastodon#10125)

`::FetchRemoteAccountService` is not `ActivityPub::FetchRemoteAccountService`,
its second argument is the pre-fetched body. Passing `id: false` actually passed
a `Hash` as the prefetched body, instead of properly resolving unknown remote
accounts.
  • Loading branch information
ClearlyClaire authored and Gargron committed Feb 27, 2019
1 parent cac884f commit 0a43c2c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/lib/activitypub/activity/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def process_mention(tag)
return if tag['href'].blank?

account = account_from_uri(tag['href'])
account = ::FetchRemoteAccountService.new.call(tag['href'], id: false) if account.nil?
account = ::FetchRemoteAccountService.new.call(tag['href']) if account.nil?

return if account.nil?

Expand Down

0 comments on commit 0a43c2c

Please sign in to comment.