diff options
author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/lib/activitypub/activity.rb | |
parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 58cec7ac4..0ce279d28 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -185,7 +185,7 @@ class ActivityPub::Activity end def followed_by_local_accounts? - @account.passive_relationships.exists? + @account.passive_relationships.exists? || @options[:relayed_through_account]&.passive_relationships&.exists? end def requested_through_relay? |