From fa6618c8001c88452d286f3a46fefd3efe964d98 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Thu, 25 Aug 2022 08:42:29 -0600
Subject: [PATCH] Cleanup bad rebase

---
 docs/docs/integrations/mqtt.md | 1 +
 frigate/mqtt.py                | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/docs/integrations/mqtt.md b/docs/docs/integrations/mqtt.md
index f808aa55b..29a04d6ac 100644
--- a/docs/docs/integrations/mqtt.md
+++ b/docs/docs/integrations/mqtt.md
@@ -156,6 +156,7 @@ Topic to adjust motion contour area for a camera. Expected value is an integer.
 ### `frigate/<camera_name>/motion_contour_area/state`
 
 Topic with current motion contour area for a camera. Published value is an integer.
+
 ### `frigate/<camera_name>/birdseye/set`
 
 Topic to turn birdseye for a camera on and off. Expected valures are `ON` and `OFF`.
diff --git a/frigate/mqtt.py b/frigate/mqtt.py
index 8edb659e1..140f84355 100644
--- a/frigate/mqtt.py
+++ b/frigate/mqtt.py
@@ -163,6 +163,7 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
         logger.info(f"Setting motion threshold for {camera_name} via mqtt: {payload}")
         camera_metrics[camera_name]["motion_threshold"].value = payload
         motion_settings.threshold = payload
+
         state_topic = f"{message.topic[:-4]}/state"
         client.publish(state_topic, payload, retain=True)
 
@@ -186,6 +187,9 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
         )
         camera_metrics[camera_name]["motion_contour_area"].value = payload
         motion_settings.contour_area = payload
+        
+        state_topic = f"{message.topic[:-4]}/state"
+        client.publish(state_topic, payload, retain=True)
 
     def on_birdseye_command(client, userdata, message):
         payload = message.payload.decode()
@@ -315,21 +319,18 @@ def create_mqtt_client(config: FrigateConfig, camera_metrics):
             on_improve_contrast_command,
         )
         client.message_callback_add(
-<<<<<<< HEAD
             f"{mqtt_config.topic_prefix}/{name}/motion_threshold/set",
             on_motion_threshold_command,
         )
         client.message_callback_add(
             f"{mqtt_config.topic_prefix}/{name}/motion_contour_area/set",
             on_motion_contour_area_command,
-=======
             f"{mqtt_config.topic_prefix}/{name}/birdseye/set",
             on_birdseye_command,
         )
         client.message_callback_add(
             f"{mqtt_config.topic_prefix}/{name}/birdseye/mode/set",
             on_birdseye_mode_command,
->>>>>>> f223cd0 (Add mqtt topics)
         )
 
     client.message_callback_add(