fix: sp tip email without prefixes (#1559)

consolelabs · Dec 21, 2023 · 8733b11 · 8733b11
1 parent c0f55d5
commit 8733b11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/commands/tip/index.ts b/src/commands/tip/index.ts
@@ -104,11 +104,8 @@ const textCmd: Command = {
       return
     }
 
-    const mailPrefixes = ["email:", "gmail:", "mail:"]
-    const mailPrefix = mailPrefixes.find((p) => target.startsWith(p))
-    // tip mail
-    if (mailPrefix) {
-      args[1] = target.replace(mailPrefix, "") // remove email prefix
+    const expression: RegExp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i
+    if (expression.test(target)) {
       await tipMail(msg, args)
       return
     }
@@ -197,11 +194,9 @@ const slashCmd: SlashCommand = {
       return
     }
 
-    const mailPrefixes = ["email:", "gmail:", "mail:"]
-    const mailPrefix = mailPrefixes.find((p) => target.startsWith(p))
     // tip mail
-    if (mailPrefix) {
-      args[1] = target.replace(mailPrefix, "") // remove email prefix
+    const expression: RegExp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i
+    if (expression.test(target)) {
       await tipMailSlash(i, args)
       return
     }

diff --git a/src/commands/tip/mail/processor.ts b/src/commands/tip/mail/processor.ts
@@ -72,8 +72,6 @@ export async function execute(
   msgOrInteraction: Message | CommandInteraction,
   payload: any,
 ) {
-  console.log("check payload", payload)
-
   // send transfer request
   const {
     data,