fixup! HACK disable more sanity

Author: sandhose

crates/syn2mas/src/migration.rs

@@ -3,11 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 // Please see LICENSE in the repository root for full details.
 
-#![expect(
-    clippy::overly_complex_bool_expr,
-    reason = "This is temporary, to remove a few safe guards"
-)]
-
 //! # Migration
 //!
 //! This module provides the high-level logic for performing the Synapse-to-MAS
@@ -320,8 +315,7 @@ async fn migrate_threepids(
             continue;
         };
         let Some(user_infos) = state.users.get(username.as_str()).copied() else {
-            if true || is_likely_appservice(&username) {
-                // HACK can we do anything better
+            if is_likely_appservice(&username) {
                 continue;
             }
             return Err(Error::MissingUserFromDependentTable {
@@ -406,8 +400,7 @@ async fn migrate_external_ids(
             .into_extract_localpart(synapse_user_id.clone())?
             .to_owned();
         let Some(user_infos) = state.users.get(username.as_str()).copied() else {
-            if true || is_likely_appservice(&username) {
-                // HACK can we do anything better
+            if is_likely_appservice(&username) {
                 continue;
             }
             return Err(Error::MissingUserFromDependentTable {
@@ -493,8 +486,7 @@ async fn migrate_devices(
             .into_extract_localpart(synapse_user_id.clone())?
             .to_owned();
         let Some(user_infos) = state.users.get(username.as_str()).copied() else {
-            if true || is_likely_appservice(&username) {
-                // HACK can we do anything better
+            if is_likely_appservice(&username) {
                 continue;
             }
             return Err(Error::MissingUserFromDependentTable {
@@ -597,8 +589,7 @@ async fn migrate_unrefreshable_access_tokens(
             .into_extract_localpart(synapse_user_id.clone())?
             .to_owned();
         let Some(user_infos) = state.users.get(username.as_str()).copied() else {
-            if true || is_likely_appservice(&username) {
-                // HACK can we do anything better
+            if is_likely_appservice(&username) {
                 continue;
             }
             return Err(Error::MissingUserFromDependentTable {
@@ -719,8 +710,7 @@ async fn migrate_refreshable_token_pairs(
             .into_extract_localpart(synapse_user_id.clone())?
             .to_owned();
         let Some(user_infos) = state.users.get(username.as_str()).copied() else {
-            if true || is_likely_appservice(&username) {
-                // HACK can we do anything better
+            if is_likely_appservice(&username) {
                 continue;
             }
             return Err(Error::MissingUserFromDependentTable {
@@ -836,5 +826,9 @@ fn transform_user(
 // e.g. read application service registration files.
 #[inline]
 fn is_likely_appservice(localpart: &str) -> bool {
+    // HACK(matrix.org): These are the namespaces we use on matrix.org
     localpart.starts_with('_')
+        || localpart.starts_with("freenode_")
+        || localpart.starts_with("slack_")
+        || localpart.starts_with("torn_")
 }