Preserve Invocation Context #3377

DragonSenseiGuy · 2025-08-31T22:31:13Z

Added:

A link to the pastebin for commands executed outside of #bot-commands, to preserve invocation context

swfarnsworth · 2025-09-02T00:40:52Z

bot/decorators.py

+                            files=[PasteFile(content=ctx.message.content, lexer="markdown")],
+                            http_session=session,


It looks like these lines are indented an extra level.

swfarnsworth · 2025-09-02T00:41:20Z

bot/decorators.py

+                    log.exception(
+                        "Failed to upload message %d in channel %d to paste service when redirecting output",
+                        ctx.message.channel.id, ctx.message.id
+                        )


This one line should be indented one level less.

swfarnsworth · 2025-09-02T00:42:30Z

bot/decorators.py

+            msg += "Here's the output of "
+
+            if paste_link:
+                msg += f"[your command]({paste_link}):"
+            else:
+                msg += "your command:"


This could be one line using a ternary condition.

swfarnsworth · 2025-09-02T00:47:25Z

@jb3, am I correct in my understanding that this copies messages from the server to our pastebin, possibly unexpectedly?

MarkKoz · 2025-09-02T05:17:06Z

bot/decorators.py

+            else:
+                msg += "your command:"
+
+            await ctx.send(msg)


Would this potentially send an empty message?

Resolved with the ternary changes.

MarkKoz · 2025-09-02T05:17:43Z

bot/decorators.py

            if ping_user:
-                await ctx.send(f"Here's the output of your command, {ctx.author.mention}")
+                msg += f"{ctx.author.mention}, "


Why are we changing the order and putting the mention first?

Do you want it changed? It can be done.

I don't have a strong preference, but I figure we should leave it alone if there is no compelling reason to change it.

Yeah this was probably something I changed inadvertedly when I wrote something on mobile, it can be changed back.

Should I change and commit then? Or should we just leave it as is?

Change it back, there's no reason to alter it from what already exists.

jb3 · 2025-09-02T07:35:54Z

@jb3, am I correct in my understanding that this copies messages from the server to our pastebin, possibly unexpectedly?

Yes, but with it being a bot command I'm less worried about that. Previously we've worried about that when things such as automatically uploading unformatted code have been mentioned, or when we are talking about uploading messages which are not direct interactions with the bot.

In this case, it's reasonable to temporarily upload after a user has directly used our features (bear in mind we automatically upload the results if they are too long).

swfarnsworth · 2025-09-02T13:06:11Z

Perhaps we can send the user the link to delete the paste? You can largely copy the code here:

bot/bot/exts/utils/attachment_pastebin_uploader.py

Lines 130 to 133 in cb4401b

    
           # Send the user a DM with the delete link for the paste. 
        
           # The angle brackets around the remove link are required to stop Discord from visiting the URL to produce a 
        
           # preview, thereby deleting the paste 
        
           await message.author.send(content=f"[Click here](<{paste_response.removal}>) to delete your recent paste.")

DragonSenseiGuy · 2025-09-03T01:00:43Z

Perhaps we can send the user the link to delete the paste? You can largely copy the code here:

bot/bot/exts/utils/attachment_pastebin_uploader.py

Lines 130 to 133 in cb4401b

# Send the user a DM with the delete link for the paste.

# The angle brackets around the remove link are required to stop Discord from visiting the URL to produce a

# preview, thereby deleting the paste

await message.author.send(content=f"[Click here](<{paste_response.removal}>) to delete your recent paste.")

Added.

swfarnsworth · 2025-09-03T01:05:24Z

bot/decorators.py

+                content=
+                f"Your command output was redirected to <#{Channels.bot_commands}>. [Click here](<{paste_response.removal}>) to delete the automatically uploaded copy of your original command."


When a string is too long, the preferred format is like this

content = ( "Lorem ipsum dolor sit amet, consectetur " f"adipiscing {elit}, sed do eiusmod tempor " "incididunt ut labore et dolore magna aliqua." )

This leverages implicit string concatenation. Note that segments using f-string need to start with an f. The trailing spaces at the end of each line are literal single spaces that are not line breaks.

Yeah, Just saw the lint errors, pushed a commit.

jb3

Formatting and wording.

bot/decorators.py

Co-authored-by: Joe Banks <[email protected]>

bot/decorators.py

Co-authored-by: Joe Banks <[email protected]>

jb3 · 2025-09-05T01:05:47Z

bot/decorators.py

+                        " copy of your original command."
+                )
+            except discord.Forbidden:
+                log.warning("Redirect output: Failed to send DM to user. Forbidden.")


This probably isn't a warning really, it's expected behaviour that we are catching.

Suggested change

log.warning("Redirect output: Failed to send DM to user. Forbidden.")

log.info(

"Failed to DM %s with redirected command paste removal link, user has bot DMs disabled",

ctx.author.name

)

Done.But this was your suggestion.

Co-authored-by: Joe Banks <[email protected]>

DragonSenseiGuy added 8 commits August 31, 2025 18:28

Preserve Invocation Context

36b6bb1

reverse changes

772f298

Preserve Invocation context for all commands

73be848

Remove BaseURL

c62b0f8

Change grammar

d6de08a

Add Upload error exception

be05276

Change the format

436cb62

make message gradually and fix lint errors

fc900e5

jb3 approved these changes Sep 1, 2025

View reviewed changes

jb3 enabled auto-merge (squash) September 1, 2025 18:28

jb3 disabled auto-merge September 1, 2025 18:29

jb3 enabled auto-merge (squash) September 1, 2025 18:29

jb3 disabled auto-merge September 1, 2025 18:29

jb3 enabled auto-merge (squash) September 1, 2025 18:30

swfarnsworth reviewed Sep 2, 2025

View reviewed changes

MarkKoz reviewed Sep 2, 2025

View reviewed changes

remove extra indent

3d0b43f

auto-merge was automatically disabled September 2, 2025 19:44
Head branch was pushed to by a user without write access

DragonSenseiGuy added 3 commits September 2, 2025 15:46

remove indent on parenthesis

74ed920

Add ternary conditions

6757786

Add DM to user for removal of code

258f1a8

swfarnsworth reviewed Sep 3, 2025

View reviewed changes

Fix Lint errors

2ac2b90

jb3 requested changes Sep 3, 2025

View reviewed changes

bot/decorators.py Outdated Show resolved Hide resolved

change formatting

44db302

Co-authored-by: Joe Banks <[email protected]>

jb3 requested changes Sep 3, 2025

View reviewed changes

bot/decorators.py Outdated Show resolved Hide resolved

bot/decorators.py Outdated Show resolved Hide resolved

DragonSenseiGuy added 4 commits September 3, 2025 20:58

remove variable init

d30e807

add forbidden error

c234338

import discord

3220541

fix lint errors

e171aff

jb3 requested changes Sep 5, 2025

View reviewed changes

bot/decorators.py Outdated Show resolved Hide resolved

reverse args

77c3753

Co-authored-by: Joe Banks <[email protected]>

jb3 requested changes Sep 5, 2025

View reviewed changes

update logs

ea39656

Co-authored-by: Joe Banks <[email protected]>

jb3 approved these changes Sep 5, 2025

View reviewed changes

jb3 requested review from swfarnsworth and MarkKoz September 5, 2025 01:09

		files=[PasteFile(content=ctx.message.content, lexer="markdown")],
		http_session=session,

		content=
		f"Your command output was redirected to <#{Channels.bot_commands}>. [Click here](<{paste_response.removal}>) to delete the automatically uploaded copy of your original command."

-                log.warning("Redirect output: Failed to send DM to user. Forbidden.")
+                log.info(
+                    "Failed to DM %s with redirected command paste removal link, user has bot DMs disabled",
+                    ctx.author.name
+                )

Uh oh!

Preserve Invocation Context #3377

Are you sure you want to change the base?

Preserve Invocation Context #3377

Conversation

DragonSenseiGuy commented Aug 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swfarnsworth commented Sep 2, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jb3 commented Sep 2, 2025

Uh oh!

swfarnsworth commented Sep 2, 2025

Uh oh!

DragonSenseiGuy commented Sep 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jb3 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DragonSenseiGuy commented Aug 31, 2025 •

edited

Loading