Merge pull request #5 from syuilo/master

追従

2 files changed, 5 insertions, 5 deletions

diff --git a/src/queue/index.ts b/src/queue/index.ts
index 4aa1dc032d..94efb3634a 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -19,12 +19,12 @@ export function createHttp(data) {
 }
 
 export function deliver(user, content, to) {
-	return createHttp({
+	createHttp({
 		type: 'deliver',
 		user,
 		content,
 		to
-	});
+	}).save();
 }
 
 export default function() {
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index ce5b7d5a89..2c49a67b66 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -1,7 +1,7 @@
 import * as kue from 'kue';
 import * as debug from 'debug';
 
-import { verifySignature } from 'http-signature';
+const httpSignature = require('http-signature');
 import parseAcct from '../../../acct/parse';
 import User, { IRemoteUser } from '../../../models/user';
 import perform from '../../../remote/activitypub/perform';
@@ -32,7 +32,7 @@ export default async (job: kue.Job, done): Promise<void> => {
 			return;
 		}
 
-		user = await User.findOne({ usernameLower: username, hostLower: host }) as IRemoteUser;
+		user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
 	} else {
 		user = await User.findOne({
 			host: { $ne: null },
@@ -50,7 +50,7 @@ export default async (job: kue.Job, done): Promise<void> => {
 		return;
 	}
 
-	if (!verifySignature(signature, user.publicKey.publicKeyPem)) {
+	if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
 		console.warn('signature verification failed');
 		done();
 		return;