From ba3879a95ac8739f043fac42a39972510d505656 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue, 16 Apr 2019 02:46:47 +0900 Subject: Fix: admin/driveのアイコンがずれてる (#4710) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/admin/views/drive.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client') diff --git a/src/client/app/admin/views/drive.vue b/src/client/app/admin/views/drive.vue index e4565b78fe..22b3b7eb96 100644 --- a/src/client/app/admin/views/drive.vue +++ b/src/client/app/admin/views/drive.vue @@ -242,7 +242,7 @@ export default Vue.extend({ > div:nth-child(1) > .thumbnail - display block + display flex width 64px height 64px background-size cover -- cgit v1.2.3-freya From f966d0b32c9cd45b531a4d76f01bf008e5136bd0 Mon Sep 17 00:00:00 2001 From: tamaina Date: Tue, 16 Apr 2019 13:05:10 +0900 Subject: 色々な修正; Fix #4709 (#4714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix a la carte 1 * use dialog instead of alert() etc --- locales/ja-JP.yml | 4 +++- .../app/common/views/components/messaging-room.form.vue | 10 ++++++++-- src/client/app/common/views/components/messaging-room.vue | 5 ++++- src/client/app/common/views/components/post-form-attaches.vue | 2 +- src/client/app/common/views/components/settings/settings.vue | 4 ++-- src/client/app/common/views/components/signin.vue | 5 ++++- src/client/app/common/views/components/signup.vue | 5 ++++- src/client/app/common/views/deck/deck.widgets-column.vue | 4 ++-- src/client/app/common/views/widgets/post-form.vue | 5 ++++- src/client/app/desktop/views/components/drive.folder.vue | 5 ++++- src/client/app/desktop/views/components/drive.vue | 5 ++++- src/client/app/desktop/views/components/post-form.vue | 11 +++++++++-- src/client/app/desktop/views/home/home.vue | 5 +++-- src/client/app/desktop/views/pages/drive.vue | 2 +- src/client/app/mios.ts | 4 ++-- src/client/app/mobile/views/components/drive.file-detail.vue | 7 ++++++- src/client/app/mobile/views/components/post-form.vue | 11 +++++++++-- src/client/app/mobile/views/pages/favorites.vue | 2 +- src/client/app/mobile/views/pages/games/reversi.vue | 2 +- src/client/app/mobile/views/pages/search.vue | 2 +- src/client/app/mobile/views/pages/widgets.vue | 8 ++++++-- 21 files changed, 79 insertions(+), 29 deletions(-) (limited to 'src/client') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 82115a7224..eb87d4f204 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -313,6 +313,7 @@ common: nav: "ナビゲーション" tips: "ヒント" hashtags: "ハッシュタグ" + queue: "キュー" dev: "アプリの作成に失敗しました。再度お試しください。" ai-chan-kawaii: "藍ちゃかわいい" @@ -1549,6 +1550,7 @@ desktop/views/widgets/polls.vue: desktop/views/widgets/post-form.vue: title: "投稿" note: "投稿" + something-happened: "何らかの事情で投稿できませんでした。" desktop/views/widgets/profile.vue: update-banner: "クリックでバナー編集" @@ -1641,7 +1643,7 @@ mobile/views/components/post-form.vue: quote-placeholder: "この投稿を引用... (オプション)" reply-placeholder: "この投稿への返信..." cw-placeholder: "内容への注釈 (オプション)" - location-alert: "お使いの端末は位置情報に対応していません" + geolocation-alert: "お使いの端末は位置情報に対応していません" error: "エラー" username-prompt: "ユーザー名を入力してください" diff --git a/src/client/app/common/views/components/messaging-room.form.vue b/src/client/app/common/views/components/messaging-room.form.vue index 6c8b09c244..ee6c312bce 100644 --- a/src/client/app/common/views/components/messaging-room.form.vue +++ b/src/client/app/common/views/components/messaging-room.form.vue @@ -85,7 +85,10 @@ export default Vue.extend({ } } else { if (items[0].kind == 'file') { - alert(this.$t('only-one-file-attached')); + this.$root.dialog({ + type: 'error', + text: this.$t('only-one-file-attached') + }); } } }, @@ -107,7 +110,10 @@ export default Vue.extend({ return; } else if (e.dataTransfer.files.length > 1) { e.preventDefault(); - alert(this.$t('only-one-file-attached')); + this.$root.dialog({ + type: 'error', + text: this.$t('only-one-file-attached') + }); return; } diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue index 6f13d50c1e..83a0c463e0 100644 --- a/src/client/app/common/views/components/messaging-room.vue +++ b/src/client/app/common/views/components/messaging-room.vue @@ -125,7 +125,10 @@ export default Vue.extend({ this.form.upload(e.dataTransfer.files[0]); return; } else if (e.dataTransfer.files.length > 1) { - alert(this.$t('only-one-file-attached')); + this.$root.dialog({ + type: 'error', + text: this.$t('only-one-file-attached') + }); return; } diff --git a/src/client/app/common/views/components/post-form-attaches.vue b/src/client/app/common/views/components/post-form-attaches.vue index 467e430ccf..1fe476be77 100644 --- a/src/client/app/common/views/components/post-form-attaches.vue +++ b/src/client/app/common/views/components/post-form-attaches.vue @@ -1,6 +1,6 @@ {{ $t('email-address') }} - {{ $t('save') }} + {{ $t('save') }} -- cgit v1.2.3-freya From 85d29a3f9d2fa2970b5dd5e17498bf3aa5e20f70 Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Wed, 17 Apr 2019 00:30:34 +0900 Subject: Correct syntax error (#4718) --- src/client/app/common/scripts/note-mixin.ts | 2 +- src/client/style.styl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts index 67bbe8c0ae..4b454f8800 100644 --- a/src/client/app/common/scripts/note-mixin.ts +++ b/src/client/app/common/scripts/note-mixin.ts @@ -134,7 +134,7 @@ export default (opts: Opts = {}) => ({ }, reactDirectly(reaction) { - (this.$root.api('notes/reactions/create', { + this.$root.api('notes/reactions/create', { noteId: this.appearNote.id, reaction: reaction }); diff --git a/src/client/style.styl b/src/client/style.styl index c6a8e4f19d..968e66e754 100644 --- a/src/client/style.styl +++ b/src/client/style.styl @@ -1,4 +1,4 @@ -@charset 'utf-8' +@charset "utf-8" /* ::selection -- cgit v1.2.3-freya From b1865047187bf6fc9d4ad3b56a0d4eb6b2817c2b Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Wed, 17 Apr 2019 00:45:33 +0900 Subject: Metaのアクセスでトランザクションを張るように (#4720) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * admin/instanceでmetaをキャッシュしないように * Metaのアクセスにトランザクションをかける --- src/client/app/admin/views/instance.vue | 2 +- src/misc/fetch-meta.ts | 26 +++++++++++++++++--------- src/server/api/endpoints/admin/update-meta.ts | 20 +++++++++++++------- 3 files changed, 31 insertions(+), 17 deletions(-) (limited to 'src/client') diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index bc2a5fba85..cca4e5f669 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -195,7 +195,7 @@ export default Vue.extend({ }, created() { - this.$root.getMeta().then(meta => { + this.$root.getMeta(true).then(meta => { this.maintainerName = meta.maintainerName; this.maintainerEmail = meta.maintainerEmail; this.disableRegistration = meta.disableRegistration; diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts index a459f07729..800f0b9e63 100644 --- a/src/misc/fetch-meta.ts +++ b/src/misc/fetch-meta.ts @@ -1,13 +1,21 @@ import { Meta } from '../models/entities/meta'; -import { Metas } from '../models'; +import { getConnection } from 'typeorm'; export default async function(): Promise { - const meta = await Metas.findOne(); - if (meta) { - return meta; - } else { - return Metas.save({ - id: 'x' - } as Meta); - } + return await getConnection().transaction(async transactionalEntityManager => { + // バグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する + const meta = await transactionalEntityManager.findOne(Meta, { + order: { + id: 'DESC' + } + }); + + if (meta) { + return meta; + } else { + return await transactionalEntityManager.save(Meta, { + id: 'x' + }) as Meta; + } + }); } diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts index e242ac71a1..3c6380acb4 100644 --- a/src/server/api/endpoints/admin/update-meta.ts +++ b/src/server/api/endpoints/admin/update-meta.ts @@ -1,6 +1,6 @@ import $ from 'cafy'; import define from '../../define'; -import { Metas } from '../../../../models'; +import { getConnection } from 'typeorm'; import { Meta } from '../../../../models/entities/meta'; export const meta = { @@ -505,11 +505,17 @@ export default define(meta, async (ps) => { set.swPrivateKey = ps.swPrivateKey; } - const meta = await Metas.findOne(); + await getConnection().transaction(async transactionalEntityManager => { + const meta = await transactionalEntityManager.findOne(Meta, { + order: { + id: 'DESC' + } + }); - if (meta) { - await Metas.update(meta.id, set); - } else { - await Metas.save(set); - } + if (meta) { + await transactionalEntityManager.update(Meta, meta.id, set); + } else { + await transactionalEntityManager.save(Meta, set); + } + }); }); -- cgit v1.2.3-freya