remove 'room'

src/definition/accessors/IRoomRead.ts

@@ -102,12 +102,12 @@ export interface IRoomRead {
  * - sort: An object defining the sorting order of the messages. Each key is a field to sort by, and the value is either 'asc' for ascending order or 'desc' for descending order.
  * @returns A Promise that resolves to an array of IMessage objects representing the unread messages for the specified user in the specified room.
  */
- getUnreadByRoomAndUser(roomId: string, uid: string, options?: Partial<GetMessagesOptions>): Promise<IMessageRaw[]>;
+ getUnreadByUser(roomId: string, uid: string, options?: Partial<GetMessagesOptions>): Promise<IMessageRaw[]>;
 
  /**
  * Gets the user's unread messages count in a room.
  * @param uid user's id
  * @param roomId room's id
  */
- getUserUnreadMessageCountByRoom(uid: string, roomId: string): Promise<number | undefined>;
+ getUserUnreadMessageCount(uid: string, roomId: string): Promise<number | undefined>;
 }

src/server/accessors/RoomRead.ts

@@ -58,7 +58,7 @@ export class RoomRead implements IRoomRead {
  return this.roomBridge.doGetLeaders(roomId, this.appId);
  }
 
- public async getUnreadByRoomAndUser(roomId: string, uid: string, options: Partial<GetMessagesOptions> = {}): Promise<IMessageRaw[]> {
+ public async getUnreadByUser(roomId: string, uid: string, options: Partial<GetMessagesOptions> = {}): Promise<IMessageRaw[]> {
  const { limit = 100, sort = { createdAt: 'asc' }, skip = 0 } = options;
 
  if (typeof roomId !== 'string' || roomId.trim().length === 0) {
@@ -73,11 +73,11 @@ export class RoomRead implements IRoomRead {
 
  const completeOptions: GetMessagesOptions = { limit, sort, skip };
 
- return this.roomBridge.doGetUnreadByRoomAndUser(roomId, uid, completeOptions, this.appId);
+ return this.roomBridge.doGetUnreadByUser(roomId, uid, completeOptions, this.appId);
  }
 
- public getUserUnreadMessageCountByRoom(uid: string, rid: string): Promise<number> {
- return this.roomBridge.doGetUserUnreadMessageCountByRoom(uid, rid, this.appId);
+ public getUserUnreadMessageCount(uid: string, rid: string): Promise<number> {
+ return this.roomBridge.doGetUserUnreadMessageCount(uid, rid, this.appId);
  }
 
  // If there are any invalid fields or values, throw

src/server/bridges/RoomBridge.ts

@@ -111,15 +111,15 @@ export abstract class RoomBridge extends BaseBridge {
  }
  }
 
- public async doGetUnreadByRoomAndUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
+ public async doGetUnreadByUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
  if (this.hasReadPermission(appId)) {
- return this.getUnreadByRoomAndUser(roomId, uid, options, appId);
+ return this.getUnreadByUser(roomId, uid, options, appId);
  }
  }
 
- public async doGetUserUnreadMessageCountByRoom(uid: string, roomId: string, appId: string): Promise<number> {
+ public async doGetUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number> {
  if (this.hasReadPermission(appId)) {
- return this.getUserUnreadMessageCountByRoom(uid, roomId, appId);
+ return this.getUserUnreadMessageCount(uid, roomId, appId);
  }
  }
 
@@ -159,9 +159,9 @@ export abstract class RoomBridge extends BaseBridge {
 
  protected abstract removeUsers(roomId: string, usernames: Array<string>, appId: string): Promise<void>;
 
- protected abstract getUnreadByRoomAndUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]>;
+ protected abstract getUnreadByUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]>;
 
- protected abstract getUserUnreadMessageCountByRoom(uid: string, roomId: string, appId: string): Promise<number>;
+ protected abstract getUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number>;
 
  private hasWritePermission(appId: string): boolean {
  if (AppPermissionManager.hasPermission(appId, AppPermissions.room.write)) {

tests/server/accessors/RoomRead.spec.ts

@@ -57,7 +57,7 @@ export class RoomReadAccessorTestFixture {
  doGetMessages(roomId, options, appId): Promise<IMessageRaw[]> {
  return Promise.resolve(theMessages);
  },
- doGetUnreadByRoomAndUser(roomId, uid, options, appId): Promise<IMessageRaw[]> {
+ doGetUnreadByUser(roomId, uid, options, appId): Promise<IMessageRaw[]> {
  if (roomId === unreadRoomId && uid === unreadUserId) {
  return Promise.resolve(theUnreadMsg);
  }
@@ -84,11 +84,11 @@ export class RoomReadAccessorTestFixture {
  Expect(await rr.getDirectByUsernames([this.user.username])).toBe(this.room);
  Expect(await rr.getMessages('testing')).toBeDefined();
  Expect(await rr.getMessages('testing')).toBe(this.messages);
- Expect(await rr.getUnreadByRoomAndUser(this.unreadRoomId, this.unreadUserId)).toBeDefined();
- Expect(await rr.getUnreadByRoomAndUser(this.unreadRoomId, this.unreadUserId)).toEqual(this.messages);
+ Expect(await rr.getUnreadByUser(this.unreadRoomId, this.unreadUserId)).toBeDefined();
+ Expect(await rr.getUnreadByUser(this.unreadRoomId, this.unreadUserId)).toEqual(this.messages);
 
- Expect(await rr.getUnreadByRoomAndUser('fake', 'fake')).toBeDefined();
- Expect(await rr.getUnreadByRoomAndUser('fake', 'fake')).toEqual([]);
+ Expect(await rr.getUnreadByUser('fake', 'fake')).toBeDefined();
+ Expect(await rr.getUnreadByUser('fake', 'fake')).toEqual([]);
  }
 
  @AsyncTest()

tests/test-data/bridges/roomBridge.ts

@@ -65,11 +65,11 @@ export class TestsRoomBridge extends RoomBridge {
  throw new Error('Method not implemented');
  }
 
- public getUnreadByRoomAndUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
+ public getUnreadByUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]> {
  throw new Error('Method not implemented.');
  }
 
- protected getUserUnreadMessageCountByRoom(uid: string, roomId: string, appId: string): Promise<number> {
+ protected getUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number> {
  throw new Error('Method not implemented.');
  }
 }