summaryrefslogtreecommitdiff
path: root/src/queue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:59:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:59:32 +0900
commit33a9783ae5cf18e913cfe3f0223ed89aa94e63b4 (patch)
tree6eae0a7d9791876eff8c7bac4fb3dcdd0679a8bf /src/queue
parentUpdate update.ts (diff)
downloadsharkey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.tar.gz
sharkey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.tar.bz2
sharkey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.zip
ドメインは常にPunycodeで保存するように
Diffstat (limited to 'src/queue')
-rw-r--r--src/queue/processors/db/import-following.ts4
-rw-r--r--src/queue/processors/db/import-user-lists.ts4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/queue/processors/db/import-following.ts b/src/queue/processors/db/import-following.ts
index 07a1639494..aae24b22d6 100644
--- a/src/queue/processors/db/import-following.ts
+++ b/src/queue/processors/db/import-following.ts
@@ -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()
});
diff --git a/src/queue/processors/db/import-user-lists.ts b/src/queue/processors/db/import-user-lists.ts
index ff896c1bef..c7273ea6b4 100644
--- a/src/queue/processors/db/import-user-lists.ts
+++ b/src/queue/processors/db/import-user-lists.ts
@@ -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()
});