Handle turning off devices when away through lua

automation_devices/src/hue_bridge.rs

@@ -3,7 +3,6 @@ use std::net::SocketAddr;
 
 use async_trait::async_trait;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::event::OnPresence;
 use automation_lib::lua::traits::AddAdditionalMethods;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
 use mlua::LuaSerdeExt;
@@ -110,11 +109,3 @@ impl AddAdditionalMethods for HueBridge {
         );
     }
 }
-
-#[async_trait]
-impl OnPresence for HueBridge {
-    async fn on_presence(&self, presence: bool) {
-        trace!("Bridging presence to hue");
-        self.set_flag(Flag::Presence, presence).await;
-    }
-}

automation_devices/src/kasa_outlet.rs

@@ -4,7 +4,6 @@ use std::str::Utf8Error;
 
 use async_trait::async_trait;
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::event::OnPresence;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
 use bytes::{Buf, BufMut};
 use google_home::errors::{self, DeviceError};
@@ -13,7 +12,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
-use tracing::{debug, trace};
+use tracing::trace;
 
 #[derive(Debug, Clone, LuaDeviceConfig)]
 pub struct Config {
@@ -276,13 +275,3 @@ impl OnOff for KasaOutlet {
             .or(Err(DeviceError::TransientError.into()))
     }
 }
-
-#[async_trait]
-impl OnPresence for KasaOutlet {
-    async fn on_presence(&self, presence: bool) {
-        if !presence {
-            debug!(id = Device::get_id(self), "Turning device off");
-            self.set_on(false).await.ok();
-        }
-    }
-}

automation_devices/src/zigbee/light.rs

@@ -7,7 +7,7 @@ use async_trait::async_trait;
 use automation_lib::action_callback::ActionCallback;
 use automation_lib::config::{InfoConfig, MqttDeviceConfig};
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::event::{OnMqtt, OnPresence};
+use automation_lib::event::OnMqtt;
 use automation_lib::helpers::serialization::state_deserializer;
 use automation_lib::mqtt::WrappedAsyncClient;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
@@ -251,16 +251,6 @@ impl OnMqtt for Light<StateColorTemperature> {
     }
 }
 
-#[async_trait]
-impl<T: LightState> OnPresence for Light<T> {
-    async fn on_presence(&self, presence: bool) {
-        if !presence {
-            debug!(id = Device::get_id(self), "Turning device off");
-            self.set_on(false).await.ok();
-        }
-    }
-}
-
 #[async_trait]
 impl<T: LightState> google_home::Device for Light<T> {
     fn get_device_type(&self) -> Type {

automation_devices/src/zigbee/outlet.rs

@@ -7,7 +7,7 @@ use async_trait::async_trait;
 use automation_lib::action_callback::ActionCallback;
 use automation_lib::config::{InfoConfig, MqttDeviceConfig};
 use automation_lib::device::{Device, LuaDeviceCreate};
-use automation_lib::event::{OnMqtt, OnPresence};
+use automation_lib::event::OnMqtt;
 use automation_lib::helpers::serialization::state_deserializer;
 use automation_lib::mqtt::WrappedAsyncClient;
 use automation_macro::{LuaDevice, LuaDeviceConfig};
@@ -50,10 +50,6 @@ pub struct Config<T: OutletState> {
     #[device_config(default(OutletType::Outlet))]
     pub outlet_type: OutletType,
 
-    // TODO: One presence is reworked, this should be removed!
-    #[device_config(default(true))]
-    pub presence_auto_off: bool,
-
     #[device_config(from_lua, default)]
     pub callback: ActionCallback<Outlet<T>, T>,
 
@@ -202,16 +198,6 @@ impl OnMqtt for Outlet<StatePower> {
     }
 }
 
-#[async_trait]
-impl<T: OutletState> OnPresence for Outlet<T> {
-    async fn on_presence(&self, presence: bool) {
-        if self.config.presence_auto_off && !presence {
-            debug!(id = Device::get_id(self), "Turning device off");
-            self.set_on(false).await.ok();
-        }
-    }
-}
-
 #[async_trait]
 impl<T: OutletState> google_home::Device for Outlet<T> {
     fn get_device_type(&self) -> Type {