Merge pull request #89 from geotribu/feat/filter-matrix-room

fix: filter messages from room in qmatrixchat web

Author: gounux

gischat/dispatchers.py

@@ -302,7 +302,6 @@ def register_request(self, body: MatrixRegisterRequest) -> UUID:
         """
         uuid = uuid4()
         mapping = body.model_dump()
-        print(mapping)
         self.redis.hset(get_redis_matrix_registrations_key(uuid), mapping=mapping)
         return uuid
 
@@ -357,7 +356,11 @@ async def accept_websocket(
         logger.info(f"🧑‍💻 Matrix client logged in: {login_result}")
 
         client.add_event_callback(
-            partial(self.on_matrix_text_message_received, websocket=websocket),
+            partial(
+                self.on_matrix_text_message_received,
+                room_id=matrix_registration.room_id,
+                websocket=websocket,
+            ),
             RoomMessageText,
         )
 
@@ -381,7 +384,11 @@ async def remove_websocket(self, request_id: UUID, websocket: WebSocket) -> None
         await client.close()
 
     async def on_matrix_text_message_received(
-        self, room: MatrixRoom, event: RoomMessageText, websocket: WebSocket
+        self,
+        room: MatrixRoom,
+        event: RoomMessageText,
+        room_id: str,
+        websocket: WebSocket,
     ) -> None:
         """
         Callback for when a text message is received in a Matrix room.
@@ -391,6 +398,9 @@ async def on_matrix_text_message_received(
         if not isinstance(event, RoomMessageText):
             return
 
+        if room.room_id != room_id:
+            return
+
         message = QMatrixChatTextMessage(
             author=room.user_name(event.sender),
             text=event.body,

gischat/models.py

@@ -228,6 +228,9 @@ class MatrixRegisterRequest(BaseModel):
         description="Device ID to register on the Matrix server. If not provided, a random one will be generated.",
         default_factory=lambda: uuid4().hex,
     )
+    room_id: str = Field(
+        description="ID of the room to join on the Matrix server, e.g. '!abcdef:matrix.example.com'",
+    )
 
 
 class MatrixRegisterResponse(BaseModel):