From 0a0aa0e2dbaf345a840b57216906ac52292ae3da Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 12 Mar 2019 23:38:11 +0900
Subject:  Fix #4484  (#4485)

* Fix #4484

* import order
---
 src/queue/processors/db/import-following.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/queue/processors/db/import-following.ts')

diff --git a/src/queue/processors/db/import-following.ts b/src/queue/processors/db/import-following.ts
index 9b8b9f9614..ad9129c1f5 100644
--- a/src/queue/processors/db/import-following.ts
+++ b/src/queue/processors/db/import-following.ts
@@ -3,13 +3,13 @@ import * as mongo from 'mongodb';
 
 import { queueLogger } from '../../logger';
 import User from '../../../models/user';
-import config from '../../../config';
 import follow from '../../../services/following/create';
 import DriveFile from '../../../models/drive-file';
 import { getOriginalUrl } from '../../../misc/get-drive-file-url';
 import parseAcct from '../../../misc/acct/parse';
 import resolveUser from '../../../remote/resolve-user';
 import { downloadTextFile } from '../../../misc/download-text-file';
+import { isSelfHost, toDbHost } from '../../../misc/convert-host';
 
 const logger = queueLogger.createSubLogger('import-following');
 
@@ -31,11 +31,11 @@ export async function importFollowing(job: Bull.Job, done: any): Promise<void> {
 	for (const line of csv.trim().split('\n')) {
 		const { username, host } = parseAcct(line.trim());
 
-		let target = host === config.host ? await User.findOne({
+		let target = isSelfHost(host) ? await User.findOne({
 			host: null,
 			usernameLower: username.toLowerCase()
 		}) : await User.findOne({
-			host: host,
+			host: toDbHost(host),
 			usernameLower: username.toLowerCase()
 		});
 
-- 
cgit v1.2.3-freya