Allow extra phone characters in register and mark-trusted commands

mautrix_signal/commands/auth.py

@@ -25,6 +25,7 @@ from mautrix.bridge.commands import HelpSection, command_handler
 
 from .. import puppet as pu
 from .typehint import CommandEvent
+from .signal import remove_extra_chars
 
 try:
     import qrcode
@@ -77,7 +78,7 @@ async def register(evt: CommandEvent) -> None:
     if evt.args[0].lower() == "--voice":
         voice = True
         evt.args = evt.args[1:]
-    phone = evt.args[0]
+    phone = evt.args[0].translate(remove_extra_chars)
     if not phone.startswith("+") or not phone[1:].isdecimal():
         await evt.reply(f"Please enter the phone number in international format (E.164)")
         return

mautrix_signal/commands/signal.py

@@ -126,7 +126,7 @@ async def set_profile_name(evt: CommandEvent) -> None:
                  help_text="Mark another user's safety number as trusted",
                  help_args="<_recipient phone_> <_safety number_>")
 async def mark_trusted(evt: CommandEvent) -> None:
-    number = evt.args[0]
+    number = evt.args[0].translate(remove_extra_chars)
     safety_num = "".join(evt.args[1:]).replace("\n", "")
     if len(safety_num) != 60 or not safety_num.isdecimal():
         await evt.reply("That doesn't look like a valid safety number")