cogs/school.py

@@ -1,5 +1,3 @@
-import random
-
 from data import constants
 from decorators import help
 import discord
@@ -45,25 +43,21 @@ class School(commands.Cog):
     # @commands.check(checks.allowedChannels)
     @help.Category(category=Category.School)
     async def les(self, ctx, *day):
-        deadlines = ["SEL", "Webdevelopment", "Computerarchitectuur", "Wetenschappelijk Rekenen"]
+        parsed = les.parseArgs(day)
 
-        await ctx.send("'T is vakantie. Sort of. Werk een beetje aan uw project voor {}.".format(random.choice(deadlines)))
+        # Invalid arguments
-        #
+        if not parsed[0]:
-        # parsed = les.parseArgs(day)
+            return await ctx.send(parsed[1])
-        #
+
-        # # Invalid arguments
+        day, dayDatetime, semester, year = parsed[1:]
-        # if not parsed[0]:
+
-        #     return await ctx.send(parsed[1])
+        # Customize the user's schedule
-        #
+        schedule = self.customizeSchedule(ctx, year, semester)
-        # day, dayDatetime, semester, year = parsed[1:]
+
-        #
+        # Create the embed
-        # # Customize the user's schedule
+        embed = les.createEmbed(day, dayDatetime, semester, year, schedule)
-        # schedule = self.customizeSchedule(ctx, year, semester)
+
-        #
+        await ctx.send(embed=embed)
-        # # Create the embed
-        # embed = les.createEmbed(day, dayDatetime, semester, year, schedule)
-        #
-        # await ctx.send(embed=embed)
 
     # Add all the user's courses
     def customizeSchedule(self, ctx, year, semester):

cogs/tasks.py

@@ -245,10 +245,6 @@ class Tasks(commands.Cog):
         """
         Task that checks for new Ufora announcements every few minutes
         """
-        # Don't run this when testing
-        if self.client.user.id == int(constants.coolerDidierId):
-            return
-
         # Get new notifications
         announcements = ufora_notifications.run()
 

data/remind.py

@@ -12,7 +12,7 @@ class Reminders:
 
         self._les = [int(user[0]) for user in rows if user[2]]
         self._lesMessages = ["Lessenrooster voor vandaag:"]
-        self.les = {"users": self._les, "messages": self._lesMessages, "embed": self.lesEmbed(), "weekends": False, "disabled": True}
+        self.les = {"users": self._les, "messages": self._lesMessages, "embed": self.lesEmbed(), "weekends": False, "disabled": False}
 
         self.categories = [self.nightly, self.les]
 

functions/les.py

@@ -23,15 +23,8 @@ def createEmbed(day, dayDatetime, semester, year, schedule):
     # Create a date object to check the current week
     startDate = 1612224000
     currentTime = dayDatetime.timestamp()
-
     week = clamp(timeFormatters.timeIn(currentTime - startDate, "weeks")[0], 1, 13)
 
-    # Compensate for easter holidays
-    # Sorry but I don't have time to make a clean solution for this rn
-    # this will have to do
-    if currentTime > 1617377400:
-        week -= 2
-
     title, week = getTitle(day, dayDatetime, week)
 
     # Add all courses & their corresponding times + locations of today