Fixed 267U.pre2

packages/backend/built/server/api/endpoints/blocking/create.js

@@ -0,0 +1,104 @@
+import create from "../../../../services/blocking/create.js";
+import define from "../../define.js";
+import { ApiError } from "../../error.js";
+import { getUser } from "../../common/getters.js";
+import { Blockings, NoteWatchings, 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: "7cc4f851-e2f1-4621-9633-ec9e1d00c01e"
+        },
+        blockeeIsYourself: {
+            message: "Blockee is yourself.",
+            code: "BLOCKEE_IS_YOURSELF",
+            id: "88b19138-f28d-42c0-8499-6a31bbd0fdc6"
+        },
+        alreadyBlocking: {
+            message: "You are already blocking that user.",
+            code: "ALREADY_BLOCKING",
+            id: "787fed64-acb9-464a-82eb-afbd745b9614"
+        },
+        noSuchGroup: {
+            message: "No such group.",
+            code: "NO_SUCH_GROUP",
+            id: "8193cd43-8319-4383-9591-a093cbb4aa3a"
+        }
+    },
+    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);
+    // 自分自身
+    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 if already 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.alreadyBlocking);
+    }
+    await create(blocker, blockee, group?.id ?? null);
+    if (group == null) {
+        NoteWatchings.delete({
+            userId: blocker.id,
+            noteUserId: blockee.id
+        });
+    }
+    return await Users.pack(blockee.id, blocker, {
+        detail: true
+    });
+});

packages/backend/built/server/api/endpoints/blocking/delete.js

@@ -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
+    });
+});

packages/backend/built/server/api/endpoints/blocking/list.js

@@ -0,0 +1,72 @@
+import define from "../../define.js";
+import { Blockings } from "../../../../models/index.js";
+import { makePaginationQuery } from "../../common/make-pagination-query.js";
+import { ApiError } from "../../error.js";
+import { getGroupActor } from "../../common/get-group-actor.js";
+export const meta = {
+    tags: [
+        "account"
+    ],
+    requireCredential: true,
+    kind: "read:blocks",
+    errors: {
+        noSuchGroup: {
+            message: "No such group.",
+            code: "NO_SUCH_GROUP",
+            id: "b31c1162-4adf-4b4b-b3e3-3f2fb8ffcd5f"
+        }
+    },
+    res: {
+        type: "array",
+        optional: false,
+        nullable: false,
+        items: {
+            type: "object",
+            optional: false,
+            nullable: false,
+            ref: "Blocking"
+        }
+    }
+};
+export const paramDef = {
+    type: "object",
+    properties: {
+        limit: {
+            type: "integer",
+            minimum: 1,
+            maximum: 100,
+            default: 30
+        },
+        sinceId: {
+            type: "string",
+            format: "misskey:id"
+        },
+        untilId: {
+            type: "string",
+            format: "misskey:id"
+        },
+        groupId: {
+            type: "string",
+            format: "misskey:id",
+            nullable: true
+        }
+    },
+    required: []
+};
+export default define(meta, paramDef, async (ps, me)=>{
+    const group = await getGroupActor(ps.groupId, me);
+    if (ps.groupId != null && group == null) throw new ApiError(meta.errors.noSuchGroup);
+    const query = makePaginationQuery(Blockings.createQueryBuilder("blocking"), ps.sinceId, ps.untilId);
+    if (group) {
+        query.andWhere("blocking.groupId = :groupId", {
+            groupId: group.id
+        });
+    } else {
+        query.andWhere("blocking.blockerId = :meId", {
+            meId: me.id
+        });
+        query.andWhere("blocking.groupId IS NULL");
+    }
+    const blockings = await query.take(ps.limit).getMany();
+    return await Blockings.packMany(blockings, me);
+});