From 3b9ac1471908a074332c89dcb65abec4d6de5bf4 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Sun, 13 Jul 2025 15:22:42 +0200 Subject: [PATCH] fixt hopelijk build issues maar garanties heb je alleen in de hemel. ofzo. --- Dockerfile | 2 +- General.py | 20 +++++++++++++------- requirements.txt | 1 + tests/general.py | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f274191..ce0e473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11 +FROM python:3.13 WORKDIR /opt/stroopwafel diff --git a/General.py b/General.py index 737df0e..36856c5 100644 --- a/General.py +++ b/General.py @@ -23,7 +23,7 @@ class General(commands.Cog): warnings.simplefilter("ignore") def get_emoji_embed(self, tag: str): - emoji = re.search(".*\<\:([A-z]*)\:(\d*)\>.*", tag) + emoji = re.search(r'.*\<\:([A-z]*)\:(\d*)\>.*', tag) embed = discord.Embed(title=emoji.group(1), type='photo') hugemoji = 'https://cdn.discordapp.com/emojis/' + emoji.group(2) + '.png' embed.set_image(url=hugemoji) @@ -59,19 +59,25 @@ class General(commands.Cog): def get_kopieerpasta(self): rkopieerpasta = self.r.subreddit('kopieerpasta') - post = rkopieerpasta.random() + try: + post = rkopieerpasta.random() - # Subreddits kunnen de random functie uitzetten, dus dit is de fallback: - if post == None: - listing = list(rkopieerpasta.top('month', limit=250)) - post = random.choice(listing) + # Subreddits kunnen de random functie uitzetten, dus dit is de fallback: + if post == None: + listing = list(rkopieerpasta.top(time_filter='month', limit=250)) + post = random.choice(listing) - return post + return post + except: + return None @commands.command(pass_context=True) async def kopieerpasta(self, ctx): """Een willekeurige shitpost""" post = self.get_kopieerpasta() + if not post: + await ctx.channel.send("Geen kopieerpasta voor jou vandaag.") + return print(post.url) ATTEMPTS = 10 a = 0 diff --git a/requirements.txt b/requirements.txt index 2036991..15902c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ numpy python-dotenv feedparser audioop-lts +vobject diff --git a/tests/general.py b/tests/general.py index a958bdb..01a35ba 100644 --- a/tests/general.py +++ b/tests/general.py @@ -41,9 +41,9 @@ class TestGeneral(unittest.TestCase): if not isinstance(self.cog.r, praw.Reddit): self.skipTest("PRAW Reddit instance failed to create") post = self.cog.get_kopieerpasta() - self.assertIsInstance(post.url, str) + if post: + self.assertIsInstance(post.url, str) def test_huge(self): embed = self.cog.get_emoji_embed("<:test:123456789>") self.assertIsInstance(embed, discord.Embed) -