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

More puny

Browse Source
This commit is contained in:
syuilo
2019-04-10 00:59:41 +09:00
parent 72a5f7b1e2
commit 236d72685d
14 changed files with 52 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/api/endpoints/admin/emoji/list.ts
View File

@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../../define';
import { Emojis } from '../../../../../models';
import { toPuny } from '../../../../../misc/convert-host';
export const meta = {
desc: {
@ -22,7 +23,7 @@ export const meta = {
export default define(meta, async (ps) => {
const emojis = await Emojis.find({
host: ps.host
host: toPuny(ps.host)
});
return emojis.map(e => ({

5
src/server/api/endpoints/admin/federation/update-instance.ts
View File

@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../../define';
import { Instances } from '../../../../../models';
import { toPuny } from '../../../../../misc/convert-host';
export const meta = {
tags: ['admin'],
@ -20,13 +21,13 @@ export const meta = {
};
export default define(meta, async (ps, me) => {
const instance = await Instances.findOne({ host: ps.host });
const instance = await Instances.findOne({ host: toPuny(ps.host) });
if (instance == null) {
throw new Error('instance not found');
}
Instances.update({ host: ps.host }, {
Instances.update({ host: toPuny(ps.host) }, {
isMarkedAsClosed: ps.isClosed
});
});

3
src/server/api/endpoints/federation/show-instance.ts
View File

@ -1,6 +1,7 @@
import $ from 'cafy';
import define from '../../define';
import { Instances } from '../../../../models';
import { toPuny } from '../../../../misc/convert-host';
export const meta = {
tags: ['federation'],
@ -16,7 +17,7 @@ export const meta = {
export default define(meta, async (ps, me) => {
const instance = await Instances
.findOne({ host: ps.host });
.findOne({ host: toPuny(ps.host) });
return instance;
});

3
src/server/api/endpoints/users/followers.ts
View File

@ -4,6 +4,7 @@ import define from '../../define';
import { ApiError } from '../../error';
import { Users, Followings } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { toPuny } from '../../../../misc/convert-host';
export const meta = {
desc: {
@ -65,7 +66,7 @@ export const meta = {
export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId != null
? { id: ps.userId }
: { usernameLower: ps.username.toLowerCase(), host: ps.host });
: { usernameLower: ps.username.toLowerCase(), host: toPuny(ps.host) });
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);

3
src/server/api/endpoints/users/following.ts
View File

@ -4,6 +4,7 @@ import define from '../../define';
import { ApiError } from '../../error';
import { Users, Followings } from '../../../../models';
import { makePaginationQuery } from '../../common/make-pagination-query';
import { toPuny } from '../../../../misc/convert-host';
export const meta = {
desc: {
@ -65,7 +66,7 @@ export const meta = {
export default define(meta, async (ps, me) => {
const user = await Users.findOne(ps.userId != null
? { id: ps.userId }
: { usernameLower: ps.username.toLowerCase(), host: ps.host });
: { usernameLower: ps.username.toLowerCase(), host: toPuny(ps.host) });
if (user == null) {
throw new ApiError(meta.errors.noSuchUser);