diff --git a/CHANGELOG.md b/CHANGELOG.md index 85cb031d6b70eead35e56421ec0ac60be20edf8c..e89f0ca707c012f8f6c697e4e52ac8dc32282606 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ### General - コンディショナルãƒãƒ¼ãƒ«ã®æ¡ä»¶ã«ã€ŒæŠ•ç¨¿æ•°ãŒï½žä»¥ä¸‹ã€ã€ŒæŠ•ç¨¿æ•°ãŒï½žä»¥ä¸Šã€ã‚’è¿½åŠ +- リアクションéžå¯¾å¿œAP実装ã‹ã‚‰ã®Likeアクティビティã®è§£é‡ˆã‚’ðŸ‘ã‹ã‚‰â™¥ã« ### Client - クリップボタンをノートアクションã«è¿½åŠ ã§ãるよã†ã« diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 8d2b4384a02ece01fef2a4a854898c26601c1f88..356b93c696cedaaf595bad291de654643ebd64c7 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -594,7 +594,6 @@ tokenRequested: "アカウントã¸ã®ã‚¢ã‚¯ã‚»ã‚¹è¨±å¯" pluginTokenRequestedDescription: "ã“ã®ãƒ—ラグインã¯ã“ã“ã§è¨å®šã—ãŸæ¨©é™ã‚’行使ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚" notificationType: "通知ã®ç¨®é¡ž" edit: "編集" -useStarForReactionFallback: "リアクション絵文å—ãŒä¸æ˜Žãªå ´åˆã€ä»£ã‚ã‚Šã«â˜…を使ã†" emailServer: "メールサーãƒãƒ¼" enableEmail: "メールé…信機能を有効化ã™ã‚‹" emailConfigInfo: "メールアドレスã®ç¢ºèªã‚„パスワードリセットã®éš›ã«ä½¿ã„ã¾ã™" diff --git a/packages/backend/migration/1679651580149-cleanup.js b/packages/backend/migration/1679651580149-cleanup.js new file mode 100644 index 0000000000000000000000000000000000000000..1f00f3cc1fadecae829091242056cab56d484da6 --- /dev/null +++ b/packages/backend/migration/1679651580149-cleanup.js @@ -0,0 +1,11 @@ +export class cleanup1679651580149 { + name = 'cleanup1679651580149' + + async up(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "useStarForReactionFallback"`); + } + + async down(queryRunner) { + await queryRunner.query(`ALTER TABLE "meta" ADD "useStarForReactionFallback" boolean NOT NULL DEFAULT false`); + } +} diff --git a/packages/backend/src/core/ReactionService.ts b/packages/backend/src/core/ReactionService.ts index f13e9ba15c8a8786fb206f42e45e445307479074..b3aea878d6c4f5bba748815fd83a0dccc012c286 100644 --- a/packages/backend/src/core/ReactionService.ts +++ b/packages/backend/src/core/ReactionService.ts @@ -21,6 +21,8 @@ import { bindThis } from '@/decorators.js'; import { UtilityService } from '@/core/UtilityService.js'; import { UserBlockingService } from '@/core/UserBlockingService.js'; +const FALLBACK = 'â¤'; + const legacies: Record<string, string> = { 'like': 'ðŸ‘', 'love': 'â¤', // ã“ã“ã«è¨˜è¿°ã™ã‚‹å ´åˆã¯ç•°ä½“å—セレクタを入れãªã„ @@ -255,12 +257,6 @@ export class ReactionService { //#endregion } - @bindThis - public async getFallbackReaction(): Promise<string> { - const meta = await this.metaService.fetch(); - return meta.useStarForReactionFallback ? 'â' : 'ðŸ‘'; - } - @bindThis public convertLegacyReactions(reactions: Record<string, number>) { const _reactions = {} as Record<string, number>; @@ -294,7 +290,7 @@ export class ReactionService { @bindThis public async toDbReaction(reaction?: string | null, reacterHost?: string | null): Promise<string> { - if (reaction == null) return await this.getFallbackReaction(); + if (reaction == null) return FALLBACK; reacterHost = this.utilityService.toPunyNullable(reacterHost); @@ -322,7 +318,7 @@ export class ReactionService { if (emoji) return reacterHost ? `:${name}@${reacterHost}:` : `:${name}:`; } - return await this.getFallbackReaction(); + return FALLBACK; } @bindThis diff --git a/packages/backend/src/models/entities/Meta.ts b/packages/backend/src/models/entities/Meta.ts index 179fb535644d042b2dae3a5bab99d046ea2e6a8c..c7c60b640559970c2f8e1199fb881c9a08dff97c 100644 --- a/packages/backend/src/models/entities/Meta.ts +++ b/packages/backend/src/models/entities/Meta.ts @@ -42,11 +42,6 @@ export class Meta { }) public disableRegistration: boolean; - @Column('boolean', { - default: false, - }) - public useStarForReactionFallback: boolean; - @Column('varchar', { length: 1024, array: true, default: '{}', }) diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index 28e42e578b880debe2a70d3b9a5f403f36f3e055..cf21e1bd8f664032e464cde09eaafc7362085083 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -303,7 +303,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { enableServiceWorker: instance.enableServiceWorker, translatorAvailable: instance.deeplAuthKey != null, cacheRemoteFiles: instance.cacheRemoteFiles, - useStarForReactionFallback: instance.useStarForReactionFallback, pinnedUsers: instance.pinnedUsers, hiddenTags: instance.hiddenTags, blockedHosts: instance.blockedHosts, diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 88c0565e4aaa1feb7fbb25826492fde295594107..78a398d6b5cc09a76f4dc49750034d46d77485a7 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -17,7 +17,6 @@ export const paramDef = { type: 'object', properties: { disableRegistration: { type: 'boolean', nullable: true }, - useStarForReactionFallback: { type: 'boolean', nullable: true }, pinnedUsers: { type: 'array', nullable: true, items: { type: 'string', } }, @@ -115,10 +114,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { set.disableRegistration = ps.disableRegistration; } - if (typeof ps.useStarForReactionFallback === 'boolean') { - set.useStarForReactionFallback = ps.useStarForReactionFallback; - } - if (Array.isArray(ps.pinnedUsers)) { set.pinnedUsers = ps.pinnedUsers.filter(Boolean); }