diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2020-10-28 22:48:25 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2020-10-28 22:48:25 +0900 |
| commit | 471911a54f644f2b34d1cc7d08257121bbb133a6 (patch) | |
| tree | 74cda99ddf57cbb03b14e80baa219f5faf6045cf /src | |
| parent | Fix error dialog (diff) | |
| parent | ドライブファイル参照がシステムユーザーで落ちるのを... (diff) | |
| download | misskey-471911a54f644f2b34d1cc7d08257121bbb133a6.tar.gz misskey-471911a54f644f2b34d1cc7d08257121bbb133a6.tar.bz2 misskey-471911a54f644f2b34d1cc7d08257121bbb133a6.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/pages/instance/files.vue | 3 | ||||
| -rw-r--r-- | src/models/repositories/drive-file.ts | 4 |
2 files changed, 4 insertions, 3 deletions
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 }); } |