gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Wip: Fix searchability value

Browse source
This commit is contained in:
KMY 2023-04-06 13:10:29 +09:00
parent 165882a985
commit 502761c0ad
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/activitypub/activity/create.rb
View file

@ -443,9 +443,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
elsif audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) } elsif audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) }
:public :public
elsif audience_searchable_by.include?(@account.followers_url) elsif audience_searchable_by.include?(@account.followers_url)
:private :unlisted # Followers only in kmyblue (generics: private)
else else
:direct :private # Reaction only in kmyblue (generics: direct)
end end
end end

4
app/lib/activitypub/tag_manager.rb
View file

@ -191,8 +191,10 @@ class ActivityPub::TagManager
case status.compute_searchability case status.compute_searchability
when 'public' when 'public'
[COLLECTIONS[:public]] [COLLECTIONS[:public]]
when 'unlisted', 'private' when 'unlisted' # Followers only in kmyblue (generics: private)
[account_followers_url(status.account)] [account_followers_url(status.account)]
when 'private' # Reaction only in kmyblue (generics: direct)
[]
when 'limited' when 'limited'
status.conversation_id.present? ? [uri_for(status.conversation)] : [] status.conversation_id.present? ? [uri_for(status.conversation)] : []
else else

1
app/services/search_service.rb
View file

@ -67,7 +67,6 @@ class SearchService < BaseService
account_ids = results.map(&:account_id) account_ids = results.map(&:account_id)
account_domains = results.map(&:account_domain) account_domains = results.map(&:account_domain)
account_relations = relations_map_for_account(@account, account_ids, account_domains) # old name: preloaded_relations account_relations = relations_map_for_account(@account, account_ids, account_domains) # old name: preloaded_relations
status_relations = relations_map_for_status(@account, results)
results.reject { |status| StatusFilter.new(status, @account, account_relations).filtered? } results.reject { |status| StatusFilter.new(status, @account, account_relations).filtered? }
rescue Faraday::ConnectionFailed, Parslet::ParseFailed rescue Faraday::ConnectionFailed, Parslet::ParseFailed