* Add: #699 引用・参照対応サーバーをAPIで取得 * Complete * ごめん
This commit is contained in:
parent
78b2707c08
commit
1c054ed3a3
22 changed files with 129 additions and 29 deletions
|
@ -42,6 +42,8 @@ class InitialStateSerializer < ActiveModel::Serializer
|
|||
object_account_user.setting_hide_recent_emojis ? 'recent_emojis' : nil,
|
||||
object_account_user.setting_hide_blocking_quote ? 'blocking_quote' : nil,
|
||||
object_account_user.setting_hide_emoji_reaction_unavailable_server ? 'emoji_reaction_unavailable_server' : nil,
|
||||
object_account_user.setting_hide_quote_unavailable_server ? 'quote_unavailable_server' : nil,
|
||||
object_account_user.setting_hide_status_reference_unavailable_server ? 'status_reference_unavailable_server' : nil,
|
||||
object_account_user.setting_hide_emoji_reaction_count ? 'emoji_reaction_count' : nil,
|
||||
object_account_user.setting_show_emoji_reaction_on_timeline ? nil : 'emoji_reaction_on_timeline',
|
||||
object_account_user.setting_show_quote_in_home ? nil : 'quote_in_home',
|
||||
|
|
|
@ -8,7 +8,8 @@ class REST::AccountSerializer < ActiveModel::Serializer
|
|||
|
||||
attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :indexable, :group, :created_at,
|
||||
:note, :url, :uri, :avatar, :avatar_static, :header, :header_static, :subscribable, :emoji_reaction_available_server,
|
||||
:followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections, :other_settings, :noindex
|
||||
:followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections, :other_settings, :noindex,
|
||||
:server_features
|
||||
|
||||
has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
|
||||
|
||||
|
@ -120,9 +121,11 @@ class REST::AccountSerializer < ActiveModel::Serializer
|
|||
end
|
||||
|
||||
def emoji_reaction_available_server
|
||||
return Setting.enable_emoji_reaction if object.local?
|
||||
server_features[:emoji_reaction]
|
||||
end
|
||||
|
||||
InstanceInfo.emoji_reaction_available?(object.domain)
|
||||
def server_features
|
||||
InstanceInfo.available_features(object.domain)
|
||||
end
|
||||
|
||||
def moved_to_account
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue