diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 97a9461f41..d60ab5b113 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -443,9 +443,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity elsif audience_searchable_by.any? { |uri| ActivityPub::TagManager.instance.public_collection?(uri) } :public elsif audience_searchable_by.include?(@account.followers_url) - :private + :unlisted # Followers only in kmyblue (generics: private) else - :direct + :private # Reaction only in kmyblue (generics: direct) end end diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index 4ff3567c8e..bd9706fc42 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -191,8 +191,10 @@ class ActivityPub::TagManager case status.compute_searchability when 'public' [COLLECTIONS[:public]] - when 'unlisted', 'private' + when 'unlisted' # Followers only in kmyblue (generics: private) [account_followers_url(status.account)] + when 'private' # Reaction only in kmyblue (generics: direct) + [] when 'limited' status.conversation_id.present? ? [uri_for(status.conversation)] : [] else diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 85710f63ba..b7d889904a 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -67,7 +67,6 @@ class SearchService < BaseService account_ids = results.map(&:account_id) account_domains = results.map(&:account_domain) 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? } rescue Faraday::ConnectionFailed, Parslet::ParseFailed