diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-03-12 23:38:11 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-12 23:38:11 +0900 |
| commit | 0a0aa0e2dbaf345a840b57216906ac52292ae3da (patch) | |
| tree | e7f82c159ca2138e30eb12e6e9e72c36b7f916a9 /src/queue/processors/db/import-following.ts | |
| parent | Add type annotation to avoid type error (diff) | |
| download | misskey-0a0aa0e2dbaf345a840b57216906ac52292ae3da.tar.gz misskey-0a0aa0e2dbaf345a840b57216906ac52292ae3da.tar.bz2 misskey-0a0aa0e2dbaf345a840b57216906ac52292ae3da.zip | |
Fix #4484 (#4485)
* Fix #4484
* import order
Diffstat (limited to 'src/queue/processors/db/import-following.ts')
| -rw-r--r-- | src/queue/processors/db/import-following.ts | 6 |
1 files changed, 3 insertions, 3 deletions
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() }); |