Merge commit '15fd712464
' into kb_migration
This commit is contained in:
commit
3a1a6ba39e
289 changed files with 1339 additions and 1337 deletions
|
@ -1,9 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ActivityPub::NoteForMisskeySerializer < ActivityPub::NoteSerializer
|
||||
|
||||
def cc
|
||||
ActivityPub::TagManager.instance.cc_for_misskey(object)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -41,7 +41,7 @@ class InitialStateSerializer < ActiveModel::Serializer
|
|||
store[:delete_modal] = object.current_account.user.setting_delete_modal
|
||||
store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif
|
||||
store[:display_media] = object.current_account.user.setting_display_media
|
||||
store[:display_media_expand]=object.current_account.user.setting_display_media_expand
|
||||
store[:display_media_expand] = object.current_account.user.setting_display_media_expand
|
||||
store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
|
||||
store[:reduce_motion] = object.current_account.user.setting_reduce_motion
|
||||
store[:disable_swiping] = object.current_account.user.setting_disable_swiping
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class REST::EmojiReactedBySlimSerializer < ActiveModel::Serializer
|
||||
|
||||
belongs_to :account, serializer: REST::AccountSerializer
|
||||
has_many :emoji_reactions, serializer: REST::EmojiReactedBySlimReactionSerializer
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
class REST::NotifyEmojiReactionSerializer < ActiveModel::Serializer
|
||||
include RoutingHelper
|
||||
|
||||
|
||||
attributes :name
|
||||
|
||||
attribute :count, if: :count?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue