From 4a12a7cbc882375fc66df49e046b503f047573b9 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Thu, 31 Mar 2022 20:59:59 +0200
Subject: [PATCH] Fix crash when a bad user ID is in the database

To my understanding, a bad user ID can sometimes make it into the
database, which lead to a panic prior to this change.
---
 src/client_server/sync.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/client_server/sync.rs b/src/client_server/sync.rs
index eec4cf6d..5f34fa6b 100644
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@@ -405,10 +405,11 @@ async fn sync_helper(
                             continue;
                         }
                     };
-                    lazy_loaded.insert(
-                        UserId::parse(state_key.as_ref())
-                            .expect("they are in timeline_users, so they should be correct"),
-                    );
+
+                    // This check is in case a bad user ID made it into the database
+                    if let Ok(uid) = UserId::parse(state_key.as_ref()) {
+                        lazy_loaded.insert(uid);
+                    }
                     state_events.push(pdu);
                 }
             }