Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,90 @@
|
||||
import { publishMainStream, publishUserEvent } from "../stream.js";
|
||||
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 renderReject from "../../remote/activitypub/renderer/reject.js";
|
||||
import { deliver, webhookDeliver } from "../../queue/index.js";
|
||||
import Logger from "../logger.js";
|
||||
import { registerOrFetchInstanceDoc } from "../register-or-fetch-instance-doc.js";
|
||||
import { Followings, Users, Instances, UserListJoinings } from "../../models/index.js";
|
||||
import { instanceChart, perUserFollowingChart } from "../chart/index.js";
|
||||
import { getActiveWebhooks } from "../../misc/webhook-cache.js";
|
||||
const logger = new Logger("following/delete");
|
||||
export default async function(follower, followee, silent = false) {
|
||||
const following = await Followings.findOneBy({
|
||||
followerId: follower.id,
|
||||
followeeId: followee.id
|
||||
});
|
||||
if (following == null) {
|
||||
logger.warn("フォロー解除がリクエストされましたがフォローしていませんでした");
|
||||
return;
|
||||
}
|
||||
const ids = await UserListJoinings.find({
|
||||
where: {
|
||||
userId: followee.id,
|
||||
userList: {
|
||||
userId: follower.id
|
||||
}
|
||||
},
|
||||
select: [
|
||||
"id"
|
||||
]
|
||||
}).then((p)=>p.map((x)=>x.id));
|
||||
if (ids.length > 0) await UserListJoinings.delete(ids);
|
||||
await Followings.delete(following.id);
|
||||
decrementFollowing(follower, followee);
|
||||
// Publish unfollow event
|
||||
if (!silent && Users.isLocalUser(follower)) {
|
||||
Users.pack(followee.id, follower, {
|
||||
detail: true
|
||||
}).then(async (packed)=>{
|
||||
publishUserEvent(follower.id, "unfollow", packed);
|
||||
publishMainStream(follower.id, "unfollow", packed);
|
||||
const webhooks = (await getActiveWebhooks()).filter((x)=>x.userId === follower.id && x.on.includes("unfollow"));
|
||||
for (const webhook of webhooks){
|
||||
webhookDeliver(webhook, "unfollow", {
|
||||
user: packed
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
|
||||
const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
|
||||
deliver(follower, content, followee.inbox);
|
||||
}
|
||||
if (Users.isLocalUser(followee) && Users.isRemoteUser(follower)) {
|
||||
// local user has null host
|
||||
const content = renderActivity(renderReject(renderFollow(follower, followee), followee));
|
||||
deliver(followee, content, follower.inbox);
|
||||
}
|
||||
}
|
||||
export async function decrementFollowing(follower, followee) {
|
||||
//#region Decrement following / followers counts
|
||||
await Promise.all([
|
||||
Users.decrement({
|
||||
id: follower.id
|
||||
}, "followingCount", 1),
|
||||
Users.decrement({
|
||||
id: followee.id
|
||||
}, "followersCount", 1)
|
||||
]);
|
||||
//#endregion
|
||||
//#region Update instance stats
|
||||
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
|
||||
registerOrFetchInstanceDoc(follower.host).then((i)=>{
|
||||
Instances.decrement({
|
||||
id: i.id
|
||||
}, "followingCount", 1);
|
||||
instanceChart.updateFollowing(i.host, false);
|
||||
});
|
||||
} else if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
|
||||
registerOrFetchInstanceDoc(followee.host).then((i)=>{
|
||||
Instances.decrement({
|
||||
id: i.id
|
||||
}, "followersCount", 1);
|
||||
instanceChart.updateFollowers(i.host, false);
|
||||
});
|
||||
}
|
||||
//#endregion
|
||||
perUserFollowingChart.update(follower, followee, false);
|
||||
}
|
||||
Reference in New Issue
Block a user