aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Ionite <[email protected]>2023-02-07 02:43:36 -0500
committerGravatar Ionite <[email protected]>2023-02-07 02:43:36 -0500
commit3d5fa6c3f38c2bd7fd5f79030643ab4fb438879d (patch)
treef1923930dac789949a3aad2a0ee48d0034a725ea
parentAdd disallowed file extensions tests (diff)
Change wording for failed attachments, use `:failmail:` emoji
-rw-r--r--bot/exts/utils/snekbox/_cog.py6
-rw-r--r--bot/exts/utils/snekbox/_eval.py3
2 files changed, 4 insertions, 5 deletions
diff --git a/bot/exts/utils/snekbox/_cog.py b/bot/exts/utils/snekbox/_cog.py
index ffa7d4f57..605f0fa15 100644
--- a/bot/exts/utils/snekbox/_cog.py
+++ b/bot/exts/utils/snekbox/_cog.py
@@ -14,7 +14,7 @@ from pydis_core.utils import interactions
from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX
from bot.bot import Bot
-from bot.constants import Channels, Filter, MODERATION_ROLES, Roles, URLs
+from bot.constants import Channels, Emojis, Filter, MODERATION_ROLES, Roles, URLs
from bot.decorators import redirect_output
from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME
from bot.exts.filters.antimalware import TXT_LIKE_FILES
@@ -352,10 +352,8 @@ class Snekbox(Cog):
allowed, blocked = self._filter_files(ctx, result.files)
# Add notice if any files were blocked
if blocked:
- file_s = "file was" if len(blocked) == 1 else "files were"
- ext_s = "extension" if len(blocked) == 1 else "extensions"
msg += (
- f"\n{len(blocked)} {file_s} not uploaded due to disallowed {ext_s}: "
+ f"\n{Emojis.failmail} Some files with disallowed extensions can't be uploaded: "
f"**{', '.join(f.suffix for f in blocked)}**"
)
diff --git a/bot/exts/utils/snekbox/_eval.py b/bot/exts/utils/snekbox/_eval.py
index 6bc7d7bb3..b88225adc 100644
--- a/bot/exts/utils/snekbox/_eval.py
+++ b/bot/exts/utils/snekbox/_eval.py
@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
from discord.utils import escape_markdown, escape_mentions
+from bot.constants import Emojis
from bot.exts.utils.snekbox._io import FILE_COUNT_LIMIT, FILE_SIZE_LIMIT, FileAttachment, sizeof_fmt
from bot.log import get_logger
@@ -92,7 +93,7 @@ class EvalResult:
n_failed = len(self.failed_files)
files = f"file{'s' if n_failed > 1 else ''}"
- msg = f"Failed to upload {n_failed} {files} {failed_files}"
+ msg = f"{Emojis.failmail} Failed to upload {n_failed} {files} {failed_files}"
if (n_failed + len(self.files)) > FILE_COUNT_LIMIT:
it_they = "they" if n_failed > 1 else "it"