From f0d5cc0118139958a150a81da471bf90055a18f3 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mhoekveen@gmail.com>
Date: Mon, 22 Jan 2018 21:23:12 +0100
Subject: [PATCH 1/2] Added weer command

Met dank aan JP. First test..
---
 Shitpost.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/Shitpost.py b/Shitpost.py
index c8321b8..24723cc 100644
--- a/Shitpost.py
+++ b/Shitpost.py
@@ -132,5 +132,75 @@ class Shitpost(object):
 			yield from ctx.channel.send(ctx.author.mention + ' Het is nu ' + datetime.now().strftime('%H:%M'), file=discord.File(filepath, 'tijd.png'))
 		else:
 			yield from ctx.channel.send(ctx.author.mention + ' Het is nu ' + datetime.now().strftime('%H:%M'))
+
+			#Used by function weer()
+	weatherIconTranslation = {
+		"zonnig" : ":sun_with_face:",
+		"bliksem" : ":cloud_lightning:",
+		"regen" : ":cloud_rain:",
+		"buien" : ":umbrella:",
+		"hagel" : ":cloud_snow:",
+		"mist" : ":white_large_square:",
+		"sneeuw" : ":cloud_snow:",
+		"bewolkt" : ":white_sun_cloud:",
+		"halfbewolkt" : ":partly_sunny:",
+		"zwaarbewolkt" : ":cloud:",
+		"nachtmist" : ":ghost:",
+		"helderenacht" : ":first_quarter_moon_with_face:",
+		"wolkennacht" : ":cloud:"
+	}
+
+	@commands.command(pass_context=True, hidden=True)
+	@asyncio.coroutine
+	def weer(self, ctx, location="Leiden"):
+		"""Vertelt je het weer.
+		Omdat je te lui bent om naar buiten te kijken.
+		Oant Moarn!
+		"""
+		if(location == ""):
+			location = "Leiden"
+
+		url = "http://weerlive.nl/api/json-10min.php?locatie=" + location
+		response = requests.get(url)
+		#Oant Moarn
+
+		if (response.ok):
+			wData = json.loads(response.content.decode('utf-8'))
+			message = ""
+			
+			if (wData["liveweer"][0]["alarm"] == "1"):
+				message += "\n\n" + "HOLY SHIT :scream: ER IS EEN WEERALARM!!!1!: "
+				message += wData["liveweer"][0]["alarmtxt"] + ". Hide yo kids, hide yo wife! \n\n"
+
+			message += weatherIconTranslation[ wData["liveweer"][0]["image"] ]
+			message += " Het is " + wData["liveweer"][0]["temp"] + " graden "
+			message += "en het weer is: " + wData["liveweer"][0]["samenv"] +  ". "
+			message += "De verwachting: " + wData["liveweer"][0]["verw"] 
+			
+			message += "\n\nMorgen:  " + weatherIconTranslation[ wData["liveweer"][0]["d1weer"] ]
+			message += " " + wData["liveweer"][0]["d1tmin"] + " tot "
+			message += wData["liveweer"][0]["d1tmax"] + " graden. "
+			if (wData["liveweer"][0]["d1neerslag"] == "0"):
+				message += "Geen neerslag. "
+			else:
+				message += "Kans op neerslag: " + wData["liveweer"][0]["d1neerslag"] + "%. "
+			if (int(wData["liveweer"][0]["d1windk"]) > 5):
+				message += "Windkracht " + wData["liveweer"][0]["d1windk"] + ". Blow it."
+
+			message += "\n\nOvermorgen:  "+  weatherIconTranslation[ wData["liveweer"][0]["d2weer"] ]
+			message += " "  + wData["liveweer"][0]["d2tmin"] + " tot "
+			message += wData["liveweer"][0]["d2tmax"] + " graden. "
+			if (wData["liveweer"][0]["d2neerslag"] == "0"):
+				message += "Geen neerslag. "
+			else:
+				message += "Kans op neerslag: " + wData["liveweer"][0]["d2neerslag"] + "%. "
+			if (int(wData["liveweer"][0]["d2windk"]) > 5):
+				message += "Windkracht " + wData["liveweer"][0]["d2windk"] + ". "
+					
+			message += "\n\nOant Moarn!"
+			
+			yield from ctx.channel.send(message)
+		else:
+			print("API ERROR. :robot:")
 def setup(bot):
 	bot.add_cog(Shitpost(bot))
\ No newline at end of file

From 8f85fce946ee2e22e064f6e14fd778da436f80a7 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mhoekveen@gmail.com>
Date: Mon, 22 Jan 2018 21:32:39 +0100
Subject: [PATCH 2/2] bugfix.. maybe?

---
 Shitpost.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Shitpost.py b/Shitpost.py
index 24723cc..3352015 100644
--- a/Shitpost.py
+++ b/Shitpost.py
@@ -134,21 +134,7 @@ class Shitpost(object):
 			yield from ctx.channel.send(ctx.author.mention + ' Het is nu ' + datetime.now().strftime('%H:%M'))
 
 			#Used by function weer()
-	weatherIconTranslation = {
-		"zonnig" : ":sun_with_face:",
-		"bliksem" : ":cloud_lightning:",
-		"regen" : ":cloud_rain:",
-		"buien" : ":umbrella:",
-		"hagel" : ":cloud_snow:",
-		"mist" : ":white_large_square:",
-		"sneeuw" : ":cloud_snow:",
-		"bewolkt" : ":white_sun_cloud:",
-		"halfbewolkt" : ":partly_sunny:",
-		"zwaarbewolkt" : ":cloud:",
-		"nachtmist" : ":ghost:",
-		"helderenacht" : ":first_quarter_moon_with_face:",
-		"wolkennacht" : ":cloud:"
-	}
+	
 
 	@commands.command(pass_context=True, hidden=True)
 	@asyncio.coroutine
@@ -157,6 +143,21 @@ class Shitpost(object):
 		Omdat je te lui bent om naar buiten te kijken.
 		Oant Moarn!
 		"""
+		weatherIconTranslation = {
+			"zonnig" : ":sun_with_face:",
+			"bliksem" : ":cloud_lightning:",
+			"regen" : ":cloud_rain:",
+			"buien" : ":umbrella:",
+			"hagel" : ":cloud_snow:",
+			"mist" : ":white_large_square:",
+			"sneeuw" : ":cloud_snow:",
+			"bewolkt" : ":white_sun_cloud:",
+			"halfbewolkt" : ":partly_sunny:",
+			"zwaarbewolkt" : ":cloud:",
+			"nachtmist" : ":ghost:",
+			"helderenacht" : ":first_quarter_moon_with_face:",
+			"wolkennacht" : ":cloud:"
+		}
 		if(location == ""):
 			location = "Leiden"