specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix code referencing wrong class (#12263)

Browse source 
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
This commit is contained in:
ThibG 2019-11-04 13:02:27 +01:00 committed by Eugen Rochko
parent 3db3c10762
commit e37358b3bc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity.rb
View file

@ -158,7 +158,7 @@ class ActivityPub::Activity
end end
def follow_from_object def follow_from_object
@follow ||= Follow.find_by(target_account: @account, uri: object_uri) unless object_uri.nil? @follow ||= ::Follow.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
end end
def fetch_remote_original_status def fetch_remote_original_status