From 9e2389b9b00470e68009afcf1d2f46d7d3e34dae Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Thu, 16 Feb 2023 00:10:42 +0100 Subject: [PATCH 1/3] zaagmans functie --- Shitpost.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Shitpost.py b/Shitpost.py index c22215f..85da477 100644 --- a/Shitpost.py +++ b/Shitpost.py @@ -805,3 +805,25 @@ class Shitpost(commands.Cog): topic = " ".join(args) message = self.get_review_string(topic) await ctx.channel.send(message) + + def get_zaagmans(self): + zaagman_url = "http://iszaagmansallangsgeweest.nl/" + zreq = requests.get(zaagman_url) + if zreq: + return "zaagmans heeft de week doormidden gezaagd" in zreq.text.lower() + else: + return None + + @commands.command(pass_context=True) + async def zaagmans(self, ctx): + """Is zaagmans al langsgeweest? Is de week al doormidden. Wie weet.""" + gezaagd = self.get_zaagmans() + message = ctx.author.mention + ", " + if gezaagd: + message += "zaagmans is langsgeweest. De week is doormidden! 🪚🪚🪚" + else: + if gezaagd is None: + message += "de waarheid over zaagmans is niet te doorgronden." + else: + message += "het is nog niet zo ver. De week is nog heel." + await ctx.channel.send(message) \ No newline at end of file -- 2.52.0 From 23e4a30e14995f0982b4044476df2c5c51cc9624 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Thu, 16 Feb 2023 00:10:51 +0100 Subject: [PATCH 2/3] test zaagmans --- tests/shitpost.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/shitpost.py b/tests/shitpost.py index 0d560e7..a142f76 100644 --- a/tests/shitpost.py +++ b/tests/shitpost.py @@ -3,6 +3,7 @@ import dotenv import os import discord import requests +from datetime import datetime from discord.ext import commands import Shitpost @@ -169,3 +170,13 @@ class TestShitpost(unittest.TestCase): message = self.cog.zalgofy(inmsg) self.assertIsInstance(message, str) self.assertEqual(len(message), len(inmsg)*5) + + def test_zaagmans(self): + zaag = self.cog.get_zaagmans() + if zaag is None: + self.skipTest(f"Server at iszaagmansallangsgeweest.nl has an error, or is unavailable") + else: + vandaag = datetime.now() + dag = vandaag.weekday() + truth = True if dag > 2 or (dag == 2 and vandaag.hour >= 12) else False + self.assertEqual(truth, zaag) -- 2.52.0 From 08f99b856a78c756d41dfb3439b39849eacd976e Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Thu, 2 Mar 2023 11:54:13 +0100 Subject: [PATCH 3/3] whatever gewoon de message van de site overnemen ofzo --- Shitpost.py | 11 ++++------- tests/shitpost.py | 5 +---- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Shitpost.py b/Shitpost.py index 85da477..891bdf2 100644 --- a/Shitpost.py +++ b/Shitpost.py @@ -810,7 +810,7 @@ class Shitpost(commands.Cog): zaagman_url = "http://iszaagmansallangsgeweest.nl/" zreq = requests.get(zaagman_url) if zreq: - return "zaagmans heeft de week doormidden gezaagd" in zreq.text.lower() + return zreq.text.partition("

")[2].partition("

")[0] else: return None @@ -818,12 +818,9 @@ class Shitpost(commands.Cog): async def zaagmans(self, ctx): """Is zaagmans al langsgeweest? Is de week al doormidden. Wie weet.""" gezaagd = self.get_zaagmans() - message = ctx.author.mention + ", " + message = ctx.author.mention + ": " if gezaagd: - message += "zaagmans is langsgeweest. De week is doormidden! 🪚🪚🪚" + message += gezaagd else: - if gezaagd is None: - message += "de waarheid over zaagmans is niet te doorgronden." - else: - message += "het is nog niet zo ver. De week is nog heel." + message += "De waarheid over zaagmans is niet te doorgronden." await ctx.channel.send(message) \ No newline at end of file diff --git a/tests/shitpost.py b/tests/shitpost.py index a142f76..0064b72 100644 --- a/tests/shitpost.py +++ b/tests/shitpost.py @@ -176,7 +176,4 @@ class TestShitpost(unittest.TestCase): if zaag is None: self.skipTest(f"Server at iszaagmansallangsgeweest.nl has an error, or is unavailable") else: - vandaag = datetime.now() - dag = vandaag.weekday() - truth = True if dag > 2 or (dag == 2 and vandaag.hour >= 12) else False - self.assertEqual(truth, zaag) + self.assertIsInstance(zaag, str) -- 2.52.0