Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
import { Brackets } from "typeorm";
|
||||
import { Mutings, UserProfiles } from "../../../models/index.js";
|
||||
export function generateMutedUserQuery(q, me, exclude) {
|
||||
const mutingQuery = Mutings.createQueryBuilder("muting").select("muting.muteeId").where("muting.muterId = :muterId", {
|
||||
muterId: me.id
|
||||
});
|
||||
if (exclude) {
|
||||
mutingQuery.andWhere("muting.muteeId != :excludeId", {
|
||||
excludeId: exclude.id
|
||||
});
|
||||
}
|
||||
const mutingInstanceQuery = UserProfiles.createQueryBuilder("user_profile").select("user_profile.mutedInstances").where("user_profile.userId = :muterId", {
|
||||
muterId: me.id
|
||||
});
|
||||
// 投稿の作者をミュートしていない かつ
|
||||
// 投稿の返信先の作者をミュートしていない かつ
|
||||
// 投稿の引用元の作者をミュートしていない
|
||||
q.andWhere(`note.userId NOT IN (${mutingQuery.getQuery()})`).andWhere(new Brackets((qb)=>{
|
||||
qb.where("note.replyUserId IS NULL").orWhere(`note.replyUserId NOT IN (${mutingQuery.getQuery()})`);
|
||||
})).andWhere(new Brackets((qb)=>{
|
||||
qb.where("note.renoteUserId IS NULL").orWhere(`note.renoteUserId NOT IN (${mutingQuery.getQuery()})`);
|
||||
}))// mute instances
|
||||
.andWhere(new Brackets((qb)=>{
|
||||
qb.andWhere("note.userHost IS NULL").orWhere(`NOT ((${mutingInstanceQuery.getQuery()})::jsonb ? note.userHost)`);
|
||||
})).andWhere(new Brackets((qb)=>{
|
||||
qb.where("note.replyUserHost IS NULL").orWhere(`NOT ((${mutingInstanceQuery.getQuery()})::jsonb ? note.replyUserHost)`);
|
||||
})).andWhere(new Brackets((qb)=>{
|
||||
qb.where("note.renoteUserHost IS NULL").orWhere(`NOT ((${mutingInstanceQuery.getQuery()})::jsonb ? note.renoteUserHost)`);
|
||||
}));
|
||||
q.setParameters(mutingQuery.getParameters());
|
||||
q.setParameters(mutingInstanceQuery.getParameters());
|
||||
}
|
||||
export function generateMutedUserQueryForUsers(q, me) {
|
||||
const mutingQuery = Mutings.createQueryBuilder("muting").select("muting.muteeId").where("muting.muterId = :muterId", {
|
||||
muterId: me.id
|
||||
});
|
||||
q.andWhere(`user.id NOT IN (${mutingQuery.getQuery()})`);
|
||||
q.setParameters(mutingQuery.getParameters());
|
||||
}
|
||||
Reference in New Issue
Block a user