Fixed 267U.pre2

packages/backend/built/services/following/requests/accept-all.js

@@ -0,0 +1,16 @@
+import accept from "./accept.js";
+import { FollowRequests, Users } from "../../../models/index.js";
+/**
+ * Approve all follow requests for the specified user
+ * @param user User.
+ */ export default async function(user) {
+    const requests = await FollowRequests.findBy({
+        followeeId: user.id
+    });
+    for (const request of requests){
+        const follower = await Users.findOneByOrFail({
+            id: request.followerId
+        });
+        accept(user, follower);
+    }
+}

packages/backend/built/services/following/requests/accept.js

@@ -0,0 +1,24 @@
+import { renderActivity } from "../../../remote/activitypub/renderer/index.js";
+import renderAcceptFollow from "../../../remote/activitypub/renderer/accept-follow.js";
+import { deliver } from "../../../queue/index.js";
+import { publishMainStream } from "../../stream.js";
+import { insertFollowingDoc } from "../create.js";
+import { FollowRequests, Users } from "../../../models/index.js";
+import { IdentifiableError } from "../../../misc/identifiable-error.js";
+export default async function(followee, follower) {
+    const request = await FollowRequests.findOneBy({
+        followeeId: followee.id,
+        followerId: follower.id
+    });
+    if (request == null) {
+        throw new IdentifiableError("8884c2dd-5795-4ac9-b27e-6a01d38190f9", "No follow request.");
+    }
+    await insertFollowingDoc(followee, follower);
+    if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
+        const content = renderActivity(renderAcceptFollow(follower, followee, request.requestId));
+        deliver(followee, content, follower.inbox);
+    }
+    Users.pack(followee.id, followee, {
+        detail: true
+    }).then((packed)=>publishMainStream(followee.id, "meUpdated", packed));
+}

packages/backend/built/services/following/requests/cancel.js

@@ -0,0 +1,30 @@
+import { renderActivity } from "../../../remote/activitypub/renderer/index.js";
+import renderFollow from "../../../remote/activitypub/renderer/follow.js";
+import renderUndo from "../../../remote/activitypub/renderer/undo.js";
+import { deliver } from "../../../queue/index.js";
+import { publishMainStream } from "../../stream.js";
+import { IdentifiableError } from "../../../misc/identifiable-error.js";
+import { Users, FollowRequests } from "../../../models/index.js";
+export default async function(followee, follower) {
+    if (Users.isRemoteUser(followee)) {
+        const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
+        if (Users.isLocalUser(follower)) {
+            // 本来このチェックは不要だけどTSに怒られるので
+            deliver(follower, content, followee.inbox);
+        }
+    }
+    const request = await FollowRequests.findOneBy({
+        followeeId: followee.id,
+        followerId: follower.id
+    });
+    if (request == null) {
+        throw new IdentifiableError("17447091-ce07-46dd-b331-c1fd4f15b1e7", "request not found");
+    }
+    await FollowRequests.delete({
+        followeeId: followee.id,
+        followerId: follower.id
+    });
+    Users.pack(followee.id, followee, {
+        detail: true
+    }).then((packed)=>publishMainStream(followee.id, "meUpdated", packed));
+}

packages/backend/built/services/following/requests/create.js

@@ -0,0 +1,54 @@
+import { publishMainStream } from "../../stream.js";
+import { renderActivity } from "../../../remote/activitypub/renderer/index.js";
+import renderFollow from "../../../remote/activitypub/renderer/follow.js";
+import { deliver } from "../../../queue/index.js";
+import { Blockings, FollowRequests, Users } from "../../../models/index.js";
+import { genId } from "../../../misc/gen-id.js";
+import { createNotification } from "../../create-notification.js";
+import config from "../../../config/index.js";
+export default async function(follower, followee, requestId) {
+    if (follower.id === followee.id) return;
+    // check blocking
+    const [blocking, blocked] = await Promise.all([
+        Blockings.findOneBy({
+            blockerId: follower.id,
+            blockeeId: followee.id
+        }),
+        Blockings.findOneBy({
+            blockerId: followee.id,
+            blockeeId: follower.id
+        })
+    ]);
+    if (blocking) throw new Error("blocking");
+    if (blocked) throw new Error("blocked");
+    const followRequest = await FollowRequests.insert({
+        id: genId(),
+        createdAt: new Date(),
+        followerId: follower.id,
+        followeeId: followee.id,
+        requestId,
+        // 非正規化
+        followerHost: follower.host,
+        followerInbox: Users.isRemoteUser(follower) ? follower.inbox : undefined,
+        followerSharedInbox: Users.isRemoteUser(follower) ? follower.sharedInbox : undefined,
+        followeeHost: followee.host,
+        followeeInbox: Users.isRemoteUser(followee) ? followee.inbox : undefined,
+        followeeSharedInbox: Users.isRemoteUser(followee) ? followee.sharedInbox : undefined
+    }).then((x)=>FollowRequests.findOneByOrFail(x.identifiers[0]));
+    // Publish receiveRequest event
+    if (Users.isLocalUser(followee)) {
+        Users.pack(follower.id, followee).then((packed)=>publishMainStream(followee.id, "receiveFollowRequest", packed));
+        Users.pack(followee.id, followee, {
+            detail: true
+        }).then((packed)=>publishMainStream(followee.id, "meUpdated", packed));
+        // 通知を作成
+        createNotification(followee.id, "receiveFollowRequest", {
+            notifierId: follower.id,
+            followRequestId: followRequest.id
+        });
+    }
+    if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
+        const content = renderActivity(renderFollow(follower, followee, requestId ?? `${config.url}/follows/${followRequest.id}`));
+        deliver(follower, content, followee.inbox);
+    }
+}