niga

cogs/gelbooru_watcher_base_cog.py

@@ -3,7 +3,11 @@ import discord
 from discord.ext import commands, tasks
 from discord import app_commands
 from discord.ui import Button, View
+<<<<<<< ours
 from discord import ui
+=======
+from discord import ui, components
+>>>>>>> theirs
 import random
 import aiohttp
 import time
@@ -203,7 +207,9 @@ class GelbooruWatcherBaseCog(commands.Cog, abc.ABC, metaclass=GelbooruWatcherMet
             log.info(f"Recreated aiohttp.ClientSession in _send_via_webhook for {self.cog_name}")
 
         try:
-            webhook = discord.Webhook.from_url(webhook_url, session=self.session)
+            webhook = discord.Webhook.from_url(
+                webhook_url, session=self.session, client=self.bot
+            )
             target_thread_obj = None
             if thread_id:
                 try:
@@ -518,10 +524,22 @@ class GelbooruWatcherBaseCog(commands.Cog, abc.ABC, metaclass=GelbooruWatcherMet
         view = ui.LayoutView(timeout=None)
         container = ui.Container()
         view.add_item(container)
+<<<<<<< ours
         section = ui.Section(accessory=ui.Thumbnail(media=file_url, description="Post"))
         container.add_item(section)
         section.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:"))
         container.add_item(ui.TextDisplay(file_url))
+=======
+
+        container.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:"))
+
+        gallery = ui.MediaGallery()
+        gallery.add_item(
+            components.MediaGalleryItem(media=file_url, description="Post Image")
+        )
+        container.add_item(gallery)
+
+>>>>>>> theirs
         return view
 
     async def _prefix_command_logic(self, ctx: commands.Context, tags: str):