From 9fd3890c45d6ff80d3d5edc862554014a47b5dc4 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Fri, 6 Jan 2023 05:31:47 +0100
Subject: [PATCH] Improved the mechanism for extracting the presence device
 name

---
 src/presence.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/presence.rs b/src/presence.rs
index 4ae1efe..fb3fbba 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -44,8 +44,8 @@ impl OnMqtt for Presence {
             return;
         }
 
-        // @TODO More robust mechanism for splitting
-        let device_name = message.topic.rsplit_once("/").unwrap().1;
+        let offset = self.mqtt.topic.find('+').or(self.mqtt.topic.find('#')).unwrap();
+        let device_name = &message.topic[offset..];
 
         if message.payload.len() == 0 {
             // Remove the device from the map