diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts index 41694af4b4..a9464b1a47 100644 --- a/app/javascript/mastodon/api_types/accounts.ts +++ b/app/javascript/mastodon/api_types/accounts.ts @@ -48,7 +48,6 @@ export interface ApiAccountJSON { discoverable: boolean; indexable: boolean; display_name: string; - emoji_reaction_available_server: boolean; emojis: ApiCustomEmojiJSON[]; fields: ApiAccountFieldJSON[]; followers_count: number; diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts index fc6b2d4682..6681b9df12 100644 --- a/app/javascript/mastodon/models/account.ts +++ b/app/javascript/mastodon/models/account.ts @@ -102,7 +102,6 @@ export const accountDefaultValues: AccountShape = { display_name: '', display_name_html: '', server_features: AccountServerFeaturesFactory(), - emoji_reaction_available_server: false, emojis: List(), fields: List(), group: false, diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index b7520bbfb4..db50d3e30f 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -7,7 +7,7 @@ class REST::AccountSerializer < ActiveModel::Serializer # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes 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, + :note, :url, :uri, :avatar, :avatar_static, :header, :header_static, :subscribable, :followers_count, :following_count, :statuses_count, :last_status_at, :hide_collections, :other_settings, :noindex, :server_features @@ -120,10 +120,6 @@ class REST::AccountSerializer < ActiveModel::Serializer object.unavailable? ? false : object.indexable end - def emoji_reaction_available_server - server_features[:emoji_reaction] - end - def server_features InstanceInfo.available_features(object.domain) end