diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 22:31:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 22:31:21 +0100 |
| commit | c8ef003c6b40e9b7212f43f1b5706b0967fcfe8a (patch) | |
| tree | 7ab6dc75943d22b27df0ac411483b34f79e72211 /app/lib/activitypub/activity/announce.rb | |
| parent | ec4f9066189fbab4368a275e9cd654dc7ad48217 (diff) | |
| parent | 41a8606627216e8ed32fb562d245327e5985ba2d (diff) | |
Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/activity/announce.rb')
| -rw-r--r-- | app/lib/activitypub/activity/announce.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb index 1f9319290..12fad8da4 100644 --- a/app/lib/activitypub/activity/announce.rb +++ b/app/lib/activitypub/activity/announce.rb @@ -8,6 +8,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity original_status = status_from_object return reject_payload! if original_status.nil? || !announceable?(original_status) + return if requested_through_relay? @status = Status.find_by(account: @account, reblog: original_status) |