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

Fix Discord throwing errors on members named "Clyde"

Browse Source 
This adds a hair-space (\u200A) between the C and the l,
which won't trigger their check for the name. Discord
throws this error because their built-in "status bot"
used in the client is named Clyde.
This commit is contained in:
Ske 2018-12-15 19:56:59 +01:00
parent 103412222f
commit 3382ca2862
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pluralkit/bot/proxy.py
View File

@ -1,3 +1,5 @@
import re
import discord import discord
from io import BytesIO from io import BytesIO
from typing import Optional from typing import Optional
@ -66,6 +68,13 @@ async def make_attachment_file(message: discord.Message):
return discord.File(bio, first_attachment.filename) return discord.File(bio, first_attachment.filename)
def fix_clyde(name: str) -> str:
# Discord doesn't allow any webhook username to contain the word "Clyde"
# So replace "Clyde" with "C lyde" (except with a hair space, hence \u200A)
# Zero-width spacers are ignored by Discord and will still trigger the error
return re.sub("(c)(lyde)", "\\1\u200A\\2", name, flags=re.IGNORECASE)
async def send_proxy_message(conn, original_message: discord.Message, system: System, member: Member, async def send_proxy_message(conn, original_message: discord.Message, system: System, member: Member,
inner_text: str, logger: ChannelLogger, bot_user: discord.User): inner_text: str, logger: ChannelLogger, bot_user: discord.User):
# Send the message through the webhook # Send the message through the webhook
@ -73,6 +82,7 @@ async def send_proxy_message(conn, original_message: discord.Message, system: Sy
# Bounds check the combined name to avoid silent erroring # Bounds check the combined name to avoid silent erroring
full_username = "{} {}".format(member.name, system.tag or "").strip() full_username = "{} {}".format(member.name, system.tag or "").strip()
full_username = fix_clyde(full_username)
if len(full_username) < 2: if len(full_username) < 2:
raise ProxyError( raise ProxyError(
"The webhook's name, `{}`, is shorter than two characters, and thus cannot be proxied. Please change the member name or use a longer system tag.".format( "The webhook's name, `{}`, is shorter than two characters, and thus cannot be proxied. Please change the member name or use a longer system tag.".format(
@ -153,7 +163,8 @@ async def try_proxy_message(conn, message: discord.Message, logger: ChannelLogge
member, inner_message = proxy_match member, inner_message = proxy_match
# Make sure no @everyones slip through, etc # Make sure no @everyones slip through
# Webhooks implicitly have permission to mention @everyone so we have to enforce that manually
inner_message = utils.sanitize(inner_message) inner_message = utils.sanitize(inner_message)
# If we don't have an inner text OR an attachment, we cancel because the hook can't send that # If we don't have an inner text OR an attachment, we cancel because the hook can't send that