fix(ipc): handle multi-session contexts better

Author: vyfor

src/messages/events/client/clear_activity.rs

@@ -53,12 +53,6 @@ impl OnEvent for ClearActivityEvent {
 
             if let Some(session) = latest {
                 if let Some(mut activity) = session.last_activity.clone() {
-                    if let Some(global) = &global_last_activity {
-                        if global == &activity {
-                            return Ok(());
-                        }
-                    }
-
                     if ctx.cord.config.shared_timestamps {
                         let shared_ts =
                             &ctx.cord.session_manager.shared_timestamp;
@@ -77,6 +71,12 @@ impl OnEvent for ClearActivityEvent {
                         }
                     }
 
+                    if let Some(global) = &global_last_activity {
+                        if global == &activity {
+                            return Ok(());
+                        }
+                    }
+
                     ctx.cord
                         .session_manager
                         .last_activity

src/messages/events/client/disconnect.rs

@@ -24,17 +24,6 @@ impl OnEvent for DisconnectEvent {
             return Ok(());
         }
 
-        if ctx
-            .cord
-            .session_manager
-            .last_activity
-            .read()
-            .unwrap()
-            .is_none()
-        {
-            return Ok(());
-        }
-
         let latest = sessions
             .iter()
             .filter(|s| s.1.last_activity.is_some())
@@ -63,6 +52,14 @@ impl OnEvent for DisconnectEvent {
             }
 
             ctx.cord.activity_manager.update(activity.clone())?;
+        } else {
+            let mut last_activity =
+                ctx.cord.session_manager.last_activity.write().unwrap();
+            if last_activity.is_some() {
+                *last_activity = None;
+                drop(last_activity);
+                ctx.cord.activity_manager.clear()?;
+            }
         }
 
         Ok(())

src/messages/events/client/update_activity.rs

@@ -66,26 +66,32 @@ impl OnEvent for UpdateActivityEvent {
             }
         }
 
+        if let Some(mut session) =
+            ctx.cord.session_manager.get_session_mut(ctx.client_id)
         {
+            session.set_last_activity(activity.clone());
+            session.last_updated = now().as_nanos();
+        }
+
+        let should_update = {
             let mut last_activity =
                 ctx.cord.session_manager.last_activity.write().unwrap();
 
             if let Some(global_last_activity) = last_activity.as_ref() {
                 if !self.force && global_last_activity == &activity {
-                    return Ok(());
+                    false
+                } else {
+                    *last_activity = Some(activity.clone());
+                    true
                 }
+            } else {
+                *last_activity = Some(activity.clone());
+                true
             }
+        };
 
-            *last_activity = Some(activity.clone());
-        }
-
-        ctx.cord.activity_manager.update(activity.clone())?;
-
-        if let Some(mut session) =
-            ctx.cord.session_manager.get_session_mut(ctx.client_id)
-        {
-            session.set_last_activity(activity);
-            session.last_updated = now().as_nanos();
+        if should_update {
+            ctx.cord.activity_manager.update(activity)?;
         }
 
         Ok(())