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: ドライブファイル参照がシステムユーザーで落ちるのを修正 (#6774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/pages/instance/files.vue   | 3 ++-
 src/models/repositories/drive-file.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

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
 		});
 	}
 
-- 
cgit v1.2.3-freya