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

1
app/serializers/initial_state_serializer.rb
View file

@ -19,7 +19,6 @@ class InitialStateSerializer < ActiveModel::Serializer
if object.current_account
store[:me] = object.current_account.id.to_s
store[:unfollow_modal] = object_account_user.setting_unfollow_modal
store[:boost_modal] = object_account_user.setting_boost_modal
store[:delete_modal] = object_account_user.setting_delete_modal
store[:auto_play_gif] = object_account_user.setting_auto_play_gif

9
app/serializers/rest/account_relationship_severance_event_serializer.rb Normal file
View file

@ -0,0 +1,9 @@
# frozen_string_literal: true
class REST::AccountRelationshipSeveranceEventSerializer < ActiveModel::Serializer
attributes :id, :type, :purged, :target_name, :followers_count, :following_count, :created_at
def id
object.id.to_s
end
end

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