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

Merge remote-tracking branch 'parent/main' into upstream-20240326

Browse source
This commit is contained in:
KMY 2024-03-26 09:08:20 +09:00
commit 6c9b221cb2
263 changed files with 4628 additions and 1518 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/serializers/rest/notification_serializer.rb
View file

@ -9,6 +9,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
belongs_to :emoji_reaction, if: :emoji_reaction_type?, serializer: REST::NotifyEmojiReactionSerializer
belongs_to :account_warning, if: :warning_type?, serializer: REST::AccountWarningSerializer
belongs_to :list, if: :list_status_type?, serializer: REST::ListSerializer
belongs_to :account_relationship_severance_event, key: :event, if: :relationship_severance_event?, serializer: REST::AccountRelationshipSeveranceEventSerializer
def id
object.id.to_s
@ -37,4 +38,8 @@ class REST::NotificationSerializer < ActiveModel::Serializer
def list
object.list_status.list
end
def relationship_severance_event?
object.type == :severed_relationships
end
end