Skip to content

Commit

Permalink
Fix code referencing wrong class (mastodon#12263)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ClearlyClaire authored and Gargron committed Nov 4, 2019
1 parent 3db3c10 commit e37358b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/lib/activitypub/activity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def follow_request_from_object
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
Expand Down

0 comments on commit e37358b

Please sign in to comment.