Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rmenus): Better handling of post errors.

Browse Source
This commit is contained in:
Conatum
2023-09-22 12:05:27 +03:00
parent 6a7e047833
commit a4643529db
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/rolemenus/cog.py
View File

@@ -976,11 +976,16 @@ class RoleMenuCog(LionCog):
if rawmessage is not None: if rawmessage is not None:
msg_config = target.config.rawmessage msg_config = target.config.rawmessage
content = await msg_config.download_attachment(rawmessage) content = await msg_config.download_attachment(rawmessage)
data = await msg_config._parse_string(content) data = await msg_config._parse_string(0, content)
update_args[msg_config._column] = data update_args[msg_config._column] = data
if template is None: if template is None:
update_args[self.data.RoleMenu.templateid.name] = None update_args[self.data.RoleMenu.templateid.name] = None
ack_lines.append(msg_config.update_message) ack_lines.append(
t(_p(
'cmd:rolemenu_edit|parse:custom_message|success',
"Custom menu message updated."
))
)
# Update the data, if applicable # Update the data, if applicable
if update_args: if update_args:

18
src/modules/rolemenus/ui/menueditor.py
View File

@@ -644,7 +644,7 @@ class MenuEditor(MessageUI):
self.bot, json.loads(self.menu.data.rawmessage), callback=self._editor_callback, callerid=self._callerid self.bot, json.loads(self.menu.data.rawmessage), callback=self._editor_callback, callerid=self._callerid
) )
self._slaves.append(editor) self._slaves.append(editor)
await editor.run(interaction) await editor.run(interaction, ephemeral=True)
# Template/Custom Menu # Template/Custom Menu
@select(cls=Select, placeholder="TEMPLATE_MENU_PLACEHOLDER", min_values=1, max_values=1) @select(cls=Select, placeholder="TEMPLATE_MENU_PLACEHOLDER", min_values=1, max_values=1)
@@ -821,20 +821,15 @@ class MenuEditor(MessageUI):
""" """
Display or update the preview message. Display or update the preview message.
""" """
args = await self.menu.make_args()
view = await self.menu.make_view()
if self._preview is not None: if self._preview is not None:
try: try:
await self._preview.delete_original_response() await self._preview.delete_original_response()
except discord.HTTPException: except discord.HTTPException:
pass pass
self._preview = None self._preview = None
await press.response.send_message( await press.response.defer(thinking=True, ephemeral=True)
**args.send_args,
view=view or discord.utils.MISSING,
ephemeral=True
)
self._preview = press self._preview = press
await self.update_preview()
async def preview_button_refresh(self): async def preview_button_refresh(self):
t = self.bot.translator.t t = self.bot.translator.t
@@ -887,13 +882,14 @@ class MenuEditor(MessageUI):
description=desc description=desc
) )
await selection.edit_original_response(embed=embed) await selection.edit_original_response(embed=embed)
except discord.HTTPException: except discord.HTTPException as e:
error = discord.Embed( error = discord.Embed(
colour=discord.Colour.brand_red(), colour=discord.Colour.brand_red(),
description=t(_p( description=t(_p(
'ui:menu_editor|button:repost|widget:repost|error:post_failed', 'ui:menu_editor|button:repost|widget:repost|error:post_failed',
"An error ocurred while posting to {channel}. Do I have sufficient permissions?" "An unknown error ocurred while posting to {channel}!\n"
)).format(channel=channel.mention) "**Error:** `{exception}`"
)).format(channel=channel.mention, exception=e.text)
) )
await selection.edit_original_response(embed=error) await selection.edit_original_response(embed=error)
else: else: