From 97b9cc9248c43891db3731367c11fca8b49817cd Mon Sep 17 00:00:00 2001
From: Dnouv <evan.shu.dev@gmail.com>
Date: Thu, 26 Sep 2024 17:25:26 +0530
Subject: [PATCH] correct order

---
 src/definition/accessors/IRoomRead.ts | 4 ++--
 src/server/accessors/RoomRead.ts      | 4 ++--
 src/server/bridges/RoomBridge.ts      | 6 +++---
 tests/test-data/bridges/roomBridge.ts | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/definition/accessors/IRoomRead.ts b/src/definition/accessors/IRoomRead.ts
index d4031f372..e16809409 100644
--- a/src/definition/accessors/IRoomRead.ts
+++ b/src/definition/accessors/IRoomRead.ts
@@ -106,8 +106,8 @@ export interface IRoomRead {
 
     /**
      * Gets the user's unread messages count in a room.
-     * @param uid user's id
      * @param roomId room's id
+     * @param uid user's id
      */
-    getUserUnreadMessageCount(uid: string, roomId: string): Promise<number | undefined>;
+    getUserUnreadMessageCount(roomId: string, uid: string): Promise<number | undefined>;
 }
diff --git a/src/server/accessors/RoomRead.ts b/src/server/accessors/RoomRead.ts
index dd5a3ebd5..b4e71fdc9 100644
--- a/src/server/accessors/RoomRead.ts
+++ b/src/server/accessors/RoomRead.ts
@@ -76,8 +76,8 @@ export class RoomRead implements IRoomRead {
         return this.roomBridge.doGetUnreadByUser(roomId, uid, completeOptions, this.appId);
     }
 
-    public getUserUnreadMessageCount(uid: string, rid: string): Promise<number> {
-        return this.roomBridge.doGetUserUnreadMessageCount(uid, rid, this.appId);
+    public getUserUnreadMessageCount(roomId: string, uid: string): Promise<number> {
+        return this.roomBridge.doGetUserUnreadMessageCount(roomId, uid, this.appId);
     }
 
     // If there are any invalid fields or values, throw
diff --git a/src/server/bridges/RoomBridge.ts b/src/server/bridges/RoomBridge.ts
index 94cf03543..dd7688b9f 100644
--- a/src/server/bridges/RoomBridge.ts
+++ b/src/server/bridges/RoomBridge.ts
@@ -117,9 +117,9 @@ export abstract class RoomBridge extends BaseBridge {
         }
     }
 
-    public async doGetUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number> {
+    public async doGetUserUnreadMessageCount(roomId: string, uid: string, appId: string): Promise<number> {
         if (this.hasReadPermission(appId)) {
-            return this.getUserUnreadMessageCount(uid, roomId, appId);
+            return this.getUserUnreadMessageCount(roomId, uid, appId);
         }
     }
 
@@ -161,7 +161,7 @@ export abstract class RoomBridge extends BaseBridge {
 
     protected abstract getUnreadByUser(roomId: string, uid: string, options: GetMessagesOptions, appId: string): Promise<IMessageRaw[]>;
 
-    protected abstract getUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number>;
+    protected abstract getUserUnreadMessageCount(roomId: string, uid: string, appId: string): Promise<number>;
 
     private hasWritePermission(appId: string): boolean {
         if (AppPermissionManager.hasPermission(appId, AppPermissions.room.write)) {
diff --git a/tests/test-data/bridges/roomBridge.ts b/tests/test-data/bridges/roomBridge.ts
index a9f70942c..05fa810c5 100644
--- a/tests/test-data/bridges/roomBridge.ts
+++ b/tests/test-data/bridges/roomBridge.ts
@@ -69,7 +69,7 @@ export class TestsRoomBridge extends RoomBridge {
         throw new Error('Method not implemented.');
     }
 
-    protected getUserUnreadMessageCount(uid: string, roomId: string, appId: string): Promise<number> {
+    protected getUserUnreadMessageCount(roomId: string, uid: string, appId: string): Promise<number> {
         throw new Error('Method not implemented.');
     }
 }