slipstream/discordbot
slipstream/discordbot
1
1
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix: Resolve merge conflict in _build_new_post_view method for media gallery display

Browse Source
This commit is contained in:
Slipstream 2025-06-04 20:57:50 -06:00
parent c2fc8adcff
commit 6336ef9db1
Signed by: slipstream
GPG Key ID: 13E498CE010AC6FD
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cogs/gelbooru_watcher_base_cog.py
View File

@ -521,23 +521,10 @@ class GelbooruWatcherBaseCog(commands.Cog, abc.ABC, metaclass=GelbooruWatcherMet
container = ui.Container() container = ui.Container()
view.add_item(container) view.add_item(container)
<<<<<<< ours
<<<<<<< ours
gallery = ui.MediaGallery(ui.MediaGalleryItem(media=file_url))
section = ui.Section(accessory=gallery)
container.add_item(section)
section.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:"))
=======
=======
>>>>>>> theirs
gallery = ui.MediaGallery() gallery = ui.MediaGallery()
gallery.add_item(media=file_url) gallery.add_item(media=file_url)
container.add_item(gallery) container.add_item(gallery)
container.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:")) container.add_item(ui.TextDisplay(f"New {self.cog_name} post for tags `{tags}`:"))
<<<<<<< ours
>>>>>>> theirs
=======
>>>>>>> theirs
container.add_item(ui.TextDisplay(file_url)) container.add_item(ui.TextDisplay(file_url))
return view return view