Add custom_emoji isSensitive support
This commit is contained in:
parent
156f3a7c99
commit
ff2bcf7595
8 changed files with 23 additions and 4 deletions
|
@ -263,7 +263,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
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)
|
||||
|
||||
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)
|
||||
emoji.image_remote_url = custom_emoji_parser.image_remote_url
|
||||
emoji.save
|
||||
rescue Seahorse::Client::NetworkingError => e
|
||||
|
|
|
@ -24,4 +24,8 @@ class ActivityPub::Parser::CustomEmojiParser
|
|||
rescue ArgumentError
|
||||
nil
|
||||
end
|
||||
|
||||
def is_sensitive # rubocop:disable Naming/PredicateName
|
||||
(@json['isSensitive'].presence || false)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue