From ac9f77752dd580c748634e7da1d59adb548f56b5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 23 Jun 2019 01:53:21 +0900 Subject: [PATCH 1/5] New translations ja-JP.yml (Chinese Simplified) (#5081) --- locales/zh-CN.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 5b4e6799ef..6ff353f20e 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1947,6 +1947,7 @@ pages: _pick: arg1: "列表" arg2: "位置" + listLen: "获取列表长度" _listLen: arg1: "列表" number: "数值" From 31a5247b9ca52fed91c8ce245fcdaa503881e664 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 23 Jun 2019 16:12:11 +0900 Subject: [PATCH 2/5] :art: --- .../common/views/deck/deck.notification.vue | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/client/app/common/views/deck/deck.notification.vue b/src/client/app/common/views/deck/deck.notification.vue index 8a21bedb91..27a2dffef5 100644 --- a/src/client/app/common/views/deck/deck.notification.vue +++ b/src/client/app/common/views/deck/deck.notification.vue @@ -4,8 +4,8 @@
- - + + @@ -22,8 +22,8 @@
- - + + @@ -40,8 +40,8 @@
- - + + @@ -53,9 +53,9 @@
- + - +
@@ -66,9 +66,9 @@
- + - +
@@ -137,9 +137,13 @@ export default Vue.extend({ align-items baseline white-space nowrap - [data-icon], .mk-reaction-icon + > .icon margin-right 4px + > .name + overflow hidden + text-overflow ellipsis + > .mk-time margin-left auto color var(--noteHeaderInfo) From bc83963ac73c594674e97b00578e618e8450ed8b Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 24 Jun 2019 22:20:13 +0900 Subject: [PATCH 3/5] English nyaize --- src/misc/nyaize.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/misc/nyaize.ts b/src/misc/nyaize.ts index 918e7d63fd..38c7101766 100644 --- a/src/misc/nyaize.ts +++ b/src/misc/nyaize.ts @@ -2,6 +2,8 @@ export function nyaize(text: string): string { return text // ja-JP .replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ').replace(/ナ/g, 'ニャ') + // en-US + .replace(/morning/gi, 'mornyan').replace(/everyone/gi, 'everynyan') // ko-KR .replace(/[나-낳]/g, match => String.fromCharCode( match.codePointAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0) From f74bc309b189d0b716ed0f8f0f7891aea53079fe Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 25 Jun 2019 01:24:01 +0900 Subject: [PATCH 4/5] Fix bug --- src/server/api/endpoints/i/update-client-setting.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/server/api/endpoints/i/update-client-setting.ts b/src/server/api/endpoints/i/update-client-setting.ts index 36de183379..f79961a4f9 100644 --- a/src/server/api/endpoints/i/update-client-setting.ts +++ b/src/server/api/endpoints/i/update-client-setting.ts @@ -2,6 +2,7 @@ import $ from 'cafy'; import { publishMainStream } from '../../../../services/stream'; import define from '../../define'; import { UserProfiles } from '../../../../models'; +import { ensure } from '../../../../prelude/ensure'; export const meta = { requireCredential: true, @@ -20,11 +21,13 @@ export const meta = { }; export default define(meta, async (ps, user) => { + const profile = await UserProfiles.findOne(user.id).then(ensure); + await UserProfiles.createQueryBuilder().update() .set({ - clientData: { + clientData: Object.assign(profile.clientData, { [ps.name]: ps.value - }, + }), }) .where('userId = :id', { id: user.id }) .execute(); From 6b897e562ad90f7b355acad9358d2178e973f1cb Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 25 Jun 2019 01:27:33 +0900 Subject: [PATCH 5/5] 11.23.1 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7800ab72c..0a0193fa18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,11 @@ npm i -g ts-node npm run migrate ``` +11.23.1 (2019/06/25) +-------------------- +### 🐛Fixes +* クライアントの設定がリセットされることがある問題を修正 + 11.23.0 (2019/06/23) -------------------- ### ✨Improvements diff --git a/package.json b/package.json index 9d609db159..264b50d663 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.23.0", + "version": "11.23.1", "codename": "daybreak", "repository": { "type": "git",