Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-01-26 20:47:20 +01:00
parent ae9c675930 3205a654ca
commit 5fa2821853
94 changed files with 994 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/activitypub/inboxes_controller.rb
View File

@@ -24,7 +24,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController
def unknown_affected_account?
json = Oj.load(body, mode: :strict)
json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.where(uri: json['actor']).exists?
json.is_a?(Hash) && %w(Delete Update).include?(json['type']) && json['actor'].present? && json['actor'] == value_or_id(json['object']) && !Account.exists?(uri: json['actor'])
rescue Oj::ParseError
false
end