diff options
author | Starfall <us@starfall.systems> | 2021-01-13 13:39:46 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-01-13 13:39:46 -0600 |
commit | 65263e6309fb4dea1a93d4b4806af629d317c156 (patch) | |
tree | 8a142dea5cc3d4081f551c02e953976d3c0930bf /app/controllers/activitypub/inboxes_controller.rb | |
parent | 29227b32e150894e15098bcf216b1f5c08763200 (diff) | |
parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/activitypub/inboxes_controller.rb')
-rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index d3044f180..92dcb5ac7 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -5,7 +5,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController include JsonLdHelper include AccountOwnedConcern - before_action :skip_unknown_actor_delete + before_action :skip_unknown_actor_activity before_action :require_signature! skip_before_action :authenticate_user! @@ -18,13 +18,13 @@ class ActivityPub::InboxesController < ActivityPub::BaseController private - def skip_unknown_actor_delete - head 202 if unknown_deleted_account? + def skip_unknown_actor_activity + head 202 if unknown_affected_account? end - def unknown_deleted_account? + def unknown_affected_account? json = Oj.load(body, mode: :strict) - json.is_a?(Hash) && json['type'] == 'Delete' && 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.where(uri: json['actor']).exists? rescue Oj::ParseError false end |