Fixed 267U.pre2

2026-07-26 18:25:37 +09:00
parent 50bfaeafdf
commit 317d00a284
1286 changed files with 80222 additions and 1 deletions
@@ -0,0 +1,28 @@
+import { renderActivity } from "../../remote/activitypub/renderer/index.js";
+import { renderBlock } from "../../remote/activitypub/renderer/block.js";
+import renderUndo from "../../remote/activitypub/renderer/undo.js";
+import { deliver } from "../../queue/index.js";
+import Logger from "../logger.js";
+import { Blockings, Users } from "../../models/index.js";
+const logger = new Logger("blocking/delete");
+export default async function(blocker, blockee, groupId = null) {
+    const blocking = await Blockings.findOneBy({
+        blockerId: blocker.id,
+        blockeeId: blockee.id,
+        groupId
+    });
+    if (blocking == null) {
+        logger.warn("ブロック解除がリクエストされましたがブロックしていませんでした");
+        return;
+    }
+    // Since we already have the blocker and blockee, we do not need to fetch
+    // them in the query above and can just manually insert them here.
+    blocking.blocker = blocker;
+    blocking.blockee = blockee;
+    Blockings.delete(blocking.id);
+    // deliver if remote bloking
+    if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) {
+        const content = renderActivity(renderUndo(renderBlock(blocking), blocker));
+        deliver(blocker, content, blockee.inbox);
+    }
+}