Merge branch 'kb_development' into upstream-20231021

app/lib/activitypub/activity/create.rb

@@ -274,6 +274,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       emoji.image_remote_url = custom_emoji_parser.image_remote_url
       emoji.license = custom_emoji_parser.license
       emoji.is_sensitive = custom_emoji_parser.is_sensitive
+      emoji.aliases = custom_emoji_parser.aliases
       emoji.save
     rescue Seahorse::Client::NetworkingError => e
       Rails.logger.warn "Error storing emoji: #{e}"

app/lib/activitypub/activity/like.rb

@@ -127,6 +127,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
       emoji.image_remote_url = custom_emoji_parser.image_remote_url
       emoji.license = custom_emoji_parser.license
       emoji.is_sensitive = custom_emoji_parser.is_sensitive
+      emoji.aliases = custom_emoji_parser.aliases
       emoji.save
     rescue Seahorse::Client::NetworkingError => e
       Rails.logger.warn "Error storing emoji: #{e}"

app/lib/activitypub/parser/custom_emoji_parser.rb

@@ -15,6 +15,10 @@ class ActivityPub::Parser::CustomEmojiParser
     @json['name']&.delete(':')
   end
 
+  def aliases
+    as_array(@json['keywords'])
+  end
+
   def image_remote_url
     @json.dig('icon', 'url')
   end