transitous rewrite: only send announcement embed when no voice announcement

src/dc/embeds.py

@@ -23,7 +23,7 @@ def build_info_embed() -> discord.Embed:
     from src.dc.handlers import trip
 
     agency = trip["agency"]
-    metadata = get_operator_metadata(agency, trip["route_color"])
+    metadata = get_operator_metadata(agency, trip["route_color"], trip["mode"])
     departure = format_timestamp_to_dc(trip["departure"])
     arrival = format_timestamp_to_dc(trip["arrival"])
 
@@ -62,7 +62,7 @@ def build_info_embed() -> discord.Embed:
 def build_announcement_embed(msg):
     from src.dc.handlers import trip
     agency = trip["agency"]
-    metadata = get_operator_metadata(agency, trip["route_color"])
+    metadata = get_operator_metadata(agency, trip["route_color"], trip["mode"])
 
     embed = discord.Embed(
         title = "Informationen zu ihrer Fahrt",

src/dc/handlers.py

@@ -3,7 +3,7 @@ import asyncio
 import random
 from datetime import datetime, timedelta, date
 
-from src.utils import logger, channel_formatting, choose_connection, get_sound_path, LOCAL_TZ
+from src.utils import logger, channel_formatting, choose_connection, get_sound_path, LOCAL_TZ, get_next_station
 from src.config import config
 
 _scheduled_task: asyncio.Task | None = None
@@ -43,7 +43,56 @@ async def rename_vc(bot: discord.Bot, voice_channel, from_scheduler: bool = Fals
 
     _scheduled_task = asyncio.create_task(_schedule_next_transfer(bot,  trip["arrival_dt"], voice_channel, trip["to"]))
 
-            
+async def announcer(announcement: str, voice_channel: discord.VoiceChannel, destination = None):
+    from src.dc.embeds import build_info_embed, build_announcement_embed
+    announcements_enabled = config.announcements.enabled
+    voice_announcement_enabled = config.announcements.voice[0].enabled
+
+    if announcements_enabled:
+        if len(voice_channel.members) > 0:
+            match announcement:
+                case "ende":
+                    if voice_announcement_enabled:
+                        announcement_status = await voice_announcer(destination, voice_channel)
+                        if announcement_status:
+                            return
+                    embed = build_announcement_embed(
+                    f'Sehr geehrte Fahrgäste,\nIn wenigen Minuten erreichen wir {destination}. Dieser Zug endet dort.\n\nWir wünschen Ihnen eine angenehme Weiterreise.\n\nVielen Dank für ihr Vertrauen und auf Wiedersehen.')
+                case "umstieg":
+                    embed = build_info_embed()
+                case _:
+                    logger(f"Unbekanntes Announcements: {announcement}")
+                    embed = None
+
+            if embed:
+                await voice_channel.send(embed=embed)
+
+        else:
+            logger(f"Announcement {announcement} wird geskipped, keiner da")
+            return
+
+async def voice_announcer(destination: str, voice_channel: discord.VoiceChannel) -> bool:
+    sound_path = get_sound_path(destination=destination)
+    if sound_path is None:
+        return False
+    
+    logger(f"VC wird betreten, spiele {sound_path}")
+    vc = await voice_channel.connect(timeout=15, reconnect=True)
+    audio_source = discord.FFmpegPCMAudio(sound_path)
+
+    loop = asyncio.get_running_loop()
+
+    if not vc.is_playing():
+        def after_playing(error):
+            if error:
+                logger(f"Player error: {error}", "error")
+            loop.create_task(vc.disconnect())
+            logger("VC wird verlassen")
+
+        vc.play(audio_source, after=after_playing)
+        return True
+
+
 async def _schedule_next_transfer(bot: discord.Bot, arrival_dt: datetime, voice_channel: discord.VoiceChannel, destination: str):
     now = datetime.now(LOCAL_TZ)
 
@@ -62,49 +111,5 @@ async def _schedule_next_transfer(bot: discord.Bot, arrival_dt: datetime, voice_
         else:
             await asyncio.sleep(wait_seconds)
 
-    logger("Zug angekommen, wähle neue Verbindung")
-    await rename_vc(bot, voice_channel, from_scheduler=True)
-
-async def announcer(announcement: str, voice_channel: discord.VoiceChannel, destination = None):
-    from src.dc.embeds import build_info_embed, build_announcement_embed
-    announcements_enabled = config.announcements.enabled
-    voice_announcement_enabled = config.announcements.voice[0].enabled
-
-    if announcements_enabled:
-        if len(voice_channel.members) > 0:
-            match announcement:
-                case "ende":
-                    embed = build_announcement_embed(
-                        f'Sehr geehrte Fahrgäste,\nIn wenigen Minuten erreichen wir {destination}. Dieser Zug endet dort.\n\nWir wünschen Ihnen eine angenehme Weiterreise.\n\nVielen Dank für ihr Vertrauen und auf Wiedersehen.')
-                    if voice_announcement_enabled:
-                        await voice_announcer(destination, voice_channel)
-                case "umstieg":
-                    embed = build_info_embed()
-                case _:
-                    logger(f"Unbekanntes Announcements: {announcement}")
-                    embed = None
-            if embed:
-                await voice_channel.send(embed=embed)
-        else:
-            logger(f"Announcement {announcement} wird geskipped, keiner da")
-            return
-
-async def voice_announcer(destination: str, voice_channel: discord.VoiceChannel):
-    sound_path = get_sound_path(destination=destination)
-    if sound_path is None:
-        return
-    
-    logger(f"VC wird betreten, spiele {sound_path}")
-    vc = await voice_channel.connect(timeout=15, reconnect=True)
-    audio_source = discord.FFmpegPCMAudio(sound_path)
-
-    loop = asyncio.get_running_loop()
-
-    if not vc.is_playing():
-        def after_playing(error):
-            if error:
-                logger(f"Player error: {error}", "error")
-            loop.create_task(vc.disconnect())
-            logger("VC wird verlassen")
-
-        vc.play(audio_source, after=after_playing)
+        logger("Zug angekommen, wähle neue Verbindung")
+        await rename_vc(bot, voice_channel, from_scheduler=True)