Skip to content

fix: upload files in a seperate message to allow message previewing #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onerandomusername wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: upload files in a seperate message to allow message previewing #706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions monty/exts/core/eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def _get_component_for_segment(
title: str,
language: str,
display_colour: int | disnake.Colour | None = None,
) -> tuple[disnake.ui.Container | list[Any], disnake.File | None]:
) -> tuple[disnake.ui.Container | list[Any] | None, disnake.File | None]:
"""Get a UI component for a given segment of text."""
file = None
file_tuple = self.maybe_file(content, prefix="output", suffix="txt")
Expand All @@ -212,16 +212,12 @@ def _get_component_for_segment(
file_tuple = self.maybe_file(content, prefix="output", suffix="txt")
language = "py"
if file_tuple:
filename, file = file_tuple
container = disnake.ui.Container(
disnake.ui.TextDisplay(f"Output too long, sent as file `{filename}`."),
disnake.ui.File(f"attachment://{filename}"),
)
_, file = file_tuple
return None, file
elif content.strip():
container = disnake.ui.Container(disnake.ui.TextDisplay(f"**{title}:**\n```{language}\n{content}\n```"))
else:
container = disnake.ui.Container(disnake.ui.TextDisplay(f"**{title}:**\n*No output.*"))

if display_colour is None:
display_colour = constants.Colours.python_yellow
if isinstance(display_colour, int):
Expand Down Expand Up @@ -340,14 +336,16 @@ async def ieval(self, ctx: commands.Context, *, body: str) -> None:
delete_contexts = (ctx.message, None)
else:
delete_contexts = (None,)
response.components += [
delete_components = [
disnake.ui.ActionRow(
*[DeleteButton(ctx.author.id, allow_manage_messages=False, initial_message=m) for m in delete_contexts]
)
]
await ctx.send(
allowed_mentions=disnake.AllowedMentions.none(), components=response.components, files=response.files
)
if response.components:
response.components += delete_components
await ctx.send(allowed_mentions=disnake.AllowedMentions.none(), components=response.components)
if response.files:
await ctx.send(files=response.files, components=delete_components)

@commands.command(name="repl", hidden=True)
async def repl(self, ctx: commands.Context) -> None:
Expand Down Expand Up @@ -436,20 +434,22 @@ async def repl(self, ctx: commands.Context) -> None:
delete_contexts = (msg, None)
else:
delete_contexts = (None,)
response.components += [
delete_components = [
disnake.ui.ActionRow(
*[
DeleteButton(ctx.author.id, allow_manage_messages=False, initial_message=m)
for m in delete_contexts
]
)
]
await ctx.reply(
allowed_mentions=disnake.AllowedMentions.none(),
components=response.components,
files=response.files,
fail_if_not_exists=False,
)
if response.components:
response.components += delete_components
await ctx.send(
allowed_mentions=disnake.AllowedMentions.none(),
components=response.components,
)
if response.files:
await ctx.send(files=response.files, components=delete_components)
local_vars = result.local_vars

async def cog_check(self, ctx: commands.Context) -> bool:
Expand Down