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

Add custom_emoji sensitive,license from account name or updated status

Browse source
This commit is contained in:
KMY 2023-05-23 08:40:19 +09:00
parent d9df73f878
commit 629594ffc3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/services/activitypub/process_account_service.rb
View file

@ -377,12 +377,14 @@ class ActivityPub::ProcessAccountService < BaseService
shortcode = tag['name'].delete(':')
image_url = tag['icon']['url']
uri = tag['id']
sensitive = (tag['isSensitive'].presence || false)
license = tag['license']
updated = tag['updated']
emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri, is_sensitive: sensitive, license: license)
emoji.image_remote_url = image_url
emoji.save
end

2
app/services/activitypub/process_status_update_service.rb
View file

@ -231,7 +231,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
next 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)
begin
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri)
emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: custom_emoji_parser.shortcode, uri: custom_emoji_parser.uri, is_sensitive: custom_emoji_parser.is_sensitive, license: custom_emoji_parser.license)
emoji.image_remote_url = custom_emoji_parser.image_remote_url
emoji.save
rescue Seahorse::Client::NetworkingError => e