From 018502b2831ab30d16b91678a3353b89635c520d Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Tue, 24 Sep 2024 08:22:48 -0500
Subject: [PATCH] fix merge conflicts

---
 frigate/api/event.py | 6 ++++++
 frigate/app.py       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/frigate/api/event.py b/frigate/api/event.py
index 7f80c145d..b542cb09c 100644
--- a/frigate/api/event.py
+++ b/frigate/api/event.py
@@ -926,6 +926,12 @@ def set_description(
             ids=[id],
         )
 
+    response_message = (
+        f"Event {id} description is now blank"
+        if new_description is None or len(new_description) == 0
+        else f"Event {id} description set to {new_description}"
+    )
+
     return JSONResponse(
         content=(
             {
diff --git a/frigate/app.py b/frigate/app.py
index fa2b64a95..00add1acc 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -663,6 +663,7 @@ class FrigateApp:
                     self.onvif_controller,
                     self.external_event_processor,
                     self.stats_emitter,
+                    self.event_metadata_updater,
                 ),
                 host="127.0.0.1",
                 port=5001,