diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-20 18:06:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 18:06:40 +0200 |
| commit | 97da7b73071e9f515c4bb0bca72c88d1a13b14aa (patch) | |
| tree | 89c81064b9e3725962a847e98099a5b84b728733 /app/lib/activitypub | |
| parent | df326b8b5c0659edb2aca77690a892f228b0e099 (diff) | |
| parent | 4b115d070c9a8b6082ed207bd0a14e809eded322 (diff) | |
Merge pull request #1521 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 5 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/flag.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index f10fc5f43..3a73f29ae 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -88,7 +88,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity resolve_thread(@status) fetch_replies(@status) - check_for_spam distribute(@status) forward_for_reply end @@ -498,10 +497,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity Tombstone.exists?(uri: object_uri) end - def check_for_spam - SpamCheck.perform(@status) - end - def forward_for_reply return unless @status.distributable? && @json['signature'].present? && reply_to_local? diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb index 8dfc76f0a..b0443849a 100644 --- a/app/lib/activitypub/activity/flag.rb +++ b/app/lib/activitypub/activity/flag.rb @@ -10,6 +10,8 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity target_accounts.each do |target_account| target_statuses = target_statuses_by_account[target_account.id] + next if target_account.suspended? + ReportService.new.call( @account, target_account, |