Merge branch 'kb_development' into upstream-20231021

This commit is contained in:
KMY 2023-10-22 14:42:08 +09:00
commit b992e673c7
25 changed files with 667 additions and 114 deletions

View file

@ -3,9 +3,9 @@
class ActivityPub::EmojiSerializer < ActivityPub::Serializer
include RoutingHelper
context_extensions :emoji
context_extensions :emoji, :license, :keywords
attributes :id, :type, :domain, :name, :is_sensitive, :updated
attributes :id, :type, :domain, :name, :keywords, :is_sensitive, :updated
attribute :license, if: -> { object.license.present? }
@ -23,6 +23,10 @@ class ActivityPub::EmojiSerializer < ActivityPub::Serializer
object.domain.presence || Rails.configuration.x.local_domain
end
def keywords
object.aliases
end
def icon
object.image
end