Merge commit from fork

This commit is contained in:
Claire
2026-01-20 15:13:43 +01:00
committed by GitHub
parent 7a0d3d3bf8
commit 841dfce9f7
2 changed files with 4 additions and 1 deletions

View File

@@ -30,7 +30,8 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
@status = Status.find_by(uri: object_uri, account_id: @account.id)
# Ignore updates for old unknown objects, since those are updates we are not interested in
return if @status.nil? && object_too_old?
# Also ignore unknown objects from suspended users for the same reasons
return if @status.nil? && (@account.suspended? || object_too_old?)
# We may be getting `Create` and `Update` out of order
@status ||= ActivityPub::Activity::Create.new(@json, @account, **@options).perform