From 58c0873987952983142def2ed0a17fc21f31d492 Mon Sep 17 00:00:00 2001
From: Interitio <cona@thewisewolf.dev>
Date: Tue, 27 Aug 2024 17:30:53 +1000
Subject: [PATCH] (streamalerts): Add new alert keys.

---
 src/modules/streamalerts/editor.py   |  2 +-
 src/modules/streamalerts/settings.py | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/modules/streamalerts/editor.py b/src/modules/streamalerts/editor.py
index e87f175..dacf6e6 100644
--- a/src/modules/streamalerts/editor.py
+++ b/src/modules/streamalerts/editor.py
@@ -56,7 +56,7 @@ class AlertEditorUI(MessageUI):
             data.streamerid,
             utc_now() - dt.timedelta(hours=1),
             -1,
-            "Discord Admin",
+            "Art",
             "Testing Go Live Message",
             utc_now()
         )
diff --git a/src/modules/streamalerts/settings.py b/src/modules/streamalerts/settings.py
index 42e2e94..b5da18b 100644
--- a/src/modules/streamalerts/settings.py
+++ b/src/modules/streamalerts/settings.py
@@ -47,6 +47,9 @@ class AlertSettings(SettingGroup):
             '{login_name}': "Twitch channel login name (as in url)",
             '{channel_link}': "Link to the live twitch channel",
             '{stream_start}': "Numeric timestamp when stream went live",
+            '{stream_start_iso}': "ISO timestamp when stream went live (for embed timestamp)",
+            '{title}': "Title of the stream when it went live",
+            '{game}': "Game name of the stream when it went live"
         }
         # TODO: More stuff
 
@@ -71,13 +74,15 @@ class AlertSettings(SettingGroup):
                     '{login_name}': streamer.login_name,
                     '{channel_link}': f"https://www.twitch.tv/{streamer.login_name}",
                     '{stream_start}': int(stream.start_at.timestamp()),
+                    '{stream_start_iso}': stream.start_at.isoformat(),
+                    '{title}': stream.title,
+                    '{game}': stream.game_name,
                 }
 
-                recurse_map(
+                return recurse_map(
                     lambda loc, value: replace_multiple(value, mapping) if isinstance(value, str) else value,
                     data_dict,
                 )
-                return data_dict
             return formatter
 
         async def editor_callback(self, editor_data):
@@ -127,7 +132,11 @@ class AlertSettings(SettingGroup):
             '{login_name}': "Twitch channel login name (as in url)",
             '{channel_link}': "Link to the live twitch channel",
             '{stream_start}': "Numeric timestamp when stream went live",
+            '{stream_start_iso}': "ISO timestamp when stream went live (for embed timestamp)",
             '{stream_end}': "Numeric timestamp when stream ended",
+            '{stream_end_iso}': "ISO timestamp when stream ended (for embed timestamp)",
+            '{title}': "Title of the stream when it went live",
+            '{game}': "Game name of the stream when it went live",
         }
 
         @property
@@ -156,13 +165,16 @@ class AlertSettings(SettingGroup):
                     '{channel_link}': f"https://www.twitch.tv/{streamer.login_name}",
                     '{stream_start}': int(stream.start_at.timestamp()),
                     '{stream_end}': int(stream.end_at.timestamp()),
+                    '{stream_start_iso}': stream.start_at.isoformat(),
+                    '{stream_end_iso}': stream.end_at.isoformat(),
+                    '{title}': stream.title,
+                    '{game}': stream.game_name,
                 }
 
-                recurse_map(
+                return recurse_map(
                     lambda loc, value: replace_multiple(value, mapping) if isinstance(value, str) else value,
                     data_dict,
                 )
-                return data_dict
             return formatter
 
         async def editor_callback(self, editor_data):