Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
		
						commit
						471911a54f
					
				|  | @ -601,6 +601,7 @@ editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウ | |||
| instanceTicker: "ノートのインスタンス情報" | ||||
| waitingFor: "{x}を待っています" | ||||
| random: "ランダム" | ||||
| system: "システム" | ||||
| 
 | ||||
| _reversi: | ||||
|   reversi: "リバーシ" | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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 | ||||
| 		}); | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue