From 9e076122493bb24e33959194e2f25f957e74fd76 Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Sat, 4 Apr 2020 07:26:02 -0400
Subject: [PATCH] Remove "room load until there's non-profile event"

---
 src/backend/matrix_client.py | 40 +-----------------------------------
 src/backend/nio_callbacks.py |  5 -----
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/src/backend/matrix_client.py b/src/backend/matrix_client.py
index 25a52678..4cfa7874 100644
--- a/src/backend/matrix_client.py
+++ b/src/backend/matrix_client.py
@@ -138,7 +138,6 @@ class MatrixClient(nio.AsyncClient):
         self.profile_task:       Optional[asyncio.Future] = None
         self.server_config_task: Optional[asyncio.Future] = None
         self.sync_task:          Optional[asyncio.Future] = None
-        self.load_rooms_task:    Optional[asyncio.Future] = None
 
         self.upload_monitors:    Dict[UUID, nio.TransferMonitor] = {}
         self.upload_tasks:       Dict[UUID, asyncio.Task]        = {}
@@ -215,10 +214,7 @@ class MatrixClient(nio.AsyncClient):
     async def logout(self) -> None:
         """Logout from the server. This will delete the device."""
 
-        tasks = (
-            self.profile_task, self.load_rooms_task, self.sync_task,
-            self.server_config_task,
-        )
+        tasks = (self.profile_task, self.sync_task, self.server_config_task)
 
         for task in tasks:
             if task:
@@ -750,40 +746,6 @@ class MatrixClient(nio.AsyncClient):
         return more_to_load
 
 
-    async def load_rooms_without_visible_events(self) -> None:
-        """Call `_load_room_without_visible_events` for all joined rooms."""
-
-        for room_id in self.models[self.user_id, "rooms"]:
-            asyncio.ensure_future(
-                self._load_room_without_visible_events(room_id),
-            )
-
-
-    async def _load_room_without_visible_events(self, room_id: str) -> None:
-        """Request past events for rooms without any suitable event to show.
-
-        Some events are currently not supported, or processed but not
-        shown in the UI timeline/room "last event" subtitle, e.g.
-        the "x changed their name/avatar" events.
-
-        It could happen that all the initial events received in the initial
-        sync for a room are such events,
-        and thus we'd have nothing to show in the room.
-
-        This method tries to load past events until we have at least one
-        to show or there is nothing left to load.
-        """
-
-        events = self.models[self.user_id, room_id, "events"]
-        more   = True
-
-        while self.skipped_events[room_id] and not events and more:
-            try:
-                more = await self.load_past_events(room_id)
-            except MatrixError:
-                break
-
-
     async def new_direct_chat(self, invite: str, encrypt: bool = False) -> str:
         """Create a room and invite a single user in it for a direct chat."""
 
diff --git a/src/backend/nio_callbacks.py b/src/backend/nio_callbacks.py
index 4f86ef32..1dc10654 100644
--- a/src/backend/nio_callbacks.py
+++ b/src/backend/nio_callbacks.py
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-import asyncio
 import json
 import logging as log
 from contextlib import suppress
@@ -80,10 +79,6 @@ class NioCallbacks:
             )
 
         if not self.client.first_sync_done.is_set():
-            self.client.load_rooms_task = asyncio.ensure_future(
-                self.client.load_rooms_without_visible_events(),
-            )
-
             self.client.first_sync_done.set()
             self.client.first_sync_date = datetime.now()