Add Reddit support, fix some bugs

3 files changed, 59 insertions, 10 deletions

diff --git a/bot.py b/bot.py
index f6145e9..896d1e3 100644
--- a/bot.py
+++ b/bot.py
@@ -3,11 +3,16 @@ from nextcord.ext import commands
 import os
 from dotenv import load_dotenv
 import bot_utils
+import cogs.fun as F
+import cogs.utils as U
+import cogs.modrinth as M
+import cogs.reddit as R
 
 load_dotenv()
 bot = commands.Bot(command_prefix="t!", activity=nextcord.Activity(name="for commands", type=nextcord.ActivityType.watching))
 bot.help_command = bot_utils.MyHelpCommand(command_attrs={'hidden':True})
 
+
 @bot.event
 async def on_ready():
     print(f'Logged in as {bot.user.display_name}!')
@@ -23,12 +28,8 @@ async def on_message(message):
         await ctx.reply("<:irritater:882309845427036230>")
     await bot.process_commands(message)
 
-def load_extensions(client):
-    extensions = ['cogs.fun', 'cogs.utils', 'cogs.modrinth']
-    if __name__ == '__main__':
-        for i in extensions:
-            client.load_extension(i)
-
-bot.load_extension('jishaku')
-load_extensions(bot)
+F.setup(bot)
+R.setup(bot)
+M.setup(bot)
+U.setup(bot)
 bot.run(os.getenv("TOKEN"))
diff --git a/cogs/reddit.py b/cogs/reddit.py
new file mode 100644
index 0000000..39c4b38
--- /dev/null
+++ b/cogs/reddit.py
@@ -0,0 +1,48 @@
+import nextcord
+from nextcord.errors import InvalidArgument
+from nextcord.ext import commands
+from nextcord import ChannelType
+import random
+import asyncpraw
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+reddit = asyncpraw.Reddit(
+    client_id="2OTyJiFOZ1-lxXSO4-YZXw",
+    client_secret=os.getenv("SECRET"),
+    user_agent="mounderfod.tpbot:v1.0.0 (by u/mounderfod)"
+)
+
+class Reddit(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command(name="reddit", brief="Gets images from Reddit.", help="""
+    Fetches a random image or link from the 100 "hot" posts of the given subreddit. If the image/sub is NSFW then an NSFW Discord channel must be used.
+    """, aliases=['redd', 'r'])
+    async def redditimg(self, ctx, sub):
+        sub = await reddit.subreddit(sub)
+        img_posts = [i async for i in sub.hot(limit=100) if not i.is_self and i.domain != "v.redd.it" ]
+        if len(img_posts) == 0:
+            await ctx.reply("This subreddit has no image posts!", mention_author = False)
+        else:
+            post = random.choice(img_posts)
+            nsfw = post.over_18
+            if nsfw and ctx.channel.type == ChannelType.text and not ctx.channel.is_nsfw():
+                await ctx.reply("The selected post is NSFW, and this is not an NSFW channel.", mention_author = False)
+            else:
+                for i in get_image_embed(post):
+                    await ctx.send(i)
+            
+
+def setup(bot):
+    bot.add_cog(Reddit(bot))
+
+def get_image_embed(post):
+    result = ["Post by " + post.author.name + ": " + post.title]
+    if hasattr(post, "is_gallery"):
+        result.append("\nhttps://i." + list(post.media_metadata.values())[0]["p"][0]["u"].split('?')[0][16:])
+    else:
+        result.append("\n" + post.url)
+    return result
diff --git a/requirements.txt b/requirements.txt
index 96e273e..75c5f2b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 python-dotenv == 0.19.0
 requests ~= 2.26.0
-jishaku ==2.2.0
-nextcord~=2.0.0a1
\ No newline at end of file
+nextcord~=2.0.0a3
+asyncpraw ~= 7.4.0
\ No newline at end of file