From 08f99b856a78c756d41dfb3439b39849eacd976e Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Thu, 2 Mar 2023 11:54:13 +0100 Subject: [PATCH] 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)