Removed old presence system

automation_devices/src/presence.rs

@@ -5,7 +5,7 @@ use async_trait::async_trait;
 use automation_lib::action_callback::ActionCallback;
 use automation_lib::config::MqttDeviceConfig;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::event::{self, Event, EventChannel, OnMqtt};
+use automation_lib::event::OnMqtt;
 use automation_lib::lua::traits::AddAdditionalMethods;
 use automation_lib::messages::PresenceMessage;
 use automation_lib::mqtt::WrappedAsyncClient;
@@ -18,8 +18,6 @@ use tracing::{debug, trace, warn};
 pub struct Config {
     #[device_config(flatten)]
     pub mqtt: MqttDeviceConfig,
-    #[device_config(from_lua, rename("event_channel"), with(|ec: EventChannel| ec.get_tx()))]
-    pub tx: event::Sender,
 
     #[device_config(from_lua, default)]
     pub callback: ActionCallback<Presence, bool>,
@@ -120,16 +118,6 @@ impl OnMqtt for Presence {
             debug!("Overall presence updated: {overall_presence}");
             self.state_mut().await.current_overall_presence = overall_presence;
 
-            if self
-                .config
-                .tx
-                .send(Event::Presence(overall_presence))
-                .await
-                .is_err()
-            {
-                warn!("There are no receivers on the event channel");
-            }
-
             self.config.callback.call(self, &overall_presence).await;
         }
     }

automation_lib/src/device.rs

@@ -5,7 +5,7 @@ use dyn_clone::DynClone;
 use google_home::traits::OnOff;
 use mlua::ObjectLike;
 
-use crate::event::{OnMqtt, OnPresence};
+use crate::event::OnMqtt;
 
 #[async_trait::async_trait]
 pub trait LuaDeviceCreate {
@@ -18,14 +18,7 @@ pub trait LuaDeviceCreate {
 }
 
 pub trait Device:
-    Debug
-    + DynClone
-    + Sync
-    + Send
-    + Cast<dyn google_home::Device>
-    + Cast<dyn OnMqtt>
-    + Cast<dyn OnPresence>
-    + Cast<dyn OnOff>
+    Debug + DynClone + Sync + Send + Cast<dyn google_home::Device> + Cast<dyn OnMqtt> + Cast<dyn OnOff>
 {
     fn get_id(&self) -> String;
 }

automation_lib/src/device_manager.rs

@@ -9,7 +9,7 @@ use tokio_cron_scheduler::{Job, JobScheduler};
 use tracing::{debug, instrument, trace};
 
 use crate::device::Device;
-use crate::event::{Event, EventChannel, OnMqtt, OnPresence};
+use crate::event::{Event, EventChannel, OnMqtt};
 
 pub type DeviceMap = HashMap<String, Box<dyn Device>>;
 
@@ -92,19 +92,6 @@ impl DeviceManager {
                     }
                 });
 
-                join_all(iter).await;
-            }
-            Event::Presence(presence) => {
-                let devices = self.devices.read().await;
-                let iter = devices.iter().map(|(id, device)| async move {
-                    let device: Option<&dyn OnPresence> = device.cast();
-                    if let Some(device) = device {
-                        trace!(id, "Handling");
-                        device.on_presence(presence).await;
-                        trace!(id, "Done");
-                    }
-                });
-
                 join_all(iter).await;
             }
         }

automation_lib/src/event.rs

@@ -6,7 +6,6 @@ use tokio::sync::mpsc;
 #[derive(Debug, Clone)]
 pub enum Event {
     MqttMessage(Publish),
-    Presence(bool),
 }
 
 pub type Sender = mpsc::Sender<Event>;
@@ -34,8 +33,3 @@ pub trait OnMqtt: Sync + Send {
     // fn topics(&self) -> Vec<&str>;
     async fn on_mqtt(&self, message: Publish);
 }
-
-#[async_trait]
-pub trait OnPresence: Sync + Send {
-    async fn on_presence(&self, presence: bool);
-}

config.lua

@@ -43,7 +43,6 @@ local on_presence = {
 local presence_system = Presence.new({
 	topic = mqtt_automation("presence/+/#"),
 	client = mqtt_client,
-	event_channel = automation.device_manager:event_channel(),
 	callback = function(_, presence)
 		for _, f in ipairs(on_presence) do
 			if type(f) == "function" then