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

Merge commit '15fd712464' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 15:05:34 +09:00
commit 3a1a6ba39e
289 changed files with 1339 additions and 1337 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -457,14 +457,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
end
SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/.freeze
SCAN_SEARCHABILITY_RE = /\[searchability:(public|followers|reactors|private)\]/
def searchability
searchability = searchability_from_audience
if searchability.nil?
note = @account&.note
return nil unless note.present?
return nil if note.blank?
searchability_bio = note.scan(SCAN_SEARCHABILITY_RE).first
return nil unless searchability_bio
@ -478,9 +478,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
searchability = :private if searchability == 'reactors'
end
visibility = visibility_from_audience_with_silence
visibility = visibility_from_audience_with_silence
if searchability === visibility
if searchability == visibility
searchability
elsif [:public, :unlisted].include?(searchability) && [:public, :unlisted].include?(visibility) # unlisted is Followers only in kmyblue (generics: private)
:unlisted