From 4e968216add93946e936e276df657838fa76d5f0 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Wed, 28 Oct 2020 22:24:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=89=E3=83=A9=E3=82=A4=E3=83=96=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=8F=82=E7=85=A7=E3=81=8C=E3=82=B7?= =?UTF-8?q?=E3=82=B9=E3=83=86=E3=83=A0=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=A7=E8=90=BD=E3=81=A1=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#6774)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 1 + src/client/pages/instance/files.vue | 3 ++- src/models/repositories/drive-file.ts | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 75ab558499..13d6f9bd5a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -601,6 +601,7 @@ editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウ instanceTicker: "ノートのインスタンス情報" waitingFor: "{x}を待っています" random: "ランダム" +system: "システム" _reversi: reversi: "リバーシ" diff --git a/src/client/pages/instance/files.vue b/src/client/pages/instance/files.vue index ea90e3b5cd..29efe08a39 100644 --- a/src/client/pages/instance/files.vue +++ b/src/client/pages/instance/files.vue @@ -42,7 +42,8 @@ <small style="opacity: 0.7;">{{ file.name }}</small> </div> <div> - <MkAcct :user="file.user"/> + <MkAcct v-if="file.user" :user="file.user"/> + <div v-else>{{ $t('system') }}</div> </div> <div> <span style="margin-right: 1em;">{{ file.type }}</span> diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts index e5739408db..7d1f2b9fec 100644 --- a/src/models/repositories/drive-file.ts +++ b/src/models/repositories/drive-file.ts @@ -124,8 +124,8 @@ export class DriveFileRepository extends Repository<DriveFile> { folder: opts.detail && file.folderId ? DriveFolders.pack(file.folderId, { detail: true }) : null, - userId: opts.withUser ? file.userId! : null, - user: opts.withUser ? Users.pack(file.userId!) : null + userId: opts.withUser ? file.userId : null, + user: (opts.withUser && file.userId) ? Users.pack(file.userId) : null }); }