diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-25 19:46:50 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 19:46:50 +0900 |
| commit | 2488d404210a3c0642eb5ea8a9a1e828689145be (patch) | |
| tree | 9adbe0d4c502c523f955047333ce493eee7855e2 | |
| parent | Merge pull request #2475 from syuilo/develop (diff) | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | misskey-2488d404210a3c0642eb5ea8a9a1e828689145be.tar.gz misskey-2488d404210a3c0642eb5ea8a9a1e828689145be.tar.bz2 misskey-2488d404210a3c0642eb5ea8a9a1e828689145be.zip | |
Merge pull request #2482 from syuilo/develop
8.13.0
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | src/client/app/boot.js | 5 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/charts.vue | 4 | ||||
| -rw-r--r-- | src/remote/activitypub/models/person.ts | 6 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/package.json b/package.json index fde0f82802..8562e6f6c4 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "8.12.0", - "clientVersion": "1.0.8981", + "version": "8.13.0", + "clientVersion": "1.0.9001", "codename": "nighthike", "main": "./built/index.js", "private": true, @@ -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", diff --git a/src/client/app/boot.js b/src/client/app/boot.js index 86d48faf1a..54397c98c6 100644 --- a/src/client/app/boot.js +++ b/src/client/app/boot.js @@ -51,8 +51,9 @@ } } - 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 diff --git a/src/client/app/desktop/views/components/charts.vue b/src/client/app/desktop/views/components/charts.vue index 37d95577cd..e400aebbb7 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)}`; } } } diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 61bcf77c43..4a7b505a9f 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<IUs const avatarId = avatar ? avatar._id : null; const bannerId = banner ? banner._id : null; - const avatarUrl = avatar && avatar.metadata.url ? avatar.metadata.url : null; - const bannerUrl = banner && banner.metadata.url ? banner.metadata.url : null; + const avatarUrl = (avatar && avatar.metadata.thumbnailUrl) ? avatar.metadata.thumbnailUrl : (avatar && avatar.metadata.url) ? avatar.metadata.url : null; + const bannerUrl = (banner && banner.metadata.url) ? banner.metadata.url : null; await User.update({ _id: user._id }, { $set: { @@ -255,7 +255,7 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver) sharedInbox: person.sharedInbox, avatarId: avatar ? avatar._id : null, bannerId: banner ? banner._id : null, - avatarUrl: avatar && avatar.metadata.url ? avatar.metadata.url : null, + avatarUrl: (avatar && avatar.metadata.thumbnailUrl) ? avatar.metadata.thumbnailUrl : (avatar && avatar.metadata.url) ? avatar.metadata.url : null, bannerUrl: banner && banner.metadata.url ? banner.metadata.url : null, description: htmlToMFM(person.summary), followersCount, diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 922b396797..61a6b20c7c 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -84,7 +84,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => 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; |