From f7c24ebca53da2f1191e98b599fee4a56e9eefca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?=
 <joern-michael.miehe@lenaisten.de>
Date: Sun, 19 Nov 2023 23:37:51 +0100
Subject: [PATCH] minor fixes

---
 lenaverse_bot/core/bot.py  | 12 ++++--------
 lenaverse_bot/core/post.py | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lenaverse_bot/core/bot.py b/lenaverse_bot/core/bot.py
index eec0146..bfdb585 100644
--- a/lenaverse_bot/core/bot.py
+++ b/lenaverse_bot/core/bot.py
@@ -3,19 +3,17 @@ import logging
 import discord
 
 from .commands import lsstuff
-from .post import post
+from .post import ev_post
 
 _logger = logging.getLogger(__name__)
 
 
 class LenaverseBot(discord.Client):
     def __init__(self) -> None:
-        intents = discord.Intents.default()
-
-        super().__init__(intents=intents)
+        super().__init__(intents=discord.Intents.default())
 
         self.tree = discord.app_commands.CommandTree(self)
-        self.tree.add_command(post)
+        self.tree.add_command(ev_post)
         self.tree.add_command(lsstuff)
 
     async def setup_hook(self):
@@ -23,7 +21,5 @@ class LenaverseBot(discord.Client):
         _logger.info("Commands synced")
 
     async def on_ready(self) -> None:
-        if self.user is None:
-            return
-
+        assert self.user is not None
         _logger.info(f"{self.user.name} has connected to Discord!")
diff --git a/lenaverse_bot/core/post.py b/lenaverse_bot/core/post.py
index be57659..5c7b390 100644
--- a/lenaverse_bot/core/post.py
+++ b/lenaverse_bot/core/post.py
@@ -60,17 +60,23 @@ class PostModal(ui.Modal, title="Post verfassen"):
         post_content = f"{self.content.value}\n> Gepostet von <@{interaction.user.id}>"
 
         # Vorschau mit Buttons
+        view = PostConfirm()
         await interaction.response.send_message(
             content=f"## Post-Vorschau\n\n{post_content}",
-            view=(view := PostConfirm()),
+            view=view,
             # nur für ausführenden User
             ephemeral=True,
         )
 
         # warten auf User-Entscheidung
-        await view.wait()
+        if await view.wait() is True:
+            # Entscheidungszeit abgelaufen
+            await interaction.user.send("Zeit abgelaufen, Post verworfen ")
+            _logger.info(
+                f"User {interaction.user.name}({interaction.user.id}) timeout during /post"
+            )
 
-        if view.action is Action.PUBLISH:
+        elif view.action is Action.PUBLISH:
             # Post veröffentlichen
             _logger.info(
                 f"User {interaction.user.name}({interaction.user.id}) published a /post"
@@ -79,18 +85,14 @@ class PostModal(ui.Modal, title="Post verfassen"):
             await target.send(post_content)
 
         elif view.action is Action.ABORT:
+            # Post abbrechen
             _logger.info(
                 f"User {interaction.user.name}({interaction.user.id}) aborted a /post"
             )
 
-        elif view.action is Action.TIMEOUT:
-            _logger.info(
-                f"User {interaction.user.name}({interaction.user.id}) timeout during /post"
-            )
-
 
 @discord.app_commands.command()
-async def post(interaction: discord.Interaction):
+async def ev_post(interaction: discord.Interaction) -> None:
     """
     Einen Post im Lenaisten-Bereich verfassen (nur für ausgewählte Mitglieder verfügbar)
     """