Try new test methods.

matrix_sync/sync/receiver.py

@@ -9,9 +9,9 @@
 from typing import Optional
 
 homeserver_online = True
-refresh = True
+msg_callback = False
+# refresh = True
 next_batch = None
-transfer = False
 
 class RoomMessageEvent(PluginEvent):
     def __init__(self, message: str, sender: str, room: Optional[str] = None):
@@ -21,58 +21,60 @@ def __init__(self, message: str, sender: str, room: Optional[str] = None):
         self.room = room
 
 async def message_callback(room: MatrixRoom, event: RoomMessageText) -> None:
-    global transfer
+    global msg_callback
+    transfer = False
     user_id = matrix_sync.config.user_id
     room_name = matrix_sync.config.room_name
     roomMsg = f"[MSync|{room.display_name}] {room.user_name(event.sender)}: {event.body}"
     # Avoid echo messages.
-    if not event.sender == user_id:
-        # Apply settings config
-        if not matrix_sync.config.settings["allow_all_rooms_msg"]:
-            roomMsg = f"[MSync] {room.user_name(event.sender)}: {event.body}"
-            if room.display_name == room_name:
-                transfer = True
-                psi.dispatch_event(RoomMessageEvent(event.body, room.user_name(event.sender)), (event.body, room.user_name(event.sender)))
-        else:
-            psi.dispatch_event(RoomMessageEvent(event.body, room.user_name(event.sender), room.display_name), (event.body, room.user_name(event.sender), room.display_name))
-        if transfer:
-            psi.broadcast(f"{roomMsg}")
+    if msg_callback:
+        if not event.sender == user_id:
+            # Apply settings config
+            if not matrix_sync.config.settings["allow_all_rooms_msg"]:
+                roomMsg = f"[MSync] {room.user_name(event.sender)}: {event.body}"
+                if room.display_name == room_name:
+                    transfer = True
+                    psi.dispatch_event(RoomMessageEvent(event.body, room.user_name(event.sender)), (event.body, room.user_name(event.sender)))
+            else:
+                psi.dispatch_event(RoomMessageEvent(event.body, room.user_name(event.sender), room.display_name), (event.body, room.user_name(event.sender), room.display_name))
+            if transfer:
+                psi.broadcast(f"{roomMsg}")
 
 
 
-def on_sync_response(response: SyncResponse):
-    global refresh, next_batch
-    if refresh:
-        next_batch = response.next_batch
-        psi.logger.info(f"Get 'next_batch': {next_batch}")
-        refresh = False
-    else:
-        psi.logger.info("syncing...")
+# def on_sync_response(response: SyncResponse):
+#     global refresh, next_batch
+#     if refresh:
+#         next_batch = response.next_batch
+#         psi.logger.info(f"Get 'next_batch': {next_batch}")
+#         refresh = False
+#     else:
+#         psi.logger.info("syncing...")
 
 def on_sync_error(response: SyncError):
     global homeserver_online
     psi.logger.error(f"Sync error: {response.status_code}")
     if response.status_code >= 500:
         homeserver_online = False
 
-async def testSync() -> None:
-    homeserver = matrix_sync.config.homeserver
-    device_id = matrix_sync.config.device_id
-    user_id = matrix_sync.config.user_id
-    client = AsyncClient(f"{homeserver}")
-    client.access_token = await getToken()
-    client.user_id = user_id
-    client.device_id = device_id
+# async def testSync() -> None:
+#     homeserver = matrix_sync.config.homeserver
+#     device_id = matrix_sync.config.device_id
+#     user_id = matrix_sync.config.user_id
+#     client = AsyncClient(f"{homeserver}")
+#     client.access_token = await getToken()
+#     client.user_id = user_id
+#     client.device_id = device_id
 
-    client.add_response_callback(on_sync_response, SyncResponse)
-    client.add_response_callback(on_sync_error, SyncError)
-    client.add_event_callback(message_callback, RoomMessageText)
+#     client.add_response_callback(on_sync_response, SyncResponse)
+#     client.add_response_callback(on_sync_error, SyncError)
+#     client.add_event_callback(message_callback, RoomMessageText)
 
-    await client.sync(timeout=5)
-    psi.logger.info("Sync test finished!")
+#     await client.sync(timeout=5)
+#     psi.logger.info("Sync test finished!")
 
 async def getMsg() -> None:
-    global next_batch
+    global next_batch, msg_callback
     homeserver = matrix_sync.config.homeserver
     device_id = matrix_sync.config.device_id
     user_id = matrix_sync.config.user_id
@@ -82,22 +84,25 @@ async def getMsg() -> None:
     client.user_id = user_id
     client.device_id = device_id
 
-    client.add_response_callback(on_sync_response, SyncResponse)
+    # client.add_response_callback(on_sync_response, SyncResponse)
     client.add_response_callback(on_sync_error, SyncError)
     client.add_event_callback(message_callback, RoomMessageText)
 
-    await client.sync(timeout=5)
-    psi.logger.info("First sync finished!")
+    # await client.sync(timeout=5)
+    # psi.logger.info("First sync finished!")
 
     try:
         if homeserver_online:
             if sync_old_msg is True:
                 await client.sync_forever(timeout=5)
             else:
-                if next_batch is not None:
-                    await client.sync_forever(timeout=5, since=next_batch)
-                else:
-                    psi.logger.error("Sync failed: can't get 'next_batch' when sync.")
+                # if next_batch is not None:
+                msg_callback = False
+                await client.sync(timeout=5)
+                msg_callback = True
+                await client.sync_forever(timeout=5)
+                # else:
+                #     psi.logger.error("Sync failed: can't get 'next_batch' when sync.")
         else:
             psi.logger.error("Sync failed: homeserver is down or your network disconnected with it.")
             psi.logger.info("Use !!msync start after homeserver is running or your network restored.")