Skip to content

Commit

Permalink
fix: v12FEでメンション等をするときに補完できない
Browse files Browse the repository at this point in the history
  • Loading branch information
sousuke0422 authored and fs5m8 committed Aug 16, 2023
1 parent a820b7d commit 96d7925
Showing 1 changed file with 107 additions and 0 deletions.
107 changes: 107 additions & 0 deletions src/server/api/endpoints/users/search-by-username-and-host.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import $ from 'cafy';
import define from '../../define';
import { Users } from '../../../../models';

export const meta = {
desc: {
'ja-JP': 'ユーザーを検索します。'
},

tags: ['users'],

requireCredential: false as const,

params: {
username: {
validator: $.optional.nullable.str,
desc: {
'ja-JP': 'クエリ'
}
},

host: {
validator: $.optional.nullable.str,
desc: {
'ja-JP': 'クエリ'
}
},

offset: {
validator: $.optional.num.min(0),
default: 0,
desc: {
'ja-JP': 'オフセット'
}
},

limit: {
validator: $.optional.num.range(1, 100),
default: 10,
desc: {
'ja-JP': '取得する数'
}
},

detail: {
validator: $.optional.bool,
default: true,
desc: {
'ja-JP': '詳細なユーザー情報を含めるか否か'
}
},
},

res: {
type: 'array' as const,
optional: false as const, nullable: false as const,
items: {
type: 'object' as const,
optional: false as const, nullable: false as const,
ref: 'User',
}
},
};

export default define(meta, async (ps, me) => {
if (ps.host) {
const q = Users.createQueryBuilder('user')
.where('user.isSuspended = FALSE')
.andWhere('user.host LIKE :host', { host: ps.host.toLowerCase() + '%' });

if (ps.username) {
q.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' });
}

q.andWhere('user.updatedAt IS NOT NULL');
q.orderBy('user.updatedAt', 'DESC');

const users = await q.take(ps.limit!).skip(ps.offset).getMany();

return await Users.packMany(users, me, { detail: ps.detail });
} else if (ps.username) {
let users = await Users.createQueryBuilder('user')
.where('user.host IS NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
.andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit!)
.skip(ps.offset)
.getMany();

if (users.length < ps.limit!) {
const otherUsers = await Users.createQueryBuilder('user')
.where('user.host IS NOT NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
.andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit! - users.length)
.getMany();

users = users.concat(otherUsers);
}

return await Users.packMany(users, me, { detail: ps.detail });
}
});

0 comments on commit 96d7925

Please sign in to comment.