diff options
| author | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
| commit | 4d77314005483e53e320a82c87805c6bcca1c463 (patch) | |
| tree | 99f5b05bcbb1e8278517bf9a8f9ab114ab2dec45 /app/lib/activitypub/activity/announce.rb | |
| parent | e356a902d23a0ed87c62717085a37d34550c8464 (diff) | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/activitypub/activity/announce.rb')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 9f8ffd9fb..1aa6ee9ec 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -47,6 +47,10 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity followed_by_local_accounts? || requested_through_relay? || reblog_of_local_status? end + def requested_through_relay? + super || Relay.find_by(inbox_url: @account.inbox_url)&.enabled? + end + def reblog_of_local_status? status_from_uri(object_uri)&.account&.local? end |