profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: Punycodeなインスタンスが重複登録される (#4667)

Browse source
This commit is contained in:
MeiMei 2019-04-12 20:03:00 +09:00 • committed by syuilo
parent 6abc053a48
commit 81006566a5
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/api/index.ts
View file

@ -16,7 +16,8 @@ import discord from './service/discord';
import github from './service/github'; import github from './service/github';
import twitter from './service/twitter'; import twitter from './service/twitter';
import Instance from '../../models/instance'; import Instance from '../../models/instance';
import { toASCII } from 'punycode'; import { toApHost } from '../../misc/convert-host';
import { unique } from '../../prelude/array';
// Init app // Init app
const app = new Koa(); const app = new Koa();
@ -72,7 +73,7 @@ router.get('/v1/instance/peers', async ctx => {
host: 1 host: 1
}); });
const punyCodes = instances.map(instance => toASCII(instance.host)); const punyCodes = unique(instances.map(instance => toApHost(instance.host)));
ctx.body = punyCodes; ctx.body = punyCodes;
}); });

3
src/services/register-or-fetch-instance-doc.ts
View file

@ -1,9 +1,12 @@
import Instance, { IInstance } from '../models/instance'; import Instance, { IInstance } from '../models/instance';
import federationChart from '../services/chart/federation'; import federationChart from '../services/chart/federation';
import { toDbHost } from '../misc/convert-host';
export async function registerOrFetchInstanceDoc(host: string): Promise<IInstance> { export async function registerOrFetchInstanceDoc(host: string): Promise<IInstance> {
if (host == null) return null; if (host == null) return null;
host = toDbHost(host);
const index = await Instance.findOne({ host }); const index = await Instance.findOne({ host });
if (index == null) { if (index == null) {