インスタンスブロックチェック時のhostのnormalizeを統一 (#4669)

This commit is contained in:
MeiMei
2019-04-12 20:54:50 +09:00
committed by syuilo
parent 81006566a5
commit 4db972318f
2 changed files with 5 additions and 4 deletions

View File

@@ -4,13 +4,13 @@ import { URL } from 'url';
import * as crypto from 'crypto';
import { lookup, IRunOptions } from 'lookup-dns-cache';
import * as promiseAny from 'promise-any';
import { toUnicode } from 'punycode';
import config from '../../config';
import { ILocalUser } from '../../models/user';
import { publishApLogStream } from '../../services/stream';
import { apLogger } from './logger';
import Instance from '../../models/instance';
import { toDbHost } from '../../misc/convert-host';
export const logger = apLogger.createSubLogger('deliver');
@@ -23,7 +23,7 @@ export default async (user: ILocalUser, url: string, object: any) => {
// ブロックしてたら中断
// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
const instance = await Instance.findOne({ host: toUnicode(host) });
const instance = await Instance.findOne({ host: toDbHost(host) });
if (instance && instance.isBlocked) return;
const data = JSON.stringify(object);