From c3b9c7b74bd59f3cbd4ebe59e1b9c415a1086e17 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 21 Jul 2020 01:15:18 +0900 Subject: [PATCH 01/10] Fix blurhash in test (#6573) --- test/get-file-info.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/get-file-info.ts b/test/get-file-info.ts index 0c19fb2d7e..8af8493d7a 100644 --- a/test/get-file-info.ts +++ b/test/get-file-info.ts @@ -26,7 +26,7 @@ describe('Get file info', () => { }, width: undefined, height: undefined, - blurhash: null + blurhash: undefined }); })); @@ -43,7 +43,7 @@ describe('Get file info', () => { }, width: 512, height: 512, - blurhash: '' // TODO + blurhash: 'yFLxJjH[NE}@^PRiN_}Y=aVZNvFxxZ#SwIt7Eg%KIp-ospv~Nex[R6t3xZI:iwt6kWxDafoySgsAfR$*oyM|S2t7$iV[tQNbaKn%xt' }); })); @@ -60,7 +60,7 @@ describe('Get file info', () => { }, width: 256, height: 256, - blurhash: '' // TODO + blurhash: 'y8S?Mr-;=~~Xs;%foL?bWVs;xbR%NFay^ms;I-InI-xbs;%gofj[I-s;-WxbI-WUayxb$,NFR*~Wa{R%xbayNFI.oMj[oMNFWB$,WU' }); })); @@ -77,7 +77,7 @@ describe('Get file info', () => { }, width: 256, height: 256, - blurhash: '' // TODO + blurhash: 'y8S?Mr-;=~~Xs;%foL?bWVs;xbR%NFay^ms;I-InI-xbs;%gofj[I-s;-WxbI-WUayxb$,NFR*~Wa{R%xbayNFI.oMj[oMNFWB$,WU' }); })); @@ -94,7 +94,7 @@ describe('Get file info', () => { }, width: 256, height: 256, - blurhash: '' // TODO + blurhash: 'y74P29kDpdp{k?VDZ#krkCaefkf6fQf5HXZ$krkqadaKaJkCaKkXfkkCf5fkQ8kXZ#VDaKk?krZ~kCf6kDf6f5f6U]krZ#Z#aekrkq' }); })); @@ -111,7 +111,7 @@ describe('Get file info', () => { }, width: 256, height: 256, - blurhash: '' // TODO + blurhash: 'yMEKyd1U1?=nZN-2EwofR*oHnijYX6S50J=m]WEVl9JE$SR*xHR;XSX8nQxB-WS6Nts*aKskWnaxR%s*i_n~X6S5=#NgOAs*enoIWU' }); })); @@ -129,7 +129,7 @@ describe('Get file info', () => { }, width: 256, height: 256, - blurhash: '' // TODO + blurhash: 'yMEKyd1U1?=nZN-2EwofR*oHnijYX6S50J=m]WEVl9JE$SR*xHR;XSX8nQxB-WS6Nts*aKskWnaxR%s*i_n~X6S5=#NgOAs*enoIWU' }); })); @@ -146,7 +146,7 @@ describe('Get file info', () => { }, width: 25000, height: 25000, - blurhash: '' // TODO + blurhash: undefined }); })); }); From 58f7af892796ac626b2ae70ac49fc8cb9382319b Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 21 Jul 2020 01:18:41 +0900 Subject: [PATCH 02/10] Fix SNYK-JS-AJV-584908 (#6572) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 55e62690a7..dd1d55b91b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1200,9 +1200,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.2, ajv@^6.5.5: - version "6.12.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + version "6.12.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" + integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" From b8350d509312d7015499087ba8b9e6622406762f Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 23 Jul 2020 13:07:27 +0900 Subject: [PATCH 03/10] Fix #6566 (#6577) --- src/client/components/deck/direct-column.vue | 24 ++++++++++++++++--- .../components/deck/mentions-column.vue | 21 +++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/client/components/deck/direct-column.vue b/src/client/components/deck/direct-column.vue index f340048d6a..daf83cabff 100644 --- a/src/client/components/deck/direct-column.vue +++ b/src/client/components/deck/direct-column.vue @@ -2,20 +2,21 @@ - + diff --git a/src/client/components/deck/mentions-column.vue b/src/client/components/deck/mentions-column.vue index 19e49d2a89..7f5382a155 100644 --- a/src/client/components/deck/mentions-column.vue +++ b/src/client/components/deck/mentions-column.vue @@ -2,20 +2,21 @@ - + From 9c30b23358699a530f2bcb0f5ae6efe17146bcb3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 25 Jul 2020 01:36:39 +0900 Subject: [PATCH 04/10] refactor(client): Use v-t for i18n --- src/client/components/autocomplete.vue | 2 +- src/client/components/dialog.vue | 4 +- src/client/components/drive.file.vue | 6 +- src/client/components/drive.vue | 8 +-- src/client/components/error.vue | 2 +- src/client/components/follow-button.vue | 12 ++-- src/client/components/instance-stats.vue | 62 +++++++++---------- src/client/components/media-banner.vue | 4 +- src/client/components/media-image.vue | 2 +- src/client/components/media-video.vue | 2 +- src/client/components/mention.vue | 2 +- src/client/components/note.vue | 2 +- src/client/components/notes.vue | 6 +- src/client/components/notification.vue | 6 +- src/client/components/notifications.vue | 4 +- src/client/components/poll-editor.vue | 24 +++---- src/client/components/poll.vue | 4 +- src/client/components/post-form.vue | 2 +- src/client/components/remote-caution.vue | 2 +- src/client/components/sidebar.vue | 6 +- src/client/components/signin.vue | 14 ++--- src/client/components/signup.vue | 8 +-- src/client/components/stream-indicator.vue | 6 +- src/client/components/sub-note-content.vue | 2 +- .../components/token-generate-window.vue | 8 +-- src/client/components/ui/input.vue | 2 +- src/client/components/ui/pagination.vue | 2 +- src/client/components/ui/textarea.vue | 2 +- src/client/components/user-list.vue | 4 +- src/client/components/user-preview.vue | 6 +- src/client/components/user-select.vue | 4 +- src/client/components/users-dialog.vue | 4 +- src/client/components/visibility-chooser.vue | 20 +++--- src/client/pages/about-misskey.vue | 8 +-- src/client/pages/about.vue | 4 +- src/client/pages/announcements.vue | 2 +- src/client/pages/apps.vue | 6 +- src/client/pages/auth.vue | 4 +- src/client/pages/doc.vue | 2 +- src/client/pages/docs.vue | 2 +- src/client/pages/explore.vue | 4 +- src/client/pages/favorites.vue | 2 +- src/client/pages/featured.vue | 2 +- src/client/pages/follow-requests.vue | 4 +- src/client/pages/index.home.tutorial.vue | 46 +++++++------- src/client/pages/index.home.vue | 2 +- src/client/pages/index.welcome.entrance.vue | 2 +- src/client/pages/index.welcome.setup.vue | 6 +- src/client/pages/instance/announcements.vue | 8 +-- src/client/pages/instance/emojis.vue | 14 ++--- .../pages/instance/federation.instance.vue | 44 ++++++------- src/client/pages/instance/federation.vue | 18 +++--- src/client/pages/instance/index.vue | 16 ++--- src/client/pages/instance/queue.queue.vue | 2 +- src/client/pages/instance/queue.vue | 2 +- src/client/pages/instance/relays.vue | 4 +- src/client/pages/instance/settings.vue | 36 +++++------ src/client/pages/instance/users.user.vue | 6 +- src/client/pages/instance/users.vue | 26 ++++---- src/client/pages/mentions.vue | 2 +- src/client/pages/messages.vue | 2 +- src/client/pages/messaging/index.vue | 4 +- .../messaging/messaging-room.message.vue | 4 +- src/client/pages/miauth.vue | 4 +- .../pages/my-antennas/index.antenna.vue | 28 ++++----- src/client/pages/my-antennas/index.vue | 2 +- src/client/pages/my-groups/group.vue | 10 +-- src/client/pages/my-groups/index.vue | 2 +- src/client/pages/my-lists/index.vue | 2 +- src/client/pages/my-lists/list.vue | 8 +-- src/client/pages/my-settings/2fa.vue | 24 +++---- src/client/pages/my-settings/api.vue | 2 +- .../pages/my-settings/import-export.vue | 10 +-- src/client/pages/my-settings/index.vue | 12 ++-- src/client/pages/my-settings/integration.vue | 12 ++-- src/client/pages/my-settings/mute-block.vue | 8 +-- src/client/pages/my-settings/privacy.vue | 16 ++--- src/client/pages/my-settings/profile.vue | 28 ++++----- src/client/pages/my-settings/reaction.vue | 2 +- src/client/pages/my-settings/security.vue | 2 +- src/client/pages/not-found.vue | 4 +- src/client/pages/notifications.vue | 2 +- .../page-editor/els/page-editor.el.button.vue | 20 +++--- .../page-editor/els/page-editor.el.canvas.vue | 6 +- .../els/page-editor.el.counter.vue | 6 +- .../els/page-editor.el.number-input.vue | 6 +- .../page-editor/els/page-editor.el.post.vue | 6 +- .../els/page-editor.el.radio-button.vue | 8 +-- .../page-editor/els/page-editor.el.switch.vue | 6 +- .../els/page-editor.el.text-input.vue | 6 +- .../els/page-editor.el.textarea-input.vue | 6 +- .../page-editor/page-editor.script-block.vue | 2 +- src/client/pages/page-editor/page-editor.vue | 14 ++--- src/client/pages/page.vue | 8 +-- src/client/pages/pages.vue | 2 +- src/client/pages/preferences/index.vue | 32 +++++----- src/client/pages/preferences/plugins.vue | 2 +- src/client/pages/preferences/sidebar.vue | 4 +- src/client/pages/preferences/theme.vue | 16 ++--- src/client/pages/room/room.vue | 8 +-- src/client/pages/scratchpad.vue | 4 +- src/client/pages/share.vue | 4 +- src/client/pages/theme-editor.vue | 24 +++---- src/client/pages/user/index.photos.vue | 2 +- src/client/pages/user/index.timeline.vue | 6 +- src/client/pages/user/index.vue | 10 +-- src/client/widgets/memo.vue | 2 +- src/client/widgets/welcome.vue | 2 +- 108 files changed, 459 insertions(+), 459 deletions(-) diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index e77b0d1a99..c8a01fa72d 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -8,7 +8,7 @@ @{{ user | acct }} -
  • {{ $t('selectUser') }}
  • +
    1. diff --git a/src/client/components/dialog.vue b/src/client/components/dialog.vue index 0ca9a5c69e..dd2020382c 100644 --- a/src/client/components/dialog.vue +++ b/src/client/components/dialog.vue @@ -21,7 +21,7 @@
      -
      {{ $t('enterUsername') }}
      +
      @@ -37,7 +37,7 @@
      {{ (showCancelButton || input || select || user) ? $t('ok') : $t('gotIt') }} - {{ $t('cancel') }} +
      {{ action.text }} diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue index b31a4e6375..d21b522b08 100644 --- a/src/client/components/drive.file.vue +++ b/src/client/components/drive.file.vue @@ -9,15 +9,15 @@ >
      -

      {{ $t('avatar') }}

      +

      -

      {{ $t('banner') }}

      +

      -

      {{ $t('nsfw') }}

      +

      diff --git a/src/client/components/drive.vue b/src/client/components/drive.vue index 3e7b7d04ae..e8e3cae0cb 100644 --- a/src/client/components/drive.vue +++ b/src/client/components/drive.vue @@ -23,18 +23,18 @@
      - {{ $t('loadMore') }} +
      - {{ $t('loadMore') }} +

      {{ $t('empty-draghover') }}

      -

      {{ $t('emptyDrive') }}
      {{ $t('empty-drive-description') }}

      -

      {{ $t('emptyFolder') }}

      +


      {{ $t('empty-drive-description') }}

      +

      diff --git a/src/client/components/error.vue b/src/client/components/error.vue index 90efa700b2..2407596043 100644 --- a/src/client/components/error.vue +++ b/src/client/components/error.vue @@ -3,7 +3,7 @@

      {{ $t('error') }}

      - {{ $t('retry') }} +
      diff --git a/src/client/components/follow-button.vue b/src/client/components/follow-button.vue index 7967c0e159..976226a5f9 100644 --- a/src/client/components/follow-button.vue +++ b/src/client/components/follow-button.vue @@ -7,23 +7,23 @@ > diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue index 552e3523f7..a7c2d5b313 100644 --- a/src/client/components/instance-stats.vue +++ b/src/client/components/instance-stats.vue @@ -4,19 +4,19 @@
      {{ $t('users') }} - {{ $t('local') }} +
      -
      {{ $t('total') }}
      +
      {{ info.originalUsersCount | number }}
      -
      {{ $t('dayOverDayChanges') }}
      +
      {{ usersLocalDoD | number }}
      -
      {{ $t('weekOverWeekChanges') }}
      +
      {{ usersLocalWoW | number }}
      @@ -24,19 +24,19 @@
      {{ $t('users') }} - {{ $t('remote') }} +
      -
      {{ $t('total') }}
      +
      {{ (info.usersCount - info.originalUsersCount) | number }}
      -
      {{ $t('dayOverDayChanges') }}
      +
      {{ usersRemoteDoD | number }}
      -
      {{ $t('weekOverWeekChanges') }}
      +
      {{ usersRemoteWoW | number }}
      @@ -44,19 +44,19 @@
      {{ $t('notes') }} - {{ $t('local') }} +
      -
      {{ $t('total') }}
      +
      {{ info.originalNotesCount | number }}
      -
      {{ $t('dayOverDayChanges') }}
      +
      {{ notesLocalDoD | number }}
      -
      {{ $t('weekOverWeekChanges') }}
      +
      {{ notesLocalWoW | number }}
      @@ -64,19 +64,19 @@
      {{ $t('notes') }} - {{ $t('remote') }} +
      -
      {{ $t('total') }}
      +
      {{ (info.notesCount - info.originalNotesCount) | number }}
      -
      {{ $t('dayOverDayChanges') }}
      +
      {{ notesRemoteDoD | number }}
      -
      {{ $t('weekOverWeekChanges') }}
      +
      {{ notesRemoteWoW | number }}
      @@ -89,30 +89,30 @@
      - - + + - - - + + + - - - - + + + + - - - - + + + + - - + +
      diff --git a/src/client/components/media-banner.vue b/src/client/components/media-banner.vue index 0f746d4340..c24acca019 100644 --- a/src/client/components/media-banner.vue +++ b/src/client/components/media-banner.vue @@ -2,8 +2,8 @@
      - {{ $t('sensitive') }} - {{ $t('clickToShow') }} + +
      diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue index a5e06bfaa9..72dda5596e 100644 --- a/src/client/components/media-video.vue +++ b/src/client/components/media-video.vue @@ -2,7 +2,7 @@
      {{ $t('sensitive') }} - {{ $t('clickToShow') }} +
      diff --git a/src/client/components/mention.vue b/src/client/components/mention.vue index 0303e0e5b5..e25a5de716 100644 --- a/src/client/components/mention.vue +++ b/src/client/components/mention.vue @@ -1,6 +1,6 @@