From 0b5dd46d17269202d168287abf798470e76e2a01 Mon Sep 17 00:00:00 2001 From: Mark Hoekveen Date: Tue, 28 Jul 2020 21:59:15 +0200 Subject: [PATCH] Fixes kopieerpasta and adds fallback --- General.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/General.py b/General.py index 3764d8a..eb33aac 100644 --- a/General.py +++ b/General.py @@ -80,19 +80,27 @@ class General(commands.Cog): @commands.command(pass_context=True) @asyncio.coroutine def kopieerpasta(self, ctx): - """ iets schattigs... """ - print(type(ctx.message.channel)) + """Een willekeurige shitpost""" rkopieerpasta = self.r.subreddit('kopieerpasta') - post = rkopieerpasta.top('month', limit=250) - listing = list(post) - random.shuffle(listing) - post = listing[0] + post = rkopieerpasta.random() + # Subreddits kunnen de random functie uitzetten, dus dit is de fallback: + if post == None: + post = rkopieerpasta.top('month', limit=250) + listing = list(post) + random.shuffle(listing) + post = listing[0] try: yield from ctx.message.delete() except: print("No permission to delete message") - yield from ctx.channel.send('**'+post.title+'**```'+post.selftext+'```') + + # Er is een 2000 karakter limiet wat met sommige pastas overschreden kan worden. + # eigenlijk willen we het dan opnieuw proberen maar dat is lastiger, dus maar gewoon berichtje. + if (len(post.selftext)+len(post.title)) >= 1990: + yield from ctx.channel.send('Sorry, kopieerpasta te lang. Probeer het maar opnieuw .') + else: + yield from ctx.channel.send('**'+post.title+'**```'+post.selftext+'```') @commands.command(pass_context=True) @asyncio.coroutine