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

Add an error when using emojis in member names or system tags. Closes #13

Browse Source
This commit is contained in:
Ske 2018-09-07 17:57:12 +02:00
parent 5930f490ce
commit a2cbf20add
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pluralkit/bot/commands/member_commands.py
View File

@ -55,10 +55,13 @@ async def member_set(ctx: CommandContext):
help=help.edit_member) help=help.edit_member)
if ctx.has_next(): if ctx.has_next():
value = " ".join(ctx.remaining()) value = ctx.remaining()
# Sanity/validity checks and type conversions # Sanity/validity checks and type conversions
if prop == "name": if prop == "name":
if re.search("<a?:\w+:\d+>", value):
return CommandError("Due to a Discord limitation, custom emojis aren't supported. Please use a standard emoji instead.")
bounds_error = utils.bounds_check_member_name(value, system.tag) bounds_error = utils.bounds_check_member_name(value, system.tag)
if bounds_error: if bounds_error:
return CommandError(bounds_error) return CommandError(bounds_error)

3
src/pluralkit/bot/commands/system_commands.py
View File

@ -67,6 +67,9 @@ async def system_set(ctx: CommandContext):
if len(value) > 32: if len(value) > 32:
return CommandError("You can't have a system tag longer than 32 characters.") return CommandError("You can't have a system tag longer than 32 characters.")
if re.search("<a?:\w+:\d+>", value):
return CommandError("Due to a Discord limitation, custom emojis aren't supported. Please use a standard emoji instead.")
# Make sure there are no members which would make the combined length exceed 32 # Make sure there are no members which would make the combined length exceed 32
members_exceeding = await db.get_members_exceeding(ctx.conn, system_id=system.id, members_exceeding = await db.get_members_exceeding(ctx.conn, system_id=system.id,
length=32 - len(value) - 1) length=32 - len(value) - 1)