Fixed 267U.pre2

This commit is contained in:
2026-07-26 18:25:37 +09:00
parent 50bfaeafdf
commit 317d00a284
1286 changed files with 80222 additions and 1 deletions
@@ -0,0 +1,99 @@
import deleteBlocking from "../../../../services/blocking/delete.js";
import define from "../../define.js";
import { ApiError } from "../../error.js";
import { getUser } from "../../common/getters.js";
import { Blockings, Users } from "../../../../models/index.js";
import { HOUR } from "../../../../const.js";
import { getGroupActor } from "../../common/get-group-actor.js";
export const meta = {
tags: [
"account"
],
limit: {
duration: HOUR,
max: 100
},
requireCredential: true,
kind: "write:blocks",
errors: {
noSuchUser: {
message: "No such user.",
code: "NO_SUCH_USER",
id: "8621d8bf-c358-4303-a066-5ea78610eb3f"
},
blockeeIsYourself: {
message: "Blockee is yourself.",
code: "BLOCKEE_IS_YOURSELF",
id: "06f6fac6-524b-473c-a354-e97a40ae6eac"
},
notBlocking: {
message: "You are not blocking that user.",
code: "NOT_BLOCKING",
id: "291b2efa-60c6-45c0-9f6a-045c8f9b02cd"
},
noSuchGroup: {
message: "No such group.",
code: "NO_SUCH_GROUP",
id: "b797376f-f8cc-405b-a1d6-250b84cc80c2"
}
},
res: {
type: "object",
optional: false,
nullable: false,
ref: "UserDetailedNotMe"
}
};
export const paramDef = {
type: "object",
properties: {
userId: {
type: "string",
format: "misskey:id"
},
groupId: {
type: "string",
format: "misskey:id",
nullable: true
}
},
required: [
"userId"
]
};
export default define(meta, paramDef, async (ps, user)=>{
const blocker = await Users.findOneByOrFail({
id: user.id
});
const group = await getGroupActor(ps.groupId, user);
if (ps.groupId != null && group == null) throw new ApiError(meta.errors.noSuchGroup);
// Check if the blockee is yourself
if (group == null && user.id === ps.userId) {
throw new ApiError(meta.errors.blockeeIsYourself);
}
// Get blockee
const blockee = await getUser(ps.userId).catch((e)=>{
if (e.id === "15348ddd-432d-49c2-8a5a-8069753becff") throw new ApiError(meta.errors.noSuchUser);
throw e;
});
// Check not blocking
const exist = await Blockings.exist({
where: {
blockeeId: blockee.id,
...group ? {
groupId: group.id
} : {
blockerId: blocker.id,
groupId: null
}
}
});
if (!exist) {
throw new ApiError(meta.errors.notBlocking);
}
// Delete blocking
await deleteBlocking(blocker, blockee, group?.id ?? null);
return await Users.pack(blockee.id, blocker, {
detail: true
});
});