diff options
| author | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-11-13 20:03:31 -0500 |
| commit | 61a70e595d9ec7a6937d31b36d33063520cf1385 (patch) | |
| tree | 6d7697e892f9324a5d6f00ed933606fea25fd871 /app/lib/activitypub/activity.rb | |
| parent | 48635bf45f6402c8f82d4cb66fa42e3e5e8f30c2 (diff) | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/activitypub/activity.rb')
| -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 |