diff options
Diffstat (limited to 'src/services/following/requests/cancel.ts')
| -rw-r--r-- | src/services/following/requests/cancel.ts | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/services/following/requests/cancel.ts b/src/services/following/requests/cancel.ts index af4cca85fe..98fec5d331 100644 --- a/src/services/following/requests/cancel.ts +++ b/src/services/following/requests/cancel.ts @@ -1,39 +1,33 @@ -import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from '../../../models/user'; -import FollowRequest from '../../../models/follow-request'; import { renderActivity } from '../../../remote/activitypub/renderer'; import renderFollow from '../../../remote/activitypub/renderer/follow'; import renderUndo from '../../../remote/activitypub/renderer/undo'; import { deliver } from '../../../queue'; import { publishMainStream } from '../../stream'; import { IdentifiableError } from '../../../misc/identifiable-error'; +import { User, ILocalUser } from '../../../models/entities/user'; +import { Users, FollowRequests } from '../../../models'; -export default async function(followee: IUser, follower: IUser) { - if (isRemoteUser(followee)) { +export default async function(followee: User, follower: User) { + if (Users.isRemoteUser(followee)) { const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower as ILocalUser, content, followee.inbox); } - const request = await FollowRequest.findOne({ - followeeId: followee._id, - followerId: follower._id + const request = await FollowRequests.findOne({ + followeeId: followee.id, + followerId: follower.id }); if (request == null) { throw new IdentifiableError('17447091-ce07-46dd-b331-c1fd4f15b1e7', 'request not found'); } - await FollowRequest.remove({ - followeeId: followee._id, - followerId: follower._id + await FollowRequests.delete({ + followeeId: followee.id, + followerId: follower.id }); - await User.update({ _id: followee._id }, { - $inc: { - pendingReceivedFollowRequestsCount: -1 - } - }); - - packUser(followee, followee, { + Users.pack(followee, followee, { detail: true - }).then(packed => publishMainStream(followee._id, 'meUpdated', packed)); + }).then(packed => publishMainStream(followee.id, 'meUpdated', packed)); } |