DeviceManager no longer handles subscribing and filtering topics, each device has to do this themselves now

src/devices/audio_setup.rs

@@ -10,6 +10,7 @@ use crate::devices::As;
 use crate::error::DeviceConfigError;
 use crate::event::{OnMqtt, OnPresence};
 use crate::messages::{RemoteAction, RemoteMessage};
+use crate::mqtt::WrappedAsyncClient;
 
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct AudioSetupConfig {
@@ -20,6 +21,8 @@ pub struct AudioSetupConfig {
     mixer: WrappedDevice,
     #[device_config(from_lua)]
     speakers: WrappedDevice,
+    #[device_config(from_lua)]
+    client: WrappedAsyncClient,
 }
 
 #[derive(Debug, LuaDevice)]
@@ -42,6 +45,11 @@ impl AudioSetup {
             return Err(DeviceConfigError::MissingTrait(speakers_id, "OnOff".into()));
         }
 
+        config
+            .client
+            .subscribe(&config.mqtt.topic, rumqttc::QoS::AtLeastOnce)
+            .await?;
+
         Ok(AudioSetup { config })
     }
 }
@@ -54,11 +62,11 @@ impl Device for AudioSetup {
 
 #[async_trait]
 impl OnMqtt for AudioSetup {
-    fn topics(&self) -> Vec<&str> {
-        vec![&self.config.mqtt.topic]
-    }
-
     async fn on_mqtt(&mut self, message: rumqttc::Publish) {
+        if !rumqttc::matches(&message.topic, &self.config.mqtt.topic) {
+            return;
+        }
+
         let action = match RemoteMessage::try_from(message) {
             Ok(message) => message.action(),
             Err(err) => {