Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,190 @@
|
||||
import { publishMainStream, publishUserEvent } from "../stream.js";
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderFollow from "../../remote/activitypub/renderer/follow.js";
|
||||
import renderAcceptFollow from "../../remote/activitypub/renderer/accept-follow.js";
|
||||
import renderReject from "../../remote/activitypub/renderer/reject.js";
|
||||
import { deliver } from "../../queue/index.js";
|
||||
import createFollowRequest from "./requests/create.js";
|
||||
import { registerOrFetchInstanceDoc } from "../register-or-fetch-instance-doc.js";
|
||||
import Logger from "../logger.js";
|
||||
import { IdentifiableError } from "../../misc/identifiable-error.js";
|
||||
import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from "../../models/index.js";
|
||||
import { instanceChart, perUserFollowingChart } from "../chart/index.js";
|
||||
import { genId } from "../../misc/gen-id.js";
|
||||
import { createNotification } from "../create-notification.js";
|
||||
import { isDuplicateKeyValueError } from "../../misc/is-duplicate-key-value-error.js";
|
||||
import { getActiveWebhooks } from "../../misc/webhook-cache.js";
|
||||
import { webhookDeliver } from "../../queue/index.js";
|
||||
import { shouldSilenceInstance } from "../../misc/should-block-instance.js";
|
||||
const logger = new Logger("following/create");
|
||||
export async function insertFollowingDoc(followee, follower) {
|
||||
if (follower.id === followee.id) return;
|
||||
let alreadyFollowed = false;
|
||||
await Followings.insert({
|
||||
id: genId(),
|
||||
createdAt: new Date(),
|
||||
followerId: follower.id,
|
||||
followeeId: followee.id,
|
||||
// 非正規化
|
||||
followerHost: follower.host,
|
||||
followerInbox: Users.isRemoteUser(follower) ? follower.inbox : null,
|
||||
followerSharedInbox: Users.isRemoteUser(follower) ? follower.sharedInbox : null,
|
||||
followeeHost: followee.host,
|
||||
followeeInbox: Users.isRemoteUser(followee) ? followee.inbox : null,
|
||||
followeeSharedInbox: Users.isRemoteUser(followee) ? followee.sharedInbox : null
|
||||
}).catch((e)=>{
|
||||
if (isDuplicateKeyValueError(e) && Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
|
||||
logger.info(`Insert duplicated ignore. ${follower.id} => ${followee.id}`);
|
||||
alreadyFollowed = true;
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
const req = await FollowRequests.findOneBy({
|
||||
followeeId: followee.id,
|
||||
followerId: follower.id
|
||||
});
|
||||
if (req) {
|
||||
await FollowRequests.delete({
|
||||
followeeId: followee.id,
|
||||
followerId: follower.id
|
||||
});
|
||||
if (followee.isLocked) {
|
||||
// Create notification that request was accepted.
|
||||
createNotification(follower.id, "followRequestAccepted", {
|
||||
notifierId: followee.id
|
||||
});
|
||||
}
|
||||
}
|
||||
if (alreadyFollowed) return;
|
||||
//#region Increment counts
|
||||
await Promise.all([
|
||||
Users.increment({
|
||||
id: follower.id
|
||||
}, "followingCount", 1),
|
||||
Users.increment({
|
||||
id: followee.id
|
||||
}, "followersCount", 1)
|
||||
]);
|
||||
//#endregion
|
||||
//#region Update instance stats
|
||||
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
|
||||
registerOrFetchInstanceDoc(follower.host).then((i)=>{
|
||||
Instances.increment({
|
||||
id: i.id
|
||||
}, "followingCount", 1);
|
||||
instanceChart.updateFollowing(i.host, true);
|
||||
});
|
||||
} else if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) {
|
||||
registerOrFetchInstanceDoc(followee.host).then((i)=>{
|
||||
Instances.increment({
|
||||
id: i.id
|
||||
}, "followersCount", 1);
|
||||
instanceChart.updateFollowers(i.host, true);
|
||||
});
|
||||
}
|
||||
//#endregion
|
||||
perUserFollowingChart.update(follower, followee, true);
|
||||
// Publish follow event
|
||||
if (Users.isLocalUser(follower)) {
|
||||
Users.pack(followee.id, follower, {
|
||||
detail: true
|
||||
}).then(async (packed)=>{
|
||||
publishUserEvent(follower.id, "follow", packed);
|
||||
publishMainStream(follower.id, "follow", packed);
|
||||
const webhooks = (await getActiveWebhooks()).filter((x)=>x.userId === follower.id && x.on.includes("follow"));
|
||||
for (const webhook of webhooks){
|
||||
webhookDeliver(webhook, "follow", {
|
||||
user: packed
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
// Publish followed event
|
||||
if (Users.isLocalUser(followee)) {
|
||||
Users.pack(follower.id, followee).then(async (packed)=>{
|
||||
publishMainStream(followee.id, "followed", packed);
|
||||
const webhooks = (await getActiveWebhooks()).filter((x)=>x.userId === followee.id && x.on.includes("followed"));
|
||||
for (const webhook of webhooks){
|
||||
webhookDeliver(webhook, "followed", {
|
||||
user: packed
|
||||
});
|
||||
}
|
||||
});
|
||||
// 通知を作成
|
||||
createNotification(followee.id, "follow", {
|
||||
notifierId: follower.id
|
||||
});
|
||||
}
|
||||
}
|
||||
export default async function(_follower, _followee, requestId) {
|
||||
const [follower, followee] = await Promise.all([
|
||||
Users.findOneByOrFail({
|
||||
id: _follower.id
|
||||
}),
|
||||
Users.findOneByOrFail({
|
||||
id: _followee.id
|
||||
})
|
||||
]);
|
||||
// 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 (Users.isRemoteUser(follower) && Users.isLocalUser(followee) && blocked) {
|
||||
// リモートフォローを受けてブロックしていた場合は、エラーにするのではなくRejectを送り返しておしまい。
|
||||
const content = renderActivity(renderReject(renderFollow(follower, followee, requestId), followee));
|
||||
deliver(followee, content, follower.inbox);
|
||||
return;
|
||||
} else if (Users.isRemoteUser(follower) && Users.isLocalUser(followee) && blocking) {
|
||||
// リモートフォローを受けてブロックされているはずの場合だったら、ブロック解除しておく。
|
||||
await Blockings.delete(blocking.id);
|
||||
} else {
|
||||
// それ以外は単純に例外
|
||||
if (blocking) throw new IdentifiableError("710e8fb0-b8c3-4922-be49-d5d93d8e6a6e", "blocking");
|
||||
if (blocked) throw new IdentifiableError("3338392a-f764-498d-8855-db939dcf8c48", "blocked");
|
||||
}
|
||||
const followeeProfile = await UserProfiles.findOneByOrFail({
|
||||
userId: followee.id
|
||||
});
|
||||
// フォロー対象が鍵アカウントである or
|
||||
// The follower is silenced, or
|
||||
// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or
|
||||
// フォロワーがローカルユーザーであり、フォロー対象がリモートユーザーである or
|
||||
// The follower is remote, the followee is local, and the follower is in a silenced instance.
|
||||
// 上記のいずれかに当てはまる場合はすぐフォローせずにフォローリクエストを発行しておく
|
||||
if (followee.isLocked || follower.isSilenced || followeeProfile.carefulBot && follower.isBot || Users.isLocalUser(follower) && Users.isRemoteUser(followee) || Users.isRemoteUser(follower) && Users.isLocalUser(followee) && await shouldSilenceInstance(follower.host)) {
|
||||
let autoAccept = false;
|
||||
// 鍵アカウントであっても、既にフォローされていた場合はスルー
|
||||
const following = await Followings.findOneBy({
|
||||
followerId: follower.id,
|
||||
followeeId: followee.id
|
||||
});
|
||||
if (following) {
|
||||
autoAccept = true;
|
||||
}
|
||||
// フォローしているユーザーは自動承認オプション
|
||||
if (!autoAccept && Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed) {
|
||||
const followed = await Followings.findOneBy({
|
||||
followerId: followee.id,
|
||||
followeeId: follower.id
|
||||
});
|
||||
if (followed) autoAccept = true;
|
||||
}
|
||||
if (!autoAccept) {
|
||||
await createFollowRequest(follower, followee, requestId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
await insertFollowingDoc(followee, follower);
|
||||
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) {
|
||||
const content = renderActivity(renderAcceptFollow(follower, followee, requestId));
|
||||
deliver(followee, content, follower.inbox);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
|
||||
import renderFollow from "../../remote/activitypub/renderer/follow.js";
|
||||
import renderReject from "../../remote/activitypub/renderer/reject.js";
|
||||
import { deliver, webhookDeliver } from "../../queue/index.js";
|
||||
import { publishMainStream, publishUserEvent } from "../stream.js";
|
||||
import { Users, FollowRequests, Followings } from "../../models/index.js";
|
||||
import { decrementFollowing } from "./delete.js";
|
||||
import { getActiveWebhooks } from "../../misc/webhook-cache.js";
|
||||
/**
|
||||
* API following/request/reject
|
||||
*/ export async function rejectFollowRequest(user, follower) {
|
||||
if (Users.isRemoteUser(follower)) {
|
||||
deliverReject(user, follower);
|
||||
}
|
||||
await removeFollowRequest(user, follower);
|
||||
if (Users.isLocalUser(follower)) {
|
||||
publishUnfollow(user, follower);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* API following/reject
|
||||
*/ export async function rejectFollow(user, follower) {
|
||||
if (Users.isRemoteUser(follower)) {
|
||||
deliverReject(user, follower);
|
||||
}
|
||||
await removeFollow(user, follower);
|
||||
if (Users.isLocalUser(follower)) {
|
||||
publishUnfollow(user, follower);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* AP Reject/Follow
|
||||
*/ export async function remoteReject(actor, follower) {
|
||||
await removeFollowRequest(actor, follower);
|
||||
await removeFollow(actor, follower);
|
||||
publishUnfollow(actor, follower);
|
||||
}
|
||||
/**
|
||||
* Remove follow request record
|
||||
*/ async function removeFollowRequest(followee, follower) {
|
||||
const request = await FollowRequests.findOneBy({
|
||||
followeeId: followee.id,
|
||||
followerId: follower.id
|
||||
});
|
||||
if (!request) return;
|
||||
await FollowRequests.delete(request.id);
|
||||
}
|
||||
/**
|
||||
* Remove follow record
|
||||
*/ async function removeFollow(followee, follower) {
|
||||
const following = await Followings.findOneBy({
|
||||
followeeId: followee.id,
|
||||
followerId: follower.id
|
||||
});
|
||||
if (!following) return;
|
||||
await Followings.delete(following.id);
|
||||
decrementFollowing(follower, followee);
|
||||
}
|
||||
/**
|
||||
* Deliver Reject to remote
|
||||
*/ async function deliverReject(followee, follower) {
|
||||
const request = await FollowRequests.findOneBy({
|
||||
followeeId: followee.id,
|
||||
followerId: follower.id
|
||||
});
|
||||
const content = renderActivity(renderReject(renderFollow(follower, followee, request?.requestId || undefined), followee));
|
||||
deliver(followee, content, follower.inbox);
|
||||
}
|
||||
/**
|
||||
* Publish unfollow to local
|
||||
*/ async function publishUnfollow(followee, follower) {
|
||||
const packedFollowee = await Users.pack(followee.id, follower, {
|
||||
detail: true
|
||||
});
|
||||
publishUserEvent(follower.id, "unfollow", packedFollowee);
|
||||
publishMainStream(follower.id, "unfollow", packedFollowee);
|
||||
const webhooks = (await getActiveWebhooks()).filter((x)=>x.userId === follower.id && x.on.includes("unfollow"));
|
||||
for (const webhook of webhooks){
|
||||
webhookDeliver(webhook, "unfollow", {
|
||||
user: packedFollowee
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user