Merge remote-tracking branch 'parent/main' into kb_development

2024-04-27 08:42:37 +09:00 · 2024-04-27 08:42:37 +09:00 · ec7b51504b
commit ec7b51504b
parent 801d3bcf3a 65093c619f
42 changed files with 498 additions and 227 deletions
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@ -15,12 +15,6 @@ class REST::NotificationSerializer < ActiveModel::Serializer
    object.id.to_s
  end

-  def from_account
-    return object.account if moderation_warning_event? # Hide moderator account
-
-    object.from_account
-  end
-
  def status_type?
    [:favourite, :emoji_reaction, :reaction, :reblog, :status_reference, :status, :list_status, :mention, :poll, :update].include?(object.type)
  end