This commit is contained in:
syuilo
2021-12-09 23:58:30 +09:00
parent 0abe2dfee0
commit c69b72e199
573 changed files with 3318 additions and 3318 deletions

View File

@ -34,7 +34,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
followerSharedInbox: Users.isRemoteUser(follower) ? follower.sharedInbox : null,
followeeHost: followee.host,
followeeInbox: Users.isRemoteUser(followee) ? followee.inbox : null,
followeeSharedInbox: Users.isRemoteUser(followee) ? followee.sharedInbox : 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}`);
@ -46,13 +46,13 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
const req = await FollowRequests.findOne({
followeeId: followee.id,
followerId: follower.id
followerId: follower.id,
});
if (req) {
await FollowRequests.delete({
followeeId: followee.id,
followerId: follower.id
followerId: follower.id,
});
// 通知を作成
@ -87,7 +87,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
// Publish follow event
if (Users.isLocalUser(follower)) {
Users.pack(followee.id, follower, {
detail: true
detail: true,
}).then(packed => {
publishUserEvent(follower.id, 'follow', packed);
publishMainStream(follower.id, 'follow', packed);
@ -100,7 +100,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
// 通知を作成
createNotification(followee.id, 'follow', {
notifierId: follower.id
notifierId: follower.id,
});
}
}
@ -108,7 +108,7 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
export default async function(_follower: { id: User['id'] }, _followee: { id: User['id'] }, requestId?: string) {
const [follower, followee] = await Promise.all([
Users.findOneOrFail(_follower.id),
Users.findOneOrFail(_followee.id)
Users.findOneOrFail(_followee.id),
]);
// check blocking
@ -120,7 +120,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
Blockings.findOne({
blockerId: followee.id,
blockeeId: follower.id,
})
}),
]);
if (Users.isRemoteUser(follower) && Users.isLocalUser(followee) && blocked) {
@ -159,7 +159,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
if (!autoAccept && (Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
const followed = await Followings.findOne({
followerId: followee.id,
followeeId: follower.id
followeeId: follower.id,
});
if (followed) autoAccept = true;