Skip to content

Add spaces and punctuation in certain chat messages #14759

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
Andrew5057 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add spaces and punctuation in certain chat messages #14759

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28efc35
Add space in "isprimarily"
Andrew5057 May 29, 2025
6b55035
Fix separators in already-caught blacklist messages
Andrew5057 May 29, 2025
0afb0cc
Shorten line
Andrew5057 May 29, 2025
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
11 changes: 6 additions & 5 deletions chatcommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def rmblu(user):
return "The user is not blacklisted. Perhaps they have already been removed from the blacklist. Please " \
"see: [Blacklists, watchlists, and the user-whitelist: User-blacklist and user-whitelist]" \
"(https://github.com/Charcoal-SE/SmokeDetector/wiki/Commands#user-blacklist-and-user-whitelist) " \
"for more information about when users are added to or removed from the user-blacklist, which is" \
"for more information about when users are added to or removed from the user-blacklist, which is " \
"primarily done with `tpu` and `fp` feedback."
elif int(uid) == -2:
raise CmdException("Error: {}".format(val))
Expand Down Expand Up @@ -381,7 +381,7 @@ def get_normalized_on_list(list_type, extra=''):
minimally_validate_content_source(msg)
chat_user_profile_link = "https://chat.{host}/users/{id}".format(host=msg._client.host,
id=msg.owner.id)
append_force_to_do = " Append `-force` to the command word(s) if you really want to add the pattern you provided."
append_force_to_do = "Append `-force` to the command word(s) if you really want to add the pattern you provided."

pattern = get_pattern_from_content_source(msg)
is_watchlist = bool("watch" in blacklist_type)
Expand Down Expand Up @@ -520,11 +520,12 @@ def get_normalized_on_list(list_type, extra=''):
reasons = check_blacklist(
concretized_pattern, is_username=username, is_watchlist=is_watchlist, is_phone=is_phone)
if reasons:
raise CmdExceptionLongReply("That pattern looks like it's already caught by " +
format_blacklist_reasons(reasons) + other_issues_text + append_force_to_do)
already_caught_text = "That pattern looks like it's already caught by " + \
format_blacklist_reasons(reasons)
raise CmdExceptionLongReply(" ".join(already_caught_text, other_issues_text, append_force_to_do))

if other_issues_text:
raise CmdExceptionLongReply(other_issues_text + append_force_to_do)
raise CmdExceptionLongReply(" ".join(other_issues_text, append_force_to_do))

metasmoke_down = False

Expand Down