From c1c8c9c37c939000e12b6b711539325d7780d745 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 19:03:41 +0900 Subject: [PATCH 1/8] fix(server): fix bind of method Fix #9006 --- packages/backend/src/server/api/stream/channels/channel.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts index 5148cfd05..3cdd89a8b 100644 --- a/packages/backend/src/server/api/stream/channels/channel.ts +++ b/packages/backend/src/server/api/stream/channels/channel.ts @@ -16,6 +16,7 @@ export default class extends Channel { constructor(id: string, connection: Channel['connection']) { super(id, connection); this.onNote = this.onNote.bind(this); + this.emitTypers = this.emitTypers.bind(this); } public async init(params: any) { From fbb0cc686ef76563ac2996b8cf1fd8194d70e533 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 20:53:53 +0900 Subject: [PATCH 2/8] chore(client): tweak style --- packages/client/src/components/form/input.vue | 6 ++-- .../client/src/components/form/select.vue | 6 ++-- packages/client/src/components/ui/button.vue | 35 ++++++++++--------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue index 1cc391217..2a03d6a5d 100644 --- a/packages/client/src/components/form/input.vue +++ b/packages/client/src/components/form/input.vue @@ -77,9 +77,9 @@ const inputEl = ref(); const prefixEl = ref(); const suffixEl = ref(); const height = - props.small ? 38 : - props.large ? 42 : - 40; + props.small ? 36 : + props.large ? 40 : + 38; const focus = () => inputEl.value.focus(); const onInput = (ev: KeyboardEvent) => { diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue index fe8c08cd6..78282dfdc 100644 --- a/packages/client/src/components/form/select.vue +++ b/packages/client/src/components/form/select.vue @@ -63,9 +63,9 @@ const prefixEl = ref(null); const suffixEl = ref(null); const container = ref(null); const height = - props.small ? 38 : - props.large ? 42 : - 40; + props.small ? 36 : + props.large ? 40 : + 38; const focus = () => inputEl.value.focus(); const onInput = (ev) => { diff --git a/packages/client/src/components/ui/button.vue b/packages/client/src/components/ui/button.vue index e6b20d988..5f5d6d42e 100644 --- a/packages/client/src/components/ui/button.vue +++ b/packages/client/src/components/ui/button.vue @@ -1,5 +1,6 @@ diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index 2ff41e972..b61b77eee 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -153,6 +153,15 @@ export const routes = [{ }, { path: '/channels', component: page(() => import('./pages/channels.vue')), +}, { + path: '/registry/keys/system/:path(*)?', + component: page(() => import('./pages/registry.keys.vue')), +}, { + path: '/registry/value/system/:path(*)?', + component: page(() => import('./pages/registry.value.vue')), +}, { + path: '/registry', + component: page(() => import('./pages/registry.vue')), }, { path: '/admin/file/:fileId', component: iAmModerator ? page(() => import('./pages/admin-file.vue')) : page(() => import('./pages/not-found.vue')), From 3811b90150cb778c6c9f07c630f8b9d738d15218 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 23:11:08 +0900 Subject: [PATCH 5/8] 12.116.0-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f9a50bb6..d2a6b67a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.115.0", + "version": "12.116.0-beta.1", "codename": "indigo", "repository": { "type": "git", From e4453e9ca8b31fc03ee55ce23f409a1b99955fba Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 23:51:32 +0900 Subject: [PATCH 6/8] Update 1651224615271-foreign-key.js #8852 --- packages/backend/migration/1651224615271-foreign-key.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/migration/1651224615271-foreign-key.js b/packages/backend/migration/1651224615271-foreign-key.js index 44ba7fb6c..1f1510f84 100644 --- a/packages/backend/migration/1651224615271-foreign-key.js +++ b/packages/backend/migration/1651224615271-foreign-key.js @@ -28,7 +28,7 @@ export class foreignKeyReports1651224615271 { queryRunner.query(`CREATE INDEX "IDX_315c779174fe8247ab324f036e" ON "drive_file" ("isLink")`), queryRunner.query(`CREATE INDEX "IDX_f22169eb10657bded6d875ac8f" ON "note" ("channelId")`), - queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId")`), + //queryRunner.query(`CREATE INDEX "IDX_a9021cc2e1feb5f72d3db6e9f5" ON "abuse_user_report" ("targetUserId")`), queryRunner.query(`DELETE FROM "abuse_user_report" WHERE "targetUserId" NOT IN (SELECT "id" FROM "user")`).then(() => { queryRunner.query(`ALTER TABLE "abuse_user_report" ADD CONSTRAINT "FK_a9021cc2e1feb5f72d3db6e9f5f" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); From 4352331b7013d2f014aa770e47b2f2788fa60b63 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 23:53:01 +0900 Subject: [PATCH 7/8] New Crowdin updates (#9007) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Slovak) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Vietnamese) * New translations ja-JP.yml (Chinese Traditional) --- locales/de-DE.yml | 2 ++ locales/en-US.yml | 2 ++ locales/ru-RU.yml | 3 +++ locales/sk-SK.yml | 2 ++ locales/vi-VN.yml | 2 ++ locales/zh-TW.yml | 2 ++ 6 files changed, 13 insertions(+) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index da8f7fe9c..1ae93f6c4 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1703,6 +1703,8 @@ _deck: stackLeft: "Auf linke Spalte stapeln" popRight: "Nach rechts vom Stapel nehmen" profile: "Profil" + newProfile: "Neues Profil" + deleteProfile: "Profil löschen" introduction: "Erstelle eine auf dich zugeschneiderte Benutzeroberfläche durch das Aneinanderreihen von Spalten!" introduction2: "Klicke auf das + rechts um wann immer du möchtest neue Spalten hinzuzufügen." widgetsIntroduction: "Drücke bitte \"Widgets bearbeiten\" im Spaltenmenü und füge ein Widget hinzu." diff --git a/locales/en-US.yml b/locales/en-US.yml index b1e41a0b8..a2ded5a45 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1703,6 +1703,8 @@ _deck: stackLeft: "Stack with the left column" popRight: "Pop column to the right" profile: "Profile" + newProfile: "New profile" + deleteProfile: "Delete profile" introduction: "Create the perfect interface for you by arranging columns freely!" introduction2: "Click on the + on the right of the screen to add new colums whenever you want." widgetsIntroduction: "Please select \"Edit widgets\" in the column menu and add a widget." diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 4386e1c87..b0be6b4ff 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -842,6 +842,9 @@ reverse: "Переворот" colored: "Выделена цветом" label: "Метка" localOnly: "Локально" +beta: "Бета" +enableAutoSensitive: "Автоматическое определение NSFW" +enableAutoSensitiveDescription: "Если доступно, используйте машинное обучение для автоматической установки флага NSFW на носителе. Даже если эта функция отключена, она может быть установлена ​​автоматически в зависимости от инстанта." account: "Учётные записи" _sensitiveMediaDetection: description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно." diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index c5a5d6d0b..2ac0a8566 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1698,6 +1698,8 @@ _deck: stackLeft: "Priložiť do ľavého stĺpca" popRight: "Vybrať napravo" profile: "Profil" + newProfile: "Nový profil" + deleteProfile: "Odstrániť profil" introduction: "Kombinujte stĺpce a vytvorte si svoje vlastné rozhranie!" introduction2: "Stlačením tlačidla + v pravej časti obrazovky môžete kedykoľvek pridať stĺpce." widgetsIntroduction: "V ponuke stĺpca vyberte možnosť \"Upraviť widget\" a pridajte widget" diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 238491550..90aa1da30 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1703,6 +1703,8 @@ _deck: stackLeft: "Xếp chồng với cột bên trái" popRight: "Xếp chồng với cột bên trái" profile: "Hồ sơ" + newProfile: "Hồ sơ mới" + deleteProfile: "Xóa hồ sơ" introduction: "Kết hợp các cột để tạo giao diện của riêng bạn!" introduction2: "Bạn có thể thêm cột bất kỳ lúc nào bằng cách nhấn + ở bên phải màn hình." widgetsIntroduction: "Chọn \"Sửa widget\" trong menu cột và thêm một widget." diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 0359b03b2..4ee440c07 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1702,6 +1702,8 @@ _deck: stackLeft: "向左折疊" popRight: "向右彈出" profile: "個人檔案" + newProfile: "新建個人檔案" + deleteProfile: "刪除個人檔案" introduction: "組合欄位來製作屬於自己的介面吧！" introduction2: "您可以隨時透過按畫面右方的 + 來添加欄位。" widgetsIntroduction: "請從欄位的選單中，選擇「編輯小工具」來添加小工具" From a974ab00d71f49f94e50c3b20586e460169089fa Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 16 Jul 2022 23:53:15 +0900 Subject: [PATCH 8/8] 12.116.0 --- CHANGELOG.md | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5e1fa65b..bf7522493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,15 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) +## 12.116.0 (2022/07/16) ### Improvements - Client: registry editor @syuilo +- Client: UIのブラッシュアップ @syuilo ### Bugfixes -- +- Error During Migration Run to 12.111.x +- Server: TypeError: Cannot convert undefined or null to object @syuilo ## 12.115.0 (2022/07/16) diff --git a/package.json b/package.json index d2a6b67a3..9ebd46a40 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.116.0-beta.1", + "version": "12.116.0", "codename": "indigo", "repository": { "type": "git",