Pflanzenerinnerung für die TierWG ergänzt. Der Befehl .nextEvents gibt nun die...

Pflanzenerinnerung für die TierWG ergänzt. Der Befehl .nextEvents gibt nun die anstehenden Events aus und .allEvents enthält die vollständige Liste inklusive historischer Events.

commands.json

@@ -160,11 +160,19 @@
             "_Func": "get_next_event",
             "allowedGroups":[]
         },
+        {
+            "Names": [
+                ".nextEvents"
+            ],
+            "Description": "Get a list of all upcoming events.",
+            "_Func": "get_all_upcomming_events",
+            "allowedGroups":[]
+        },
         {
             "Names": [
                 ".allEvents"
             ],
-            "Description": "Get a list of all events.",
+            "Description": "Get a list of all events, including past ones.",
             "_Func": "get_all_events",
             "allowedGroups":[]
         },

mod_eventreminder.py

@@ -91,7 +91,17 @@ class ModuleEventReminder:
         return message
 
     def get_eventlist(self, groupInfo):
-        message = "Alle Events:\n"
+        today = datetime.today()
+        format = "%d.%m.%Y"
+        message = "Anstehende Events:\n"
+        for event in self.events[groupInfo["NAME"]]:  # Dieses For geht bestimmt in einer Teile, so wie in signalbot.py
+            event_dt = datetime.strptime(event.date, format)
+            if (event_dt - today).days >=0:
+                message += f"{event.headline}, {event.date}\n"
+        return message
+
+    def get_complete_eventlist(self, groupInfo):
+        message = "Alle Events (inklusive vergangener Events):\n"
         for event in self.events[groupInfo["NAME"]]:  # Dieses For geht bestimmt in einer Teile, so wie in signalbot.py
             message += f"{event.headline}, {event.date}\n"
         return message

signalbot.py

@@ -389,9 +389,12 @@ def save_event(msgDict):
     send(event_reminder.save_event(msgDict["content"], msgDict["groupInfo"]), msgDict["receiver"])
 
 
-def get_all_events(msgDict):
+def get_all_upcomming_events(msgDict):
     send(event_reminder.get_eventlist(msgDict["groupInfo"]), msgDict["receiver"])
 
+def get_all_events(msgDict):
+    send(event_reminder.get_complete_eventlist(msgDict["groupInfo"]), msgDict["receiver"])
+
 
 def get_next_event(msgDict):
     send(event_reminder.get_next_event(msgDict["groupInfo"]), msgDict["receiver"])
@@ -466,9 +469,16 @@ def init_schedule_jobs():
     schedule.every().tuesday.at("10:00").do(run_threaded, gg_remind_schichten)
     schedule.every().day.at("11:00").do(run_threaded, gg_remind_stundenzettel)
     schedule.every().day.at("13:00").do(run_threaded,today.update)
+    schedule.every().thursday.at("10:00").do(run_threaded, remind_pflanzen)
    # schedule.every(10).seconds.do(run_threaded, birthday_reminder.check_for_birthdays)
 
 
+def remind_pflanzen():
+    for group in GROUPS:
+        if group["NAME"] == "TierWG":
+            send(f'Bitte gebt den armen Pflanzen etwas Lebenselixier!')
+            break
+
 def gg_remind_schichten():
     for group in GROUPS:
         if group["NAME"] == "GGOffiziell":