From 7a0f0dd5003fc67b34c77a92b4a264c4946c7f8a Mon Sep 17 00:00:00 2001 From: KMY Date: Thu, 18 Jul 2024 07:54:41 +0900 Subject: [PATCH] =?UTF-8?q?Remove:=20#602=20=E4=BB=96=E3=81=AE=E3=82=B5?= =?UTF-8?q?=E3=83=BC=E3=83=90=E3=83=BC=E3=81=8C=E7=B5=B5=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=8B?= =?UTF-8?q?=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8BAPI=E3=81=AE?= =?UTF-8?q?=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=E3=81=AB=E4=BC=B4=E3=81=84?= =?UTF-8?q?=E3=80=81=E6=97=A7API=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/mastodon/api_types/accounts.ts | 1 - app/javascript/mastodon/models/account.ts | 1 - app/serializers/rest/account_serializer.rb | 6 +----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts index 41694af4b46e82..a9464b1a47aecf 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 fc6b2d4682dba6..6681b9df12cb3a 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 b7520bbfb4be28..db50d3e30f1089 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 @@ def indexable 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