From a4ca645e3ee78291149f701b8728b03b7ce6b918 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mark@hoekveen.net>
Date: Wed, 16 Aug 2023 14:53:10 +0200
Subject: [PATCH 1/2] nieuw muzak eindpunt

---
 General.py     | 29 ++++++++++++++++++++++++-----
 Stroopwafel.py |  4 ++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/General.py b/General.py
index e0b8460..4eabd1b 100644
--- a/General.py
+++ b/General.py
@@ -5,6 +5,7 @@ import random
 import re
 import json, requests
 import warnings
+from datetime import date, timedelta
 from discord.ext import commands
 
 class General(commands.Cog):
@@ -12,7 +13,7 @@ class General(commands.Cog):
 
 	def __init__(self, bot):
 		self.bot = bot
-		self.muzak_url = 'https://hdcon-muzak.herokuapp.com'
+		self.muzak_url = 'https://muzak.hoekveen.net'
 		self.r = praw.Reddit(
 			user_agent='StroopwafelBot',
 			client_secret=os.getenv("STROOP_REDDIT_SECRET"),
@@ -92,11 +93,29 @@ class General(commands.Cog):
 		return requests.get(self.muzak_url + '/stroopwafel')
 
 	@commands.command(pass_context=True)
-	async def playlist(self, ctx):
-		"""HDcon2021 playlist"""
+	async def muzak(self, ctx):
+		"""HD muzak playlist"""
 		data = json.loads(self.get_playlist_json().content)
-		msg = 'Stemmen en nomineren kan hier: {}\n'.format(self.muzak_url)
-		msg += '*Er zijn al {} nummers genomineerd*\n'.format(data['stemCount'])
+		msg = ""
+		open = date.fromisoformat(data['openDate'])
+		nom = date.fromisoformat(data['deadlineNominations'])
+		vote = date.fromisoformat(data['deadlineVoting'])
+		today = date.today()
+		if open > today:
+			msg += "Het stemmen is nog niet geopend voor dit jaar.\n"
+			msg += f"Nog even geduld; Vanaf {open} is de muzak open en kun je naar hartelust stemmen en nomineren.\n"
+		elif today > nom and today > vote and (today - vote) < timedelta(days=8):
+			msg += "Het nomineren en stemmen is alweer voorbij.\n"
+			msg += "Je zult nog even geduld moeten hebben tot de lijst klaar is.\n"
+		elif today > nom and today > vote:
+			msg += "De lijst is al helemaal klaar. Goed gedaan jongens. Applausje voor jezelf."
+		else:
+			if open == today:
+				msg += "Jawel mensen! Vanaf vandaag mag het stemmen beginnen!\n"
+			msg += f"Stemmen en nomineren kan hier: {self.muzak_url}\n"
+			msg += f"*Er zijn al {data['stemCount']} nummers genomineerd!*\n"
+			msg += f"Nomineren kan tot {nom}, stemmen kan tot {vote}.\n"
+			msg += "\nIk hoop dat jullie allemaal je beste nummers insturen!"
 		await ctx.channel.send(msg)
 
 	@commands.command(pass_context=True)
diff --git a/Stroopwafel.py b/Stroopwafel.py
index d00fc68..1888531 100644
--- a/Stroopwafel.py
+++ b/Stroopwafel.py
@@ -3,7 +3,7 @@ import discord
 #import Music
 import Shitpost
 import General
-import Cryptocoin
+#import Cryptocoin
 import Chatbot
 import Points
 import logging
@@ -19,7 +19,7 @@ dotenv.load_dotenv()
 async def add_cogs(bot):
 	await bot.add_cog(Shitpost.Shitpost(bot))
 	await bot.add_cog(General.General(bot))
-	await bot.add_cog(Cryptocoin.Cryptocoin(bot))
+	#await bot.add_cog(Cryptocoin.Cryptocoin(bot))
 	await bot.add_cog(Chatbot.Chatbot(bot))
 	await bot.add_cog(Points.Points(bot))
 
-- 
2.52.0


From a2319f0fac40900c8bc696f40d82ff89d6cb175a Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mark@hoekveen.net>
Date: Wed, 16 Aug 2023 14:54:35 +0200
Subject: [PATCH 2/2] oeps

---
 Stroopwafel.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Stroopwafel.py b/Stroopwafel.py
index 1888531..d00fc68 100644
--- a/Stroopwafel.py
+++ b/Stroopwafel.py
@@ -3,7 +3,7 @@ import discord
 #import Music
 import Shitpost
 import General
-#import Cryptocoin
+import Cryptocoin
 import Chatbot
 import Points
 import logging
@@ -19,7 +19,7 @@ dotenv.load_dotenv()
 async def add_cogs(bot):
 	await bot.add_cog(Shitpost.Shitpost(bot))
 	await bot.add_cog(General.General(bot))
-	#await bot.add_cog(Cryptocoin.Cryptocoin(bot))
+	await bot.add_cog(Cryptocoin.Cryptocoin(bot))
 	await bot.add_cog(Chatbot.Chatbot(bot))
 	await bot.add_cog(Points.Points(bot))
 
-- 
2.52.0