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

Merge commit '3a1a6ba39e' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-01 15:08:16 +09:00
commit 81a7272ce7
288 changed files with 1345 additions and 1343 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -458,14 +458,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
@ -479,9 +479,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

10
app/lib/activitypub/activity/like.rb
View file

@ -36,9 +36,9 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
uri = emoji_tag['id']
domain = URI.split(uri)[2]
emoji = CustomEmoji.find_or_create_by!(shortcode: shortcode, domain: domain) do |emoji|
emoji.uri = uri
emoji.image_remote_url = image_url
emoji = CustomEmoji.find_or_create_by!(shortcode: shortcode, domain: domain) do |emoji_data|
emoji_data.uri = uri
emoji_data.image_remote_url = image_url
end
Trends.statuses.register(@original_status)
@ -59,7 +59,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
end
def forward_for_emoji_reaction
return unless @json['signature'].present?
return if @json['signature'].blank?
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), @original_status.account.id, [@account.preferred_inbox_url])
end
@ -87,7 +87,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
def misskey_favourite?
misskey_shortcode = @json['_misskey_reaction']&.delete(':')
return misskey_shortcode == shortcode && misskey_shortcode == '⭐'
misskey_shortcode == shortcode && misskey_shortcode == '⭐'
end
def emoji_tag

6
app/lib/activitypub/activity/undo.rb
View file

@ -121,9 +121,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
if shortcode.present?
emoji_tag = @object['tag'].is_a?(Array) ? @object['tag']&.first : @object['tag']
if emoji_tag.present? && emoji_tag['id'].present?
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
end
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) if emoji_tag.present? && emoji_tag['id'].present?
emoji_reaction = @original_status.emoji_reactions.where(account: @account, name: shortcode, custom_emoji: emoji).first
@ -159,7 +157,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
end
def forward_for_undo_emoji_reaction
return unless @json['signature'].present?
return if @json['signature'].blank?
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), @original_status.account.id, [@account.preferred_inbox_url])
end

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

@ -124,9 +124,7 @@ class ActivityPub::TagManager
cc << COLLECTIONS[:public]
end
cc = cc + cc_private_visibility(status)
cc
cc + cc_private_visibility(status)
end
def cc_for_misskey(status)
@ -205,7 +203,7 @@ class ActivityPub::TagManager
end
def subscribable_by(account)
account.dissubscribable ? [] : [COLLECTIONS[:public]]
account.dissubscribable ? [] : [COLLECTIONS[:public]]
end
def searchable_by(status)
@ -213,10 +211,10 @@ class ActivityPub::TagManager
case status.compute_searchability_activitypub
when 'public'
[COLLECTIONS[:public]]
when 'unlisted' # Followers only in kmyblue (generics: private)
when 'unlisted' # Followers only in kmyblue (generics: private)
[account_followers_url(status.account)]
when 'private' # Reaction only in kmyblue (generics: direct)
[]
# when 'private' # Reaction only in kmyblue (generics: direct)
# []
when 'limited'
status.conversation_id.present? ? [uri_for(status.conversation)] : []
else