Fix searchability values

This commit is contained in:
KMY 2023-04-06 13:50:08 +09:00
parent af7c325998
commit 60d54b847e
2 changed files with 7 additions and 2 deletions

View file

@ -358,7 +358,12 @@ class Status < ApplicationRecord
end
def compute_searchability
searchability || Status.searchabilities.invert.fetch([Account.searchabilities[account.searchability], Status.visibilities[visibility] || 0].max, nil) || 'direct'
# Fedibird code
#searchability || Status.searchabilities.invert.fetch([Account.searchabilities[account.searchability], Status.visibilities[visibility] || 0].max, nil) || 'direct'
# Reactions only (generic: direct)
return searchability if searchability
return account.searchability if account.local? && account.searchability
'private'
end
after_create_commit :increment_counter_caches

View file

@ -77,7 +77,7 @@ class PostStatusService < BaseService
def searchability
case @options[:searchability]&.to_sym
when :public
case @visibility&.to_sym when :public, :public_unlisted then :public when :unlisted, :private then :private else :direct end
case @visibility&.to_sym when :public, :public_unlisted then :public when :unlisted then :unlisted when :private then :private else :direct end
when :unlisted
case @visibility&.to_sym when :public, :public_unlisted, :unlisted then :unlisted when :private then :private else :direct end
when :private