From 46e04fd94a0be87c7b656b72938ae9a7b5bc4121 Mon Sep 17 00:00:00 2001
From: Dream Hunter <dreamhunter2333@gmail.com>
Date: Fri, 10 May 2024 22:57:31 +0800
Subject: [PATCH] fix: name max 30 && /external/api/send_mail not return result
 (#222)

---
 frontend/src/components/Turnstile.vue | 11 +++++++----
 worker/src/common.js                  | 14 +++++++-------
 worker/src/mails_api/send_mail_api.js |  3 ++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Turnstile.vue b/frontend/src/components/Turnstile.vue
index 02eda9a6..56d8df81 100644
--- a/frontend/src/components/Turnstile.vue
+++ b/frontend/src/components/Turnstile.vue
@@ -68,12 +68,15 @@ onMounted(() => {
     <div v-if="openSettings.cfTurnstileSiteKey" class="center">
         <n-spin description="loading..." :show="turnstileLoading">
             <n-form-item-row>
-                <div id="cf-turnstile"></div>
-                <n-button text @click="checkCfTurnstile(true)">
-                    {{ t('refresh') }}
-                </n-button>
+                <n-flex vertical>
+                    <div id="cf-turnstile"></div>
+                    <n-button text @click="checkCfTurnstile(true)">
+                        {{ t('refresh') }}
+                    </n-button>
+                </n-flex>
             </n-form-item-row>
         </n-spin>
+
     </div>
 </template>
 
diff --git a/worker/src/common.js b/worker/src/common.js
index 2c785a90..c992eb60 100644
--- a/worker/src/common.js
+++ b/worker/src/common.js
@@ -9,8 +9,12 @@ export const newAddress = async (c, name, domain, enablePrefix) => {
     if (name.length < 0) {
         return c.text("Name too short", 400)
     }
-    if (name.length > 100) {
-        return c.text("Name too long (max 100)", 400)
+    // create address
+    if (enablePrefix) {
+        name = getStringValue(c.env.PREFIX) + name;
+    }
+    if (name.length >= 30) {
+        return c.text("Name too long (max 30)", 400)
     }
     // check domain, generate random domain
     const domains = getDomains(c);
@@ -18,11 +22,7 @@ export const newAddress = async (c, name, domain, enablePrefix) => {
         domain = domains[Math.floor(Math.random() * domains.length)];
     }
     // create address
-    if (enablePrefix) {
-        name = getStringValue(c.env.PREFIX) + name + "@" + domain;
-    } else {
-        name = name + "@" + domain;
-    }
+    name = name + "@" + domain;
     try {
         const { success } = await c.env.DB.prepare(
             `INSERT INTO address(name) VALUES(?)`
diff --git a/worker/src/mails_api/send_mail_api.js b/worker/src/mails_api/send_mail_api.js
index 6ed3ea51..591d5cf1 100644
--- a/worker/src/mails_api/send_mail_api.js
+++ b/worker/src/mails_api/send_mail_api.js
@@ -161,7 +161,8 @@ api.post('/external/api/send_mail', async (c) => {
             return c.text("No address", 400)
         }
         const reqJson = await c.req.json();
-        return await sendMail(c, address, reqJson);
+        await sendMail(c, address, reqJson);
+        return c.json({ status: "ok" })
     } catch (e) {
         console.error("Failed to send mail", e);
         return c.text(`Failed to send mail ${e.message}`, 400)