fixup! Add MasWriter support for compat sessions

Author: sandhose

crates/syn2mas/src/migration.rs

@@ -433,6 +433,23 @@ async fn migrate_devices(
                 Ulid::with_source(rng).into());
         let created_at = Ulid::from(session_id).datetime().into();
 
+        // As we're using a real IP type in the MAS database, it is possible
+        // that we encounter invalid IP addresses in the Synapse database.
+        // In that case, we should ignore them, but still log a warning.
+        let last_active_ip = ip.and_then(|ip| {
+            ip.parse()
+                .map_err(|e| {
+                    tracing::warn!(
+                        error = &e as &dyn std::error::Error,
+                        mxid = %synapse_user_id,
+                        %device_id,
+                        %ip,
+                        "Failed to parse device IP, ignoring"
+                    );
+                })
+                .ok()
+        });
+
         // TODO skip access tokens for deactivated users
         write_buffer
             .write(
@@ -445,7 +462,7 @@ async fn migrate_devices(
                     created_at,
                     is_synapse_admin: synapse_admins.contains(&user_id),
                     last_active_at: last_seen.map(DateTime::from),
-                    last_active_ip: ip.map(|ip| ip.parse()).transpose().ok().flatten(),
+                    last_active_ip,
                     user_agent,
                 },
             )