From abe9deb8585c2325c9656ad9154bbcfc2d52e9db Mon Sep 17 00:00:00 2001
From: Dennis Klein <mail@dnns01.de>
Date: Tue, 6 Apr 2021 18:04:25 +0200
Subject: [PATCH] Improve arminsagt output

---
 armin.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/armin.py b/armin.py
index 8eeb26f..5c64e91 100644
--- a/armin.py
+++ b/armin.py
@@ -1,4 +1,5 @@
 import random
+from datetime import datetime, timedelta
 
 from discord.ext import commands
 
@@ -6,22 +7,29 @@ from discord.ext import commands
 class Armin(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        self.a = ["ein-", "zwei-", "drei-", "vier-", "fünf", "sechs-"]
-        self.b = ["tägige/n", "wöchige/n", "monatige/n", "fache/n", "malige/n", "hebige/n"]
-        self.c = ["harte/n", "softe/n", "optionale/n", "intranspatente/n", "alternativlose/n", "unumkehrbare/n"]
+        self.a = ["ein", "zwei", "drei", "vier", "fünf", "sechs"]
+        self.b = ["tägige", "wöchige", "monatige", "fache", "malige", "hebige"]
+        self.c = ["harte", "softe", "optionale", "intranspatente", "alternativlose", "unumkehrbare"]
         self.d = ["Wellenbrecher-", "Brücken-", "Treppen-", "Wende-", "Impf-", "Ehren-"]
         self.e = ["Lockdown", "Stopp", "Maßnahme", "Kampagne", "Sprint", "Matrix"]
-        self.f = ["zum Sommer", "auf Weiteres", "zur Bundestagswahl", "2030", "nach den Apiturprüfungen",
+        self.f = ["zum Sommer", "auf Weiteres", "zur Bundestagswahl", "2030", "nach den Abiturprüfungen",
                   "in die Puppen"]
         self.g = ["sofortigen", "nachhaltigen", "allmählichen", "unausweichlichen", "wirtschaftsschonenden",
                   "willkürlichen"]
         self.h = ["Senkung", "Steigerung", "Beendigung", "Halbierung", "Vernichtung", "Beschönigung"]
         self.i = ["Infektionszahlen", "privaten Treffen", "Wirtschaftsleistung", "Wahlprognosen", "dritten Welle",
                   "Bundeskanzlerin"]
+        self.arminsagt_cooldown = datetime.now()
 
     @commands.command(name="arminsagt")
     async def cmd_arminsagt(self, ctx):
-        await ctx.send(f"Was wir jetzt brauchen, ist ein/e {random.choice(self.a)}{random.choice(self.b)} "
-                       f"{random.choice(self.c)} {random.choice(self.d)}{random.choice(self.e)} "
-                       f"bis {random.choice(self.f)} zur {random.choice(self.g)} {random.choice(self.h)} "
-                       f"der {random.choice(self.i)}.")
+        if datetime.now() > self.arminsagt_cooldown:
+            self.arminsagt_cooldown = datetime.now() + timedelta(minutes=1)
+            rNum = random.randint(0, 5)
+            n = "n" if rNum not in [2, 3, 5] else ""
+            await ctx.send(f"Was wir jetzt brauchen, ist eine{n} {random.choice(self.a)}{random.choice(self.b)}{n} "
+                           f"{random.choice(self.c)}{n} {random.choice(self.d)}{self.e[rNum]} "
+                           f"bis {random.choice(self.f)} zur {random.choice(self.g)} {random.choice(self.h)} "
+                           f"der {random.choice(self.i)}.")
+        else:
+            await ctx.send("Sorry, aber Armin denkt noch nach...")
-- 
GitLab