marcothms/aquabot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sorting to reddit.py

Browse Source
This commit is contained in:
Marco Thomas
2020-10-09 11:25:12 +02:00
parent 59794f8d52
commit 7cfa665060
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cogs/admin.py
View File

@@ -20,9 +20,9 @@ class Admin(commands.Cog):
try: try:
self.bot.load_extension(cog) self.bot.load_extension(cog)
except Exception as e: except Exception as e:
await ctx.send(f'**`ERROR:`** {type(e).__name__} - {e}') await ctx.send(f'**ERROR:** {type(e).__name__} - {e}')
else: else:
await ctx.send('**`SUCCESS`**') await ctx.send('**SUCCESS**')
@commands.command(name="unload", hidden=True) @commands.command(name="unload", hidden=True)
@@ -34,9 +34,9 @@ class Admin(commands.Cog):
try: try:
self.bot.unload_extension(cog) self.bot.unload_extension(cog)
except Exception as e: except Exception as e:
await ctx.send(f'**`ERROR:`** {type(e).__name__} - {e}') await ctx.send(f'**ERROR:** {type(e).__name__} - {e}')
else: else:
await ctx.send('**`SUCCESS`**') await ctx.send('**SUCCESS**')
@commands.command(name="reload", hidden=True) @commands.command(name="reload", hidden=True)
@@ -49,9 +49,9 @@ class Admin(commands.Cog):
self.bot.unload_extension(cog) self.bot.unload_extension(cog)
self.bot.load_extension(cog) self.bot.load_extension(cog)
except Exception as e: except Exception as e:
await ctx.send(f'**`ERROR:`** {type(e).__name__} - {e}') await ctx.send(f'**ERROR:** {type(e).__name__} - {e}')
else: else:
await ctx.send('**`SUCCESS`**') await ctx.send('**SUCCESS**')
def setup(bot): def setup(bot):

3
cogs/help.py
View File

@@ -24,8 +24,9 @@ class Help(commands.Cog):
embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True) embed.add_field(name="Owner", value=self.bot.AppInfo.owner, inline=True)
embed.add_field(name="Command Prefix", value=PREFIX, inline=True) embed.add_field(name="Command Prefix", value=PREFIX, inline=True)
embed.add_field(name="Source Code", value="[GitHub](https://github.com/crammk/aquabot)", inline=True) embed.add_field(name="Source Code", value="[GitHub](https://github.com/crammk/aquabot)", inline=True)
embed.add_field(name="Help", value="Use the 'help' to get a list of commands!")
footer_text = "This Bot is a project by [MarcMK](https://marcmk.de)." footer_text = "This Bot is a project by MarcMK."
embed.set_footer(text=footer_text) embed.set_footer(text=footer_text)
await ctx.send(embed=embed) await ctx.send(embed=embed)

23
cogs/reddit.py
View File

@@ -18,22 +18,33 @@ class Reddit(commands.Cog):
@commands.command(name="reddit") @commands.command(name="reddit")
async def reddit(self, ctx, sub: str): async def reddit(self, ctx, sub: str, sorting="hot", time_filter="all"):
""" """
Send a post from a subreddit to chat Send a post from a subreddit to chat. Timefilters: all, day, hour, month, week, year
""" """
reddit = praw.Reddit(client_id=REDDIT_CLIENT_ID, reddit = praw.Reddit(client_id=REDDIT_CLIENT_ID,
client_secret=REDDIT_CLIENT_SECRET, client_secret=REDDIT_CLIENT_SECRET,
user_agent=REDDIT_CLIENT_USERAGENT) user_agent=REDDIT_CLIENT_USERAGENT)
posts = reddit.subreddit(sub).hot() try:
if sorting == "hot":
posts = reddit.subreddit(sub).hot()
elif sorting == "top":
posts = reddit.subreddit(sub).top(time_filter)
elif sorting == "new":
posts = reddit.subreddit(sub).new()
except ValueError as e:
await ctx.send(f"Invalid Argument: {e}")
# WORKS
rand_post = random.randint(1, 100) rand_post = random.randint(1, 100)
# Make sure you're not sending a pinned post # Make sure you're not sending a pinned post
for i in range(0, rand_post): for i in range(0, rand_post):
post = next(x for x in posts if not x.stickied) submission = next(x for x in posts if not x.stickied)
await ctx.send(f"> '{post.title}' by {post.author.name}") await ctx.send(f"'{submission.title}' by {submission.author.name} - 🔼 {submission.score}")
await ctx.send(post.url) await ctx.send(submission.url)
def setup(bot): def setup(bot):