monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not rely on activity arriving exactly once after delete arrived (#4754)

This commit is contained in:
Eugen Rochko 2017-09-01 21:12:59 +02:00 committed by GitHub
parent a75aa62f5b
commit c2980d5b17
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/activitypub/activity.rb
View File

@ -97,14 +97,7 @@ class ActivityPub::Activity
end end
def delete_arrived_first?(uri) def delete_arrived_first?(uri)
key = "delete_upon_arrival:#{@account.id}:#{uri}" redis.exists("delete_upon_arrival:#{@account.id}:#{uri}")
if redis.exists(key)
redis.del(key)
true
else
false
end
end end
def delete_later!(uri) def delete_later!(uri)

12
app/lib/activitypub/activity/delete.rb
View File

@ -5,12 +5,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
status = Status.find_by(uri: object_uri, account: @account) status = Status.find_by(uri: object_uri, account: @account)
status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present? status ||= Status.find_by(uri: @object['_:atomUri'], account: @account) if @object.is_a?(Hash) && @object['_:atomUri'].present?
if status.nil? delete_later!(object_uri)
delete_later!(object_uri)
else return if status.nil?
forward_for_reblogs(status)
delete_now!(status) forward_for_reblogs(status)
end delete_now!(status)
end end
private private