10.99.0-l190409055857

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <[email protected]>",
-	"version": "10.99.0-l190408225123",
+	"version": "10.99.0-l190409055857",
 	"codename": "nighthike",
 	"repository": {
 		"type": "git",

src/client/app/common/views/deck/deck.widgets-column.vue

@@ -13,7 +13,6 @@
 					<option value="activity">{{ $t('@.widgets.activity') }}</option>
 					<option value="rss">{{ $t('@.widgets.rss') }}</option>
 					<option value="trends">{{ $t('@.widgets.trends') }}</option>
-					<option value="photo-stream">{{ $t('@.widgets.photo-stream') }}</option>
 					<option value="slideshow">{{ $t('@.widgets.slideshow') }}</option>
 					<option value="version">{{ $t('@.widgets.version') }}</option>
 					<option value="broadcast">{{ $t('@.widgets.broadcast') }}</option>

src/client/app/common/views/widgets/index.ts

@@ -8,7 +8,6 @@ import wPostsMonitor from './posts-monitor.vue';
 import wMemo from './memo.vue';
 import wBroadcast from './broadcast.vue';
 import wCalendar from './calendar.vue';
-import wPhotoStream from './photo-stream.vue';
 import wSlideshow from './slideshow.vue';
 import wTips from './tips.vue';
 import wNav from './nav.vue';
@@ -19,7 +18,6 @@ import wPostForm from './post-form.vue';
 Vue.component('mkw-analog-clock', wAnalogClock);
 Vue.component('mkw-nav', wNav);
 Vue.component('mkw-calendar', wCalendar);
-Vue.component('mkw-photo-stream', wPhotoStream);
 Vue.component('mkw-slideshow', wSlideshow);
 Vue.component('mkw-tips', wTips);
 Vue.component('mkw-broadcast', wBroadcast);

src/client/app/desktop/views/home/home.vue

@@ -14,7 +14,6 @@
 						<option value="activity">{{ $t('@.widgets.activity') }}</option>
 						<option value="rss">{{ $t('@.widgets.rss') }}</option>
 						<option value="trends">{{ $t('@.widgets.trends') }}</option>
-						<option value="photo-stream">{{ $t('@.widgets.photo-stream') }}</option>
 						<option value="slideshow">{{ $t('@.widgets.slideshow') }}</option>
 						<option value="version">{{ $t('@.widgets.version') }}</option>
 						<option value="broadcast">{{ $t('@.widgets.broadcast') }}</option>
@@ -145,7 +144,6 @@ export default Vue.extend({
 					'activity',
 					'rss',
 					'hashtags',
-					'photo-stream',
 					'version'
 				],
 				right: [

src/client/app/mobile/views/pages/widgets.vue

@@ -13,7 +13,6 @@
 					<option value="calendar">{{ $t('@.widgets.calendar') }}</option>
 					<option value="activity">{{ $t('@.widgets.activity') }}</option>
 					<option value="rss">{{ $t('@.widgets.rss') }}</option>
-					<option value="photo-stream">{{ $t('@.widgets.photo-stream') }}</option>
 					<option value="slideshow">{{ $t('@.widgets.slideshow') }}</option>
 					<option value="hashtags">{{ $t('@.widgets.hashtags') }}</option>
 					<option value="posts-monitor">{{ $t('@.widgets.posts-monitor') }}</option>
@@ -86,9 +85,6 @@ export default Vue.extend({
 			}, {
 				name: 'rss',
 				id: 'c', data: {}
-			}, {
-				name: 'photo-stream',
-				id: 'd', data: {}
 			}, {
 				name: 'nav',
 				id: 'f', data: {}

src/misc/get-drive-file-url.ts

@@ -14,7 +14,7 @@ export default function(file: IDriveFile, thumbnail = false): string {
 		}
 	} else if (file.metadata.withoutChunks) {
 		if (thumbnail) {
-			return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : null);
+			return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || (isImage ? file.metadata.url : '/assets/thumbnail-not-available.png');
 		} else {
 			return file.metadata.webpublicUrl || file.metadata.url;
 		}

src/queue/processors/inbox.ts

@@ -93,7 +93,17 @@ export default async (job: Bull.Job): Promise<void> => {
 
 	// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
 	if (user === null) {
-		user = await resolvePerson(activity.actor) as IRemoteUser;
+		try {
+			user = await resolvePerson(activity.actor) as IRemoteUser;
+		} catch (e) {
+			// 対象が4xxならスキップ
+			if (e.statusCode >= 400 && e.statusCode < 500) {
+				logger.warn(`Ignored actor ${activity.actor} - ${e.statusCode}`);
+				return;
+			}
+			logger.error(`Error in actor ${activity.actor} - ${e.statusCode || e}`);
+			throw e;
+		}
 	}
 
 	if (user === null) {

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

@@ -133,7 +133,7 @@ export default async function(ctx: Koa.BaseContext) {
 				await sendRaw();
 			} else {
 				ctx.status = 404;
-				await send(ctx as any, '/dummy.png', { root: assets });
+				await send(ctx as any, '/thumbnail-not-available.png', { root: assets });
 			}
 		}
 	} else if ('web' in ctx.query) {