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-07 12:13:18 +09:00
parent f0fac9be8f
commit 09020c6b21
2 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,15 +93,17 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
return if custom_emoji_parser.shortcode.blank? || custom_emoji_parser.image_remote_url.blank?
emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: @account.domain)
return unless emoji.nil? || custom_emoji_parser.image_remote_url != emoji.image_remote_url || (custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at)
domain = emoji_tag['domain'] || URI.split(custom_emoji_parser.uri)[2] || @account.domain
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
return if domain.present? && skip_download?(domain)
emoji = CustomEmoji.find_by(shortcode: custom_emoji_parser.shortcode, domain: domain)
return emoji unless emoji.nil? ||
custom_emoji_parser.image_remote_url != emoji.image_remote_url ||
(custom_emoji_parser.updated_at && custom_emoji_parser.updated_at >= emoji.updated_at) ||
custom_emoji_parser.license != emoji.license
begin
emoji ||= CustomEmoji.new(
domain: domain,