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

Fix: リモートから自分のサーバーの絵文字を使ってスタンプをつけられた時、既存の絵文字が消えてしまう場合がある問題

Browse source
This commit is contained in:
KMY 2023-10-16 18:36:46 +09:00 • committed by KMY（雪あすか）
parent 8a05b85d78
commit 243f1dbe8e
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,12 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
return if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank?
domain = tag['domain'] || URI.split(custom_emoji_parser.uri)[2] || @account.domain
domain = nil if domain == Rails.configuration.x.local_domain || domain == Rails.configuration.x.web_domain
if domain == Rails.configuration.x.local_domain || domain == Rails.configuration.x.web_domain
# Block overwriting remote-but-local data
return CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: nil)
end
return if domain.present? && skip_download?(domain)
emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: domain)