From 0ebe801af44cfb1b7b9244d45d3f087b0ad0e0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Sat, 25 Aug 2018 17:06:40 +0900 Subject: [PATCH 1/6] Update boot.js --- src/client/app/boot.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/app/boot.js b/src/client/app/boot.js index 86d48faf1..2ee771868 100644 --- a/src/client/app/boot.js +++ b/src/client/app/boot.js @@ -51,9 +51,10 @@ } } - if (settings) { - if (settings.device.lang) lang = settings.device.lang; - } + if (settings && + settings.device.lang && + LANGS.includes(settings.device.lang)) + lang = settings.device.lang; //#endregion // Detect the user agent From ce2d2a10c10f9980c49f97d0cd9e28bf3b788fad Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 25 Aug 2018 08:56:01 +0000 Subject: [PATCH 2/6] fix(package): update systeminformation to version 3.43.0 Closes #2477 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fde0f8280..f1e7cccc2 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,7 @@ "stylus": "0.54.5", "stylus-loader": "3.0.2", "summaly": "2.1.4", - "systeminformation": "3.42.9", + "systeminformation": "3.43.0", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", "tmp": "0.0.33", From 65549d06d98d280a744539eb2bdf476eaf0347ac Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 19:34:54 +0900 Subject: [PATCH 3/6] :v: --- src/client/app/desktop/views/components/charts.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue index 37d95577c..e400aebbb 100644 --- a/src/client/app/desktop/views/components/charts.vue +++ b/src/client/app/desktop/views/components/charts.vue @@ -394,7 +394,7 @@ export default Vue.extend({ yAxes: [{ ticks: { callback: value => { - return Vue.filter('bytes')(value); + return Vue.filter('bytes')(value, 1); } } }] @@ -403,7 +403,7 @@ export default Vue.extend({ callbacks: { label: (tooltipItem, data) => { const label = data.datasets[tooltipItem.datasetIndex].label || ''; - return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel)}`; + return `${label}: ${Vue.filter('bytes')(tooltipItem.yLabel, 1)}`; } } } From f0b08d3936361ea2c08ab60e1e6b098794ee245a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 19:39:06 +0900 Subject: [PATCH 4/6] Add brackets --- src/client/app/boot.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/app/boot.js b/src/client/app/boot.js index 2ee771868..54397c98c 100644 --- a/src/client/app/boot.js +++ b/src/client/app/boot.js @@ -51,10 +51,10 @@ } } - if (settings && - settings.device.lang && - LANGS.includes(settings.device.lang)) + if (settings && settings.device.lang && + LANGS.includes(settings.device.lang)) { lang = settings.device.lang; + } //#endregion // Detect the user agent From 08754609747266b0c24037860b44e11c662ea885 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 19:44:47 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AB=E3=82=B5?= =?UTF-8?q?=E3=83=A0=E3=83=8D=E3=82=A4=E3=83=AB=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #2365 --- src/remote/activitypub/models/person.ts | 6 +++--- src/server/api/endpoints/i/update.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 61bcf77c4..4a7b505a9 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -166,8 +166,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise new Promise(a if (avatar == null) return rej('avatar not found'); - updates.avatarUrl = avatar.metadata.url || `${config.drive_url}/${avatar._id}`; + updates.avatarUrl = avatar.metadata.thumbnailUrl || avatar.metadata.url || `${config.drive_url}/${avatar._id}`; if (avatar.metadata.properties.avgColor) { updates.avatarColor = avatar.metadata.properties.avgColor; From a84fa307740b48aee3626779b9462f647fcda999 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Aug 2018 19:46:12 +0900 Subject: [PATCH 6/6] 8.13.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fde0f8280..7ac8b3ddc 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "8.12.0", - "clientVersion": "1.0.8981", + "version": "8.13.0", + "clientVersion": "1.0.9001", "codename": "nighthike", "main": "./built/index.js", "private": true,