mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-28 05:23:08 +02:00
wip
This commit is contained in:
parent
35115607bc
commit
bae44b4708
5 changed files with 25 additions and 1 deletions
|
@ -62,6 +62,11 @@ type IUserBase = {
|
|||
*/
|
||||
isLocked: boolean;
|
||||
|
||||
/**
|
||||
* このアカウントに届いているフォローリクエストの数
|
||||
*/
|
||||
pendingReceivedFollowRequestsCount: number;
|
||||
|
||||
host: string;
|
||||
};
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id';
|
|||
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
|
||||
import event from '../../../../publishers/stream';
|
||||
import DriveFile from '../../../../models/drive-file';
|
||||
import acceptAllFollowRequests from '../../../../services/user/accept-all-follow-requests';
|
||||
|
||||
/**
|
||||
* Update myself
|
||||
|
|
|
@ -28,6 +28,12 @@ export default async function(follower: IUser, followee: IUser) {
|
|||
}
|
||||
});
|
||||
|
||||
User.update({ _id: followee._id }, {
|
||||
$inc: {
|
||||
pendingReceivedFollowRequestsCount: 1
|
||||
}
|
||||
});
|
||||
|
||||
// Publish reciveRequest event
|
||||
if (isLocalUser(followee)) {
|
||||
packUser(follower, followee).then(packed => event(followee._id, 'reciveRequest', packed)),
|
||||
|
|
|
@ -15,4 +15,10 @@ export default async function(user: IUser) {
|
|||
const follower = await User.findOne({ _id: request.followerId });
|
||||
accept(user, follower);
|
||||
});
|
||||
|
||||
User.update({ _id: user._id }, {
|
||||
$set: {
|
||||
pendingReceivedFollowRequestsCount: 0
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -11,8 +11,14 @@ export default async function(followee: IUser, follower: IUser) {
|
|||
deliver(followee as ILocalUser, content, follower.inbox);
|
||||
}
|
||||
|
||||
FollowRequest.remove({
|
||||
await FollowRequest.remove({
|
||||
followeeId: followee._id,
|
||||
followerId: follower._id
|
||||
});
|
||||
|
||||
User.update({ _id: followee._id }, {
|
||||
$inc: {
|
||||
pendingReceivedFollowRequestsCount: -1
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue