undo allowMemberAction

RocketChat · Mar 23, 2023 · c38c08b · c38c08b
1 parent 6e8ee69
commit c38c08b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/apps/meteor/definition/IRoomTypeConfig.ts b/apps/meteor/definition/IRoomTypeConfig.ts
@@ -99,7 +99,7 @@ export interface IRoomTypeServerDirectives {
 	config: IRoomTypeConfig;
 
 	allowRoomSettingChange: (room: IRoom, setting: ValueOf<typeof RoomSettingsEnum>) => boolean;
-	allowMemberAction: (room: IRoom, action: ValueOf<typeof RoomMemberActions>, userId?: IUser['_id']) => Promise<boolean>;
+	allowMemberAction: (room: IRoom, action: ValueOf<typeof RoomMemberActions>, userId?: IUser['_id']) => boolean;
 	roomName: (room: IRoom, userId?: string) => string | undefined;
 	isGroupChat: (room: IRoom) => boolean;
 	canBeDeleted: (hasPermission: (permissionId: string, rid?: string) => Promise<boolean> | boolean, room: IRoom) => Promise<boolean>;

diff --git a/apps/meteor/server/lib/rooms/roomCoordinator.ts b/apps/meteor/server/lib/rooms/roomCoordinator.ts
@@ -11,7 +11,7 @@ class RoomCoordinatorServer extends RoomCoordinator {
 			allowRoomSettingChange(_room: IRoom, _setting: ValueOf<typeof RoomSettingsEnum>) {
 				return true;
 			},
-			async allowMemberAction(_room: IRoom, _action: ValueOf<typeof RoomMemberActions>, _userId?: IUser['_id']): Promise<boolean> {
+			allowMemberAction(_room: IRoom, _action: ValueOf<typeof RoomMemberActions>, _userId?: IUser['_id']): boolean {
 				return false;
 			},
 			roomName(_room: IRoom, _userId?: string): string {

diff --git a/apps/meteor/server/lib/rooms/roomTypes/direct.ts b/apps/meteor/server/lib/rooms/roomTypes/direct.ts
@@ -44,7 +44,7 @@ roomCoordinator.add(DirectMessageRoomType, {
 
 	allowMemberAction(room: IRoom, action, userId) {
 		if (isRoomFederated(room)) {
-			return Federation.actionAllowed(room, action, userId);
+			return Promise.await(Federation.actionAllowed(room, action, userId));
 		}
 		switch (action) {
 			case RoomMemberActions.BLOCK:

diff --git a/apps/meteor/server/lib/rooms/roomTypes/livechat.ts b/apps/meteor/server/lib/rooms/roomTypes/livechat.ts
@@ -19,7 +19,7 @@ roomCoordinator.add(LivechatRoomType, {
 		}
 	},
 
-	async allowMemberAction(_room, action) {
+	allowMemberAction(_room, action) {
 		return ([RoomMemberActions.INVITE, RoomMemberActions.JOIN] as Array<ValueOf<typeof RoomMemberActions>>).includes(action);
 	},
 

diff --git a/apps/meteor/server/lib/rooms/roomTypes/private.ts b/apps/meteor/server/lib/rooms/roomTypes/private.ts
@@ -31,9 +31,9 @@ roomCoordinator.add(PrivateRoomType, {
 		}
 	},
 
-	async allowMemberAction(_room, action, userId) {
+	allowMemberAction(_room, action, userId) {
 		if (isRoomFederated(_room as IRoom)) {
-			return Federation.actionAllowed(_room, action, userId);
+			return Promise.await(Federation.actionAllowed(_room, action, userId));
 		}
 		switch (action) {
 			case RoomMemberActions.BLOCK:

diff --git a/apps/meteor/server/lib/rooms/roomTypes/public.ts b/apps/meteor/server/lib/rooms/roomTypes/public.ts
@@ -31,9 +31,9 @@ roomCoordinator.add(PublicRoomType, {
 		}
 	},
 
-	allowMemberAction(_room, action, userId) {
+	allowMemberAction(_room, action, userId): boolean {
 		if (isRoomFederated(_room as IRoom)) {
-			return Federation.actionAllowed(_room, action, userId);
+			return Promise.await(Federation.actionAllowed(_room, action, userId));
 		}
 		switch (action) {
 			case RoomMemberActions.BLOCK: