graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-24 00:33:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug: Check following request existance

Browse source
This commit is contained in:
syuilo 2018-08-23 14:56:39 +09:00
parent 37865cb381
commit e31a2f7e55
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/api/endpoints/following/requests/cancel.ts
View file

@ -27,7 +27,11 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
return rej('followee not found'); return rej('followee not found');
} }
try {
await cancelFollowRequest(followee, user); await cancelFollowRequest(followee, user);
} catch (e) {
return rej(e);
}
// Send response // Send response
res(await pack(followee._id, user)); res(await pack(followee._id, user));

9
src/services/following/requests/cancel.ts
View file

@ -12,6 +12,15 @@ export default async function(followee: IUser, follower: IUser) {
deliver(follower as ILocalUser, content, followee.inbox); deliver(follower as ILocalUser, content, followee.inbox);
} }
const request = await FollowRequest.findOne({
followeeId: followee._id,
followerId: follower._id
});
if (request == null) {
throw 'request not found';
}
await FollowRequest.remove({ await FollowRequest.remove({
followeeId: followee._id, followeeId: followee._id,
followerId: follower._id followerId: follower._id