sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ドメインは常にPunycodeで保存するように

Browse Source
This commit is contained in:
syuilo
2019-04-09 23:59:32 +09:00
parent 4d64fd665e
commit 33a9783ae5
11 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/queue/processors/db/import-following.ts
View File

@ -5,7 +5,7 @@ import follow from '../../../services/following/create';
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';
import { isSelfHost, toPuny } from '../../../misc/convert-host';
import { Users, DriveFiles } from '../../../models';
const logger = queueLogger.createSubLogger('import-following');
@ -35,7 +35,7 @@ export async function importFollowing(job: Bull.Job, done: any): Promise<void> {
host: null,
usernameLower: username.toLowerCase()
}) : await Users.findOne({
host: toDbHost(host),
host: toPuny(host),
usernameLower: username.toLowerCase()
});

4
src/queue/processors/db/import-user-lists.ts
View File

@ -5,7 +5,7 @@ import parseAcct from '../../../misc/acct/parse';
import { resolveUser } from '../../../remote/resolve-user';
import { pushUserToUserList } from '../../../services/user-list/push';
import { downloadTextFile } from '../../../misc/download-text-file';
import { isSelfHost, toDbHost } from '../../../misc/convert-host';
import { isSelfHost, toPuny } from '../../../misc/convert-host';
import { DriveFiles, Users, UserLists, UserListJoinings } from '../../../models';
import { genId } from '../../../misc/gen-id';
@ -47,7 +47,7 @@ export async function importUserLists(job: Bull.Job, done: any): Promise<void> {
host: null,
usernameLower: username.toLowerCase()
}) : await Users.findOne({
host: toDbHost(host),
host: toPuny(host),
usernameLower: username.toLowerCase()
});