post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add: #586 保留中のリモートアカウントからのフォローが飛んできた場合に記録する (#590)

Browse source 
* Add: #586 保留中のリモートアカウントからのフォローが飛んできた場合に記録する

* 本家に戻す処理を修正

* Fix test

* Fix worker link

* Fix test

* リモートアカウント拒否時に既存のリクエストを削除
This commit is contained in:
KMY（雪あすか） 2024-02-18 10:48:48 +09:00 • committed by GitHub
parent 1b3c0e3fb7
commit dfc9f35d71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 262 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/services/activitypub/process_collection_service.rb
View file

@ -48,13 +48,17 @@ class ActivityPub::ProcessCollectionService < BaseService
end
def suspended_actor?
@account.suspended? && !activity_allowed_while_suspended?
@account.suspended? && (@account.remote_pending ? !activity_allowed_while_remote_pending? : !activity_allowed_while_suspended?)
end
def activity_allowed_while_suspended?
%w(Delete Reject Undo Update).include?(@json['type'])
end
def activity_allowed_while_remote_pending?
%w(Follow).include?(@json['type']) || activity_allowed_while_suspended?
end
def process_items(items)
items.reverse_each.filter_map { |item| process_item(item) }
end