Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,122 @@
|
||||
import { Brackets } from "typeorm";
|
||||
import { UserProfiles, Users } from "../../../../models/index.js";
|
||||
import define from "../../define.js";
|
||||
import { sqlLikeEscape } from "../../../../misc/sql-like-escape.js";
|
||||
import { generateMinorBadgeUserVisibilityQuery } from "../../common/generate-minor-badge-visibility-query.js";
|
||||
export const meta = {
|
||||
tags: [
|
||||
"users"
|
||||
],
|
||||
requireCredential: false,
|
||||
requireCredentialPrivateMode: true,
|
||||
description: "Search for users.",
|
||||
res: {
|
||||
type: "array",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
items: {
|
||||
type: "object",
|
||||
optional: false,
|
||||
nullable: false,
|
||||
ref: "User"
|
||||
}
|
||||
}
|
||||
};
|
||||
export const paramDef = {
|
||||
type: "object",
|
||||
properties: {
|
||||
query: {
|
||||
type: "string"
|
||||
},
|
||||
offset: {
|
||||
type: "integer",
|
||||
default: 0
|
||||
},
|
||||
limit: {
|
||||
type: "integer",
|
||||
minimum: 1,
|
||||
maximum: 100,
|
||||
default: 10
|
||||
},
|
||||
origin: {
|
||||
type: "string",
|
||||
enum: [
|
||||
"local",
|
||||
"remote",
|
||||
"combined"
|
||||
],
|
||||
default: "combined"
|
||||
},
|
||||
detail: {
|
||||
type: "boolean",
|
||||
default: true
|
||||
}
|
||||
},
|
||||
required: [
|
||||
"query"
|
||||
]
|
||||
};
|
||||
export default define(meta, paramDef, async (ps, me)=>{
|
||||
const activeThreshold = new Date(Date.now() - 1000 * 60 * 60 * 24 * 30); // 30日
|
||||
const isUsername = ps.query.startsWith("@");
|
||||
let users = [];
|
||||
if (isUsername) {
|
||||
const usernameQuery = Users.createQueryBuilder("user").where("user.usernameLower LIKE :username", {
|
||||
username: `${sqlLikeEscape(ps.query.replace("@", "").toLowerCase())}%`
|
||||
}).andWhere(new Brackets((qb)=>{
|
||||
qb.where("user.updatedAt IS NULL").orWhere("user.updatedAt > :activeThreshold", {
|
||||
activeThreshold: activeThreshold
|
||||
});
|
||||
})).andWhere("user.isSuspended = FALSE");
|
||||
if (ps.origin === "local") {
|
||||
usernameQuery.andWhere("user.host IS NULL");
|
||||
} else if (ps.origin === "remote") {
|
||||
usernameQuery.andWhere("user.host IS NOT NULL");
|
||||
}
|
||||
generateMinorBadgeUserVisibilityQuery(usernameQuery, me);
|
||||
users = await usernameQuery.orderBy("user.updatedAt", "DESC", "NULLS LAST").take(ps.limit).skip(ps.offset).getMany();
|
||||
} else {
|
||||
const nameQuery = Users.createQueryBuilder("user").where(new Brackets((qb)=>{
|
||||
qb.where("user.name ILIKE :query", {
|
||||
query: `%${sqlLikeEscape(ps.query)}%`
|
||||
});
|
||||
// Also search username if it qualifies as username
|
||||
if (Users.validateLocalUsername(ps.query)) {
|
||||
qb.orWhere("user.usernameLower LIKE :username", {
|
||||
username: `%${sqlLikeEscape(ps.query.toLowerCase())}%`
|
||||
});
|
||||
}
|
||||
})).andWhere(new Brackets((qb)=>{
|
||||
qb.where("user.updatedAt IS NULL").orWhere("user.updatedAt > :activeThreshold", {
|
||||
activeThreshold: activeThreshold
|
||||
});
|
||||
})).andWhere("user.isSuspended = FALSE");
|
||||
if (ps.origin === "local") {
|
||||
nameQuery.andWhere("user.host IS NULL");
|
||||
} else if (ps.origin === "remote") {
|
||||
nameQuery.andWhere("user.host IS NOT NULL");
|
||||
}
|
||||
generateMinorBadgeUserVisibilityQuery(nameQuery, me);
|
||||
users = await nameQuery.orderBy("user.updatedAt", "DESC", "NULLS LAST").take(ps.limit).skip(ps.offset).getMany();
|
||||
if (users.length < ps.limit) {
|
||||
const profQuery = UserProfiles.createQueryBuilder("prof").select("prof.userId").where("prof.description ILIKE :query", {
|
||||
query: `%${sqlLikeEscape(ps.query)}%`
|
||||
});
|
||||
if (ps.origin === "local") {
|
||||
profQuery.andWhere("prof.userHost IS NULL");
|
||||
} else if (ps.origin === "remote") {
|
||||
profQuery.andWhere("prof.userHost IS NOT NULL");
|
||||
}
|
||||
const query = Users.createQueryBuilder("user").where(`user.id IN (${profQuery.getQuery()})`).andWhere(new Brackets((qb)=>{
|
||||
qb.where("user.updatedAt IS NULL").orWhere("user.updatedAt > :activeThreshold", {
|
||||
activeThreshold: activeThreshold
|
||||
});
|
||||
})).andWhere("user.isSuspended = FALSE").setParameters(profQuery.getParameters());
|
||||
generateMinorBadgeUserVisibilityQuery(query, me);
|
||||
users = users.concat(await query.orderBy("user.updatedAt", "DESC", "NULLS LAST").take(ps.limit).skip(ps.offset).getMany());
|
||||
}
|
||||
}
|
||||
return await Users.packMany(users, me, {
|
||||
detail: ps.detail
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user