Blocked notifications when sending text and waypoints from own node

meshtastic · Mar 7, 2024 · bfd04f5 · bfd04f5
1 parent 2c4d872
commit bfd04f5
Showing 1 changed file with 33 additions and 29 deletions.
diff --git a/src-tauri/src/packet_api/handlers/mesh_packet/handlers.rs b/src-tauri/src/packet_api/handlers/mesh_packet/handlers.rs
@@ -171,19 +171,21 @@ pub fn handle_text_message_mesh_packet<R: tauri::Runtime>(
     events::dispatch_updated_device(&packet_api.app_handle, &packet_api.device)
         .map_err(|e| DeviceUpdateError::EventDispatchFailure(e.to_string()))?;
 
-    Notification::new(
-        packet_api
-            .app_handle
-            .config()
-            .tauri
-            .bundle
-            .identifier
-            .clone(),
-    )
-    .title(format!("{} in {}", from_user_name, channel_name))
-    .body(data)
-    .notify(&packet_api.app_handle)
-    .map_err(|e| DeviceUpdateError::NotificationDispatchFailure(e.to_string()))?;
+    if packet.from != packet_api.device.my_node_info.my_node_num {
+        Notification::new(
+            packet_api
+                .app_handle
+                .config()
+                .tauri
+                .bundle
+                .identifier
+                .clone(),
+        )
+        .title(format!("{} in {}", from_user_name, channel_name))
+        .body(data)
+        .notify(&packet_api.app_handle)
+        .map_err(|e| DeviceUpdateError::NotificationDispatchFailure(e.to_string()))?;
+    }
 
     Ok(())
 }
@@ -213,22 +215,24 @@ pub fn handle_waypoint_mesh_packet<R: tauri::Runtime>(
     events::dispatch_updated_device(&packet_api.app_handle, &packet_api.device)
         .map_err(|e| DeviceUpdateError::EventDispatchFailure(e.to_string()))?;
 
-    Notification::new(
-        packet_api
-            .app_handle
-            .config()
-            .tauri
-            .bundle
-            .identifier
-            .clone(),
-    )
-    .title(format!("{} in {}", from_user_name, channel_name))
-    .body(format!(
-        "Sent waypoint \"{}\" at {}, {}",
-        converted_data.name, converted_data.latitude, converted_data.longitude
-    ))
-    .notify(&packet_api.app_handle)
-    .map_err(|e| DeviceUpdateError::NotificationDispatchFailure(e.to_string()))?;
+    if packet.from != packet_api.device.my_node_info.my_node_num {
+        Notification::new(
+            packet_api
+                .app_handle
+                .config()
+                .tauri
+                .bundle
+                .identifier
+                .clone(),
+        )
+        .title(format!("{} in {}", from_user_name, channel_name))
+        .body(format!(
+            "Sent waypoint \"{}\" at {}, {}",
+            converted_data.name, converted_data.latitude, converted_data.longitude
+        ))
+        .notify(&packet_api.app_handle)
+        .map_err(|e| DeviceUpdateError::NotificationDispatchFailure(e.to_string()))?;
+    }
 
     Ok(())
 }