3 files changed, 13 insertions, 3 deletions
diff --git a/src/queue/index.ts b/src/queue/index.ts
index 88e475dd5d..3f82b30b35 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -2,6 +2,7 @@ import { createQueue } from 'kue';
 
 import config from '../config';
 import http from './processors/http';
+import { ILocalUser } from '../models/user';
 
 const queue = createQueue({
 	redis: {
@@ -14,17 +15,20 @@ const queue = createQueue({
 export function createHttp(data) {
 	return queue
 		.create('http', data)
+		.removeOnComplete(true)
+		.events(false)
 		.attempts(8)
 		.backoff({ delay: 16384, type: 'exponential' });
 }
 
-export function deliver(user, content, to) {
+export function deliver(user: ILocalUser, content, to) {
 	createHttp({
+		title: 'deliver',
 		type: 'deliver',
 		user,
 		content,
 		to
-	}).removeOnComplete(true).save();
+	}).save();
 }
 
 export default function() {
diff --git a/src/queue/processors/http/deliver.ts b/src/queue/processors/http/deliver.ts
index cf843fad07..2c4bbe9bf0 100644
--- a/src/queue/processors/http/deliver.ts
+++ b/src/queue/processors/http/deliver.ts
@@ -7,13 +7,14 @@ export default async (job: kue.Job, done): Promise<void> => {
 		await request(job.data.user, job.data.to, job.data.content);
 		done();
 	} catch (res) {
+		if (res.statusCode == null) return done();
 		if (res.statusCode >= 400 && res.statusCode < 500) {
 			// HTTPステータスコード4xxはクライアントエラーであり、それはつまり
 			// 何回再送しても成功することはないということなのでエラーにはしないでおく
 			done();
 		} else {
 			console.warn(`deliver failed: ${res.statusMessage}`);
-			done(new Error(res.statusMessage));
+			done(res.statusMessage);
 		}
 	}
 };
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 75ff5918f6..dfafe64a78 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -33,6 +33,11 @@ export default async (job: kue.Job, done): Promise<void> => {
 		}
 
 		user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
+
+		// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
+		if (user === null) {
+			user = await resolvePerson(activity.actor);
+		}
 	} else {
 		user = await User.findOne({
 			host: { $ne: null },