diff --git a/package.json b/package.json index 9ac7cc842705..68bb8546786d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "10.102.1-l190423011206", + "version": "10.102.1-l190425054738", "codename": "nighthike", "repository": { "type": "git", diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue index 2e64e47d9528..c1b2d6778d97 100644 --- a/src/client/app/admin/views/announcements.vue +++ b/src/client/app/admin/views/announcements.vue @@ -9,6 +9,9 @@ {{ $t('text') }} + + {{ $t('image-url') }} + {{ $t('save') }} {{ $t('remove') }} @@ -43,7 +46,8 @@ export default Vue.extend({ add() { this.announcements.unshift({ title: '', - text: '' + text: '', + image: null }); }, diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue index f8897da253d2..6850ff7afc42 100644 --- a/src/client/app/common/views/widgets/broadcast.vue +++ b/src/client/app/common/views/widgets/broadcast.vue @@ -18,7 +18,8 @@

{{ $t('fetching') }}

{{ announcements.length == 0 ? $t('no-broadcasts') : announcements[i].title }}

- + +

{{ $t('next') }} >> diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index ddffeae40847..b46602befedd 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -44,7 +44,8 @@

-
+ +
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue index 169c7fc07da7..bb6ca340f178 100644 --- a/src/client/app/mobile/views/components/ui.nav.vue +++ b/src/client/app/mobile/views/components/ui.nav.vue @@ -43,7 +43,8 @@
-
+
+

{{ $t('about') }}

diff --git a/src/client/app/mobile/views/pages/user/index.vue b/src/client/app/mobile/views/pages/user/index.vue index a6b492d13580..bf1467423d2f 100644 --- a/src/client/app/mobile/views/pages/user/index.vue +++ b/src/client/app/mobile/views/pages/user/index.vue @@ -18,7 +18,7 @@

- + {{ $t('follows-you') }}
diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue index 1a2b0b6c1281..9d1a51e9683e 100644 --- a/src/client/app/mobile/views/pages/welcome.vue +++ b/src/client/app/mobile/views/pages/welcome.vue @@ -29,7 +29,8 @@
-
+ +
diff --git a/src/misc/twemoji-base.ts b/src/misc/twemoji-base.ts index 867e02bfe4fb..2a74ab0141a2 100644 --- a/src/misc/twemoji-base.ts +++ b/src/misc/twemoji-base.ts @@ -1,3 +1,4 @@ -export const twemojiBase = 'https://cdn.jsdelivr.net/npm/twemoji@12.0.0'; -// https://cdn.jsdelivr.net/npm/twemoji@12.0.0 +export const twemojiBase = 'https://cdn.jsdelivr.net/npm/twemoji@12.0.1'; +// https://cdn.jsdelivr.net/npm/twemoji@12.0.1 +// https://cdnjs.cloudflare.com/ajax/libs/twemoji/12.0.1 // https://twemoji.maxcdn.com diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts index 767eb89b71ae..bbe8159c282a 100644 --- a/src/remote/resolve-user.ts +++ b/src/remote/resolve-user.ts @@ -48,36 +48,40 @@ export default async (username: string, _host: string, option?: any, resync = fa }, }); - logger.info(`try resync: ${acctLower}`); - const self = await resolveSelf(acctLower); - - if (user.uri !== self.href) { - // if uri mismatch, Fix (user@host <=> AP's Person id(IRemoteUser.uri)) mapping. - logger.info(`uri missmatch: ${acctLower}`); - logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`); + try { + logger.info(`try resync: ${acctLower}`); + const self = await resolveSelf(acctLower); + + if (user.uri !== self.href) { + // if uri mismatch, Fix (user@host <=> AP's Person id(IRemoteUser.uri)) mapping. + logger.info(`uri missmatch: ${acctLower}`); + logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`); + + // validate uri + const uri = new URL(self.href); + if (uri.hostname !== hostAscii) { + throw new Error(`Invalied uri`); + } - // validate uri - const uri = new URL(self.href); - if (uri.hostname !== hostAscii) { - throw new Error(`Invalied uri`); + await User.update({ + usernameLower, + host: host + }, { + $set: { + uri: self.href + } + }); + } else { + logger.info(`uri is fine: ${acctLower}`); } - await User.update({ - usernameLower, - host: host - }, { - $set: { - uri: self.href - } - }); - } else { - logger.info(`uri is fine: ${acctLower}`); - } - - await updatePerson(self.href); + await updatePerson(self.href); - logger.info(`return resynced remote user: ${acctLower}`); - return await User.findOne({ uri: self.href }); + logger.info(`return resynced remote user: ${acctLower}`); + return await User.findOne({ uri: self.href }); + } catch (e) { + logger.warn(`resync failed: ${e.message || e}`); + } } logger.info(`return existing remote user: ${acctLower}`);