Remove m.historical messages from /sync

Author: MadLittleMods

synapse/handlers/sync.py

@@ -42,7 +42,10 @@
 from synapse.util.caches.lrucache import LruCache
 from synapse.util.caches.response_cache import ResponseCache
 from synapse.util.metrics import Measure, measure_func
-from synapse.visibility import filter_events_for_client
+from synapse.visibility import (
+    filter_events_for_client,
+    filter_historical_events
+)
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -423,6 +426,7 @@ async def _load_filtered_recents(
         potential_recents: Optional[List[EventBase]] = None,
         newly_joined_room: bool = False,
     ) -> TimelineBatch:
+        logger.info("_load_filtered_recents")
         with Measure(self.clock, "load_filtered_recents"):
             timeline_limit = sync_config.filter_collection.timeline_limit()
             block_all_timeline = (
@@ -462,6 +466,8 @@ async def _load_filtered_recents(
             else:
                 recents = []
 
+            logger.info("recents1 %s", recents)
+
             if not limited or block_all_timeline:
                 prev_batch_token = now_token
                 if recents:
@@ -534,6 +540,10 @@ async def _load_filtered_recents(
 
             prev_batch_token = now_token.copy_and_replace("room_key", room_key)
 
+        # `m.historical` events should not come down /sync
+        recents = await filter_historical_events(recents)
+
+        logger.info("recents2 %s", recents)
         return TimelineBatch(
             events=recents,
             prev_batch=prev_batch_token,

synapse/rest/client/v2_alpha/sync.py

@@ -86,6 +86,7 @@ def __init__(self, hs):
         self._event_serializer = hs.get_event_client_serializer()
 
     async def on_GET(self, request):
+        logger.info("/sync on_GET")
         if b"from" in request.args:
             # /events used to use 'from', but /sync uses 'since'.
             # Lets be helpful and whine if we see a 'from'.
@@ -184,6 +185,7 @@ async def on_GET(self, request):
             logger.info("Client has disconnected; not serializing response.")
             return 200, {}
 
+        #logger.info("sync response %s", sync_result)
         time_now = self.clock.time_msec()
         response_content = await self.encode_response(
             time_now, sync_result, requester.access_token_id, filter_collection

synapse/visibility.py

@@ -45,6 +45,17 @@
     Membership.BAN,
 )
 
+async def filter_historical_events(
+    events
+):
+    logger.info("filter_historical_events %s", ' '.join(map(str, events)))
+    filtered_events = [e for e in events if not e.content.get("m.historical", None)]
+
+    # remove the None entries
+    filtered_events = filter(operator.truth, filtered_events)
+
+    # we turn it into a list before returning it.
+    return list(filtered_events)
 
 async def filter_events_for_client(
     storage: Storage,