From 805bc4b25433cdc3eda068ec2c7be7260381dcef Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 10 Apr 2018 02:12:17 +0900
Subject: Refactor

---
 src/queue/processors/http/deliver.ts |  2 +-
 src/remote/activitypub/request.ts    | 44 ++++++++++++++++++++++++++++++++++++
 src/remote/request.ts                | 44 ------------------------------------
 3 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 src/remote/activitypub/request.ts
 delete mode 100644 src/remote/request.ts

(limited to 'src')

diff --git a/src/queue/processors/http/deliver.ts b/src/queue/processors/http/deliver.ts
index 422e355b5f..cf843fad07 100644
--- a/src/queue/processors/http/deliver.ts
+++ b/src/queue/processors/http/deliver.ts
@@ -1,6 +1,6 @@
 import * as kue from 'kue';
 
-import request from '../../../remote/request';
+import request from '../../../remote/activitypub/request';
 
 export default async (job: kue.Job, done): Promise<void> => {
 	try {
diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts
new file mode 100644
index 0000000000..85f43eb91d
--- /dev/null
+++ b/src/remote/activitypub/request.ts
@@ -0,0 +1,44 @@
+import { request } from 'https';
+import { sign } from 'http-signature';
+import { URL } from 'url';
+import * as debug from 'debug';
+
+import config from '../../config';
+import { ILocalUser } from '../../models/user';
+
+const log = debug('misskey:activitypub:deliver');
+
+export default (user: ILocalUser, url: string, object) => new Promise((resolve, reject) => {
+	log(`--> ${url}`);
+
+	const { protocol, hostname, port, pathname, search } = new URL(url);
+
+	const req = request({
+		protocol,
+		hostname,
+		port,
+		method: 'POST',
+		path: pathname + search,
+	}, res => {
+		res.on('end', () => {
+			log(`${url} --> ${res.statusCode}`);
+
+			if (res.statusCode >= 200 && res.statusCode < 300) {
+				resolve();
+			} else {
+				reject(res);
+			}
+		});
+
+		res.on('data', () => {});
+		res.on('error', reject);
+	});
+
+	sign(req, {
+		authorizationHeaderName: 'Signature',
+		key: user.keypair,
+		keyId: `acct:${user.username}@${config.host}`
+	});
+
+	req.end(JSON.stringify(object));
+});
diff --git a/src/remote/request.ts b/src/remote/request.ts
deleted file mode 100644
index 81e7c05c73..0000000000
--- a/src/remote/request.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { request } from 'https';
-import { sign } from 'http-signature';
-import { URL } from 'url';
-import * as debug from 'debug';
-
-import config from '../config';
-import { ILocalUser } from '../models/user';
-
-const log = debug('misskey:activitypub:deliver');
-
-export default (user: ILocalUser, url: string, object) => new Promise((resolve, reject) => {
-	log(`--> ${url}`);
-
-	const { protocol, hostname, port, pathname, search } = new URL(url);
-
-	const req = request({
-		protocol,
-		hostname,
-		port,
-		method: 'POST',
-		path: pathname + search,
-	}, res => {
-		res.on('end', () => {
-			log(`${url} --> ${res.statusCode}`);
-
-			if (res.statusCode >= 200 && res.statusCode < 300) {
-				resolve();
-			} else {
-				reject(res);
-			}
-		});
-
-		res.on('data', () => {});
-		res.on('error', reject);
-	});
-
-	sign(req, {
-		authorizationHeaderName: 'Signature',
-		key: user.keypair,
-		keyId: `acct:${user.username}@${config.host}`
-	});
-
-	req.end(JSON.stringify(object));
-});
-- 
cgit v1.2.3-freya