Skip to content

Commit 0d14b19

Browse files
sampaiodiegoggazzo
authored andcommitted
remove acceptRoomInvite from Room service
1 parent f65cae4 commit 0d14b19

File tree

5 files changed

+3
-11
lines changed

5 files changed

+3
-11
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ export const performAcceptRoomInvite = async (
1818
user: IUser & { username: string },
1919
): Promise<void> => {
2020
if (subscription.status !== 'INVITED') {
21-
throw new Meteor.Error('error-not-invited', 'User was not invited to this room', {
22-
method: 'acceptRoomInvite',
23-
});
21+
throw new Meteor.Error('error-not-invited', 'User was not invited to this room');
2422
}
2523

2624
await callbacks.run('beforeJoinRoom', user, room);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export const performAddUserToRoom = async (
143143
}
144144
}
145145

146-
147146
if (room.teamMain && room.teamId) {
148147
await Team.addMember(inviter || userToBeAdded, userToBeAdded._id, room.teamId);
149148
}

apps/meteor/server/services/room/service.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Rooms, Subscriptions, Users } from '@rocket.chat/models';
77
import { FederationActions } from './hooks/BeforeFederationActions';
88
import { saveRoomName } from '../../../app/channel-settings/server';
99
import { saveRoomTopic } from '../../../app/channel-settings/server/functions/saveRoomTopic';
10-
import { acceptRoomInvite, performAcceptRoomInvite } from '../../../app/lib/server/functions/acceptRoomInvite';
10+
import { performAcceptRoomInvite } from '../../../app/lib/server/functions/acceptRoomInvite';
1111
import { addUserToRoom, performAddUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
1212
import { createRoom } from '../../../app/lib/server/functions/createRoom'; // TODO remove this import
1313
import { removeUserFromRoom, performUserRemoval } from '../../../app/lib/server/functions/removeUserFromRoom';
@@ -102,10 +102,6 @@ export class RoomService extends ServiceClassInternal implements IRoomService {
102102
return performUserRemoval(roomId, user, options);
103103
}
104104

105-
async acceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser & { username: string }): Promise<void> {
106-
return acceptRoomInvite(room, subscription, user);
107-
}
108-
109105
async performAcceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser & { username: string }): Promise<void> {
110106
return performAcceptRoomInvite(room, subscription, user);
111107
}

apps/meteor/tests/data/rooms.helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,4 +452,4 @@ export const acceptRoomInvite = (roomId: IRoom['_id'], config?: IRequestConfig)
452452
resolve(req.body);
453453
});
454454
});
455-
};
455+
};

packages/core-services/src/types/IRoomService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export interface IRoomService {
5757
): Promise<boolean | undefined>;
5858
removeUserFromRoom(roomId: string, user: IUser, options?: { byUser: Pick<IUser, '_id' | 'username'> }): Promise<void>;
5959
performUserRemoval(roomId: string, user: IUser, options?: { byUser?: IUser }): Promise<void>;
60-
acceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser): Promise<void>;
6160
performAcceptRoomInvite(room: IRoom, subscription: ISubscription, user: IUser): Promise<void>;
6261
getValidRoomName(displayName: string, roomId?: string, options?: { allowDuplicates?: boolean }): Promise<string>;
6362
saveRoomTopic(

0 commit comments

Comments
 (0)