oops

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.0.0",
-	"clientVersion": "1.0.5184",
+	"version": "2.1.1",
+	"clientVersion": "1.0.5188",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/common/views/components/othello.vue

@@ -40,8 +40,8 @@
 		<section v-if="myGames.length > 0">
 			<h2>自分の対局</h2>
 			<a class="game" v-for="g in myGames" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
-				<mk-avatar class="avatar" :user="g.user1.avatarUrl"/>
-				<mk-avatar class="avatar" :user="g.user2.avatarUrl"/>
+				<mk-avatar class="avatar" :user="g.user1"/>
+				<mk-avatar class="avatar" :user="g.user2"/>
 				<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
 				<span class="state">{{ g.isEnded ? '終了' : '進行中' }}</span>
 			</a>
@@ -49,8 +49,8 @@
 		<section v-if="games.length > 0">
 			<h2>みんなの対局</h2>
 			<a class="game" v-for="g in games" tabindex="-1" @click.prevent="go(g)" :href="`/othello/${g.id}`">
-				<mk-avatar class="avatar" :user="g.user1.avatarUrl"/>
-				<mk-avatar class="avatar" :user="g.user2.avatarUrl"/>
+				<mk-avatar class="avatar" :user="g.user1"/>
+				<mk-avatar class="avatar" :user="g.user2"/>
 				<span><b>{{ g.user1.name }}</b> vs <b>{{ g.user2.name }}</b></span>
 				<span class="state">{{ g.isEnded ? '終了' : '進行中' }}</span>
 			</a>
@@ -272,6 +272,8 @@ export default Vue.extend({
 			background #eee
 
 		> .avatar
+			width 32px
+			height 32px
 			border-radius 100%
 
 		> span
@@ -301,6 +303,8 @@ export default Vue.extend({
 			background #eee
 
 		> .avatar
+			width 32px
+			height 32px
 			border-radius 100%
 
 		> span

src/models/drive-file.ts

@@ -30,6 +30,7 @@ export type IMetadata = {
 	comment: string;
 	uri: string;
 	deletedAt?: Date;
+	isExpired?: boolean;
 };
 
 export type IDriveFile = {

src/server/file/send-drive-file.ts

@@ -31,7 +31,11 @@ export default async function(ctx: Koa.Context) {
 
 	if (file.metadata.deletedAt) {
 		ctx.status = 410;
-		await send(ctx, `${__dirname}/assets/tombstone.png`);
+		if (file.metadata.isExpired) {
+			await send(ctx, `${__dirname}/assets/cache-expired.png`);
+		} else {
+			await send(ctx, `${__dirname}/assets/tombstone.png`);
+		}
 		return;
 	}
 

src/services/drive/add-file.ts

@@ -201,7 +201,10 @@ const addFile = async (
 			// Calculate drive usage
 			const usage = await DriveFile
 				.aggregate([{
-					$match: { 'metadata.userId': user._id }
+					$match: {
+						'metadata.userId': user._id,
+						'metadata.deletedAt': { $exists: false }
+					}
 				}, {
 					$project: {
 						length: true
@@ -245,7 +248,8 @@ const addFile = async (
 
 						DriveFile.update({ _id: oldFile._id }, {
 							$set: {
-								'metadata.deletedAt': new Date()
+								'metadata.deletedAt': new Date(),
+								'metadata.isExpired': true
 							}
 						});