Skip to content

Commit 4ffc256

Browse files
committed
rename accept subscription model
1 parent 9a01935 commit 4ffc256

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

apps/meteor/app/lib/server/functions/acceptRoomInvite.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ import { notifyOnSubscriptionChangedById } from '../lib/notifyListener';
1414
* safe callbacks, ensuring no propagation loops are created during external event
1515
* processing.
1616
*/
17+
18+
// TODO this funcion is pretty much the same as the one in addUserToRoom.ts, we should probably
19+
// unify them at some point
1720
export const performAcceptRoomInvite = async (
1821
room: IRoom,
1922
subscription: ISubscription,
@@ -38,7 +41,7 @@ export const performAcceptRoomInvite = async (
3841
throw error;
3942
}
4043

41-
await Subscriptions.markInviteAsAccepted(subscription._id);
44+
await Subscriptions.acceptInvitationById(subscription._id);
4245

4346
void notifyOnSubscriptionChangedById(subscription._id, 'updated');
4447

packages/model-typings/src/models/ISubscriptionsModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,5 +337,5 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
337337
countUsersInRoles(roles: IRole['_id'][], rid: IRoom['_id'] | undefined): Promise<number>;
338338
findUserFederatedRoomIds(userId: IUser['_id']): AggregationCursor<{ _id: IRoom['_id']; externalRoomId: string }>;
339339
findInvitedSubscription(roomId: ISubscription['rid'], userId: ISubscription['u']['_id']): Promise<Pick<ISubscription, '_id'> | null>;
340-
markInviteAsAccepted(subscriptionId: ISubscription['_id']): Promise<UpdateResult>;
340+
acceptInvitationById(subscriptionId: ISubscription['_id']): Promise<UpdateResult>;
341341
}

packages/models/src/models/Subscriptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2101,7 +2101,7 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
21012101
);
21022102
}
21032103

2104-
async markInviteAsAccepted(subscriptionId: string): Promise<UpdateResult> {
2104+
async acceptInvitationById(subscriptionId: string): Promise<UpdateResult> {
21052105
return this.updateOne(
21062106
{ _id: subscriptionId },
21072107
{

0 commit comments

Comments
 (0)