liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prefixes of < catching on mentions

Browse Source
This commit is contained in:
Ske
2018-07-14 22:32:48 +02:00
parent e965bc2913
commit 6162ac9d9d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bot/pluralkit/proxy.py
View File

@@ -144,6 +144,7 @@ async def handle_proxying(conn, message):
bool(x["prefix"])) + int(bool(x["suffix"])), reverse=True) bool(x["prefix"])) + int(bool(x["suffix"])), reverse=True)
msg = message.content msg = message.content
msg_clean = message.clean_content
for member in members: for member in members:
# If no proxy details are configured, skip # If no proxy details are configured, skip
if not member["prefix"] and not member["suffix"]: if not member["prefix"] and not member["suffix"]:
@@ -154,14 +155,14 @@ async def handle_proxying(conn, message):
suffix = member["suffix"] or "" suffix = member["suffix"] or ""
# If we have a match, proxy the message # If we have a match, proxy the message
if msg.startswith(prefix) and msg.endswith(suffix): # Match on the cleaned message to prevent a prefix of "<" catching on a mention
if msg_clean.startswith(prefix) and msg_clean.endswith(suffix):
# Extract the actual message contents sans tags # Extract the actual message contents sans tags
if suffix: if suffix:
inner_message = message.content[len( inner_message = msg[len(prefix):-len(suffix)].strip()
prefix):-len(suffix)].strip()
else: else:
# Slicing to -0 breaks, don't do that # Slicing to -0 breaks, don't do that
inner_message = message.content[len(prefix):].strip() inner_message = msg[len(prefix):].strip()
await proxy_message(conn, member, message, inner_message) await proxy_message(conn, member, message, inner_message)
break break