From 2474c7f4cbc29cf87d10aafa770f29896b89520b Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Mar 2023 18:26:23 +0900 Subject: [PATCH 1/4] New Crowdin updates (#10386) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) --- locales/de-DE.yml | 3 +++ locales/en-US.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 0716bcc4ad61..45e5fa59fb79 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -978,6 +978,9 @@ license: "Lizenz" unfavoriteConfirm: "Wirklich aus Favoriten entfernen?" myClips: "Meine Clips" drivecleaner: "Drive-Reiniger" +retryAllQueuesNow: "Sofort Warteschlangen erneut ausführen" +retryAllQueuesConfirmTitle: "Wirklich erneut versuchen?" +retryAllQueuesConfirmText: "Dies wird zu einer temporären Erhöhung der Serverlast führen." _achievements: earnedAt: "Freigeschaltet am" _types: diff --git a/locales/en-US.yml b/locales/en-US.yml index 5efb7b7d1eba..423871975fce 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -978,6 +978,9 @@ license: "License" unfavoriteConfirm: "Really remove from favorites?" myClips: "My clips" drivecleaner: "Drive Cleaner" +retryAllQueuesNow: "Retry running all queues" +retryAllQueuesConfirmTitle: "Really retry all?" +retryAllQueuesConfirmText: "This will temporarily increase the server load." _achievements: earnedAt: "Unlocked at" _types: From c6fc9af77ac432fb18f229421f5420c21f06f5ce Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Mar 2023 18:29:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix(client):=20=E3=83=89=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=96=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #10387 --- packages/frontend/src/scripts/get-drive-file-menu.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts index 56ab51603844..52e610e437cb 100644 --- a/packages/frontend/src/scripts/get-drive-file-menu.ts +++ b/packages/frontend/src/scripts/get-drive-file-menu.ts @@ -64,19 +64,19 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile) { return [{ text: i18n.ts.rename, icon: 'ti ti-forms', - action: rename, + action: () => rename(file), }, { text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive, icon: file.isSensitive ? 'ti ti-eye' : 'ti ti-eye-off', - action: toggleSensitive, + action: () => toggleSensitive(file), }, { text: i18n.ts.describeFile, icon: 'ti ti-text-caption', - action: describe, + action: () => describe(file), }, null, { text: i18n.ts.copyUrl, icon: 'ti ti-link', - action: copyUrl, + action: () => copyUrl(file), }, { type: 'a', href: file.url, @@ -88,6 +88,6 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile) { text: i18n.ts.delete, icon: 'ti ti-trash', danger: true, - action: deleteFile, + action: () => deleteFile(file), }]; } From fb42721160c24d3d2bbb2cdce2a573a576cc8276 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Mar 2023 18:29:50 +0900 Subject: [PATCH 3/4] 13.10.2 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1736c4200a5..8a2a2bfe78fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ --> +## 13.10.2 + +### Client +- ドライブファイルのメニューが正常に動作しない問題を修正 + ## 13.10.1 ### Client diff --git a/package.json b/package.json index 07e899e957bb..317ee399e196 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.10.1", + "version": "13.10.2", "codename": "nasubi", "repository": { "type": "git", From 050787238babfb28985d6eeeac86bcd2e013abee Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Mar 2023 18:45:55 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix(backend):=20=E7=B5=B5=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=82=92=E7=B7=A8=E9=9B=86=E3=81=99=E3=82=8B=E3=81=A8=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8?= =?UTF-8?q?=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #10384 --- CHANGELOG.md | 3 +++ .../src/server/api/endpoints/admin/emoji/update.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a2a2bfe78fa..36996e9699f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ ## 13.10.2 +### Server +- 絵文字を編集すると保存できないことがある問題を修正 + ### Client - ドライブファイルのメニューが正常に動作しない問題を修正 diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index 1c649db93ea3..bc0475e05c82 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -1,5 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; -import { DataSource } from 'typeorm'; +import { DataSource, IsNull } from 'typeorm'; import { Endpoint } from '@/server/api/endpoint-base.js'; import type { EmojisRepository } from '@/models/index.js'; import { DI } from '@/di-symbols.js'; @@ -19,9 +19,9 @@ export const meta = { code: 'NO_SUCH_EMOJI', id: '684dec9d-a8c2-4364-9aa8-456c49cb1dc8', }, - alreadyexistsemoji: { - message: 'Emoji already exists', - code: 'EMOJI_ALREADY_EXISTS', + sameNameEmojiExists: { + message: 'Emoji that have same name already exists.', + code: 'SAME_NAME_EMOJI_EXISTS', id: '7180fe9d-1ee3-bff9-647d-fe9896d2ffb8', }, }, @@ -62,9 +62,9 @@ export default class extends Endpoint { ) { super(meta, paramDef, async (ps, me) => { const emoji = await this.emojisRepository.findOneBy({ id: ps.id }); - const emojiname = await this.emojisRepository.findOneBy({ name: ps.name }); + const sameNameEmoji = await this.emojisRepository.findOneBy({ name: ps.name, host: IsNull() }); if (emoji == null) throw new ApiError(meta.errors.noSuchEmoji); - if (emojiname != null && emojiname.id !== ps.id) throw new ApiError(meta.errors.alreadyexistsemoji); + if (sameNameEmoji != null && sameNameEmoji.id !== ps.id) throw new ApiError(meta.errors.sameNameEmojiExists); await this.emojisRepository.update(emoji.id, { updatedAt: new Date(), name: ps.name,