diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-04 13:02:27 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-11-04 13:02:27 +0100 |
| commit | e37358b3bcc6d8a5d29e2bcdcc862e0561abec17 (patch) | |
| tree | ef56a42a9b13078eb07e11dcf199589e284f0b74 /app/lib | |
| parent | 3db3c107629a96c60657a615d186e32bb8a5476a (diff) | |
Fix code referencing wrong class (#12263)
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.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 5cd48a6ae..cdd406043 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -158,7 +158,7 @@ class ActivityPub::Activity end 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 def fetch_remote_original_status |