From f1d9537b14959050b9ce625b95bb0fa0d7f1581b Mon Sep 17 00:00:00 2001 From: Ginger Date: Fri, 2 Oct 2026 11:41:37 -0400 Subject: [PATCH] fix: Fix startup panic in old migrations --- src/service/migrations.rs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/service/migrations.rs b/src/service/migrations.rs index d92a4bfeb..8816448c3 100644 --- a/src/service/migrations.rs +++ b/src/service/migrations.rs @@ -357,11 +357,15 @@ async fn fix_push_rule_names(services: &Services) -> Result<()> { }, }; - let mut account_data: PushRulesEvent = services + let Some(mut account_data) = services .account_data - .get_global(&user, GlobalAccountDataEventType::PushRules) + .get_global::(&user, GlobalAccountDataEventType::PushRules) .await - .expect("Username is invalid"); + .ok() + else { + // Skip users with no push rules + continue; + }; let rules_list = &mut account_data.content.global; @@ -435,11 +439,15 @@ async fn fix_server_default_push_rules(services: &Services) -> Result<()> { }, }; - let mut account_data: PushRulesEvent = services + let Some(mut account_data) = services .account_data - .get_global(&user, GlobalAccountDataEventType::PushRules) + .get_global::(&user, GlobalAccountDataEventType::PushRules) .await - .expect("Username is invalid"); + .ok() + else { + // Skip users with no push rules + continue; + }; let user_default_rules = Ruleset::server_default(&user); account_data