diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-06 14:38:28 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-06 14:38:28 +0100 |
commit | 0ae7d8427394d5f98fb2bd78eaae9bf848831186 (patch) | |
tree | e15a6321eedcbf9a2ae55ce24e7d8960f233b5ef /app/lib | |
parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
parent | 42d9ca21de298e1d51b87723745f2b17e4169894 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`
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 |