From 51985ad4e028c4136d1bc1dd16bbd03824021a32 Mon Sep 17 00:00:00 2001
From: dreamhunter2333 <dreamhunter2333@gmail.com>
Date: Sat, 4 May 2024 18:57:59 +0800
Subject: [PATCH] feat: update sendbox UI

---
 frontend/src/views/admin/SendBox.vue | 8 ++++----
 frontend/src/views/send/SendBox.vue  | 4 ++--
 frontend/src/views/send/SendMail.vue | 2 +-
 worker/src/send_mail_api.js          | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/admin/SendBox.vue b/frontend/src/views/admin/SendBox.vue
index 44829796..4145e33d 100644
--- a/frontend/src/views/admin/SendBox.vue
+++ b/frontend/src/views/admin/SendBox.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n'
 import { useGlobalState } from '../../store'
 import { api } from '../../api'
 
-const { localeCache, settings, adminAuth, adminSendBoxTabAddress } = useGlobalState()
+const { localeCache, adminAuth, adminSendBoxTabAddress } = useGlobalState()
 const message = useMessage()
 
 const { t } = useI18n({
@@ -129,9 +129,9 @@ onMounted(async () => {
 </script>
 
 <template>
-    <div v-if="settings.address">
-        <n-modal v-model:show="showModal" preset="dialog">
-            <pre>{{ curRow.raw }}</pre>
+    <div>
+        <n-modal v-model:show="showModal" preset="dialog" style="width: 100%;">
+            <pre style="overflow: auto;">{{ curRow.raw }}</pre>
         </n-modal>
         <n-input-group>
             <n-input v-model:value="adminSendBoxTabAddress" />
diff --git a/frontend/src/views/send/SendBox.vue b/frontend/src/views/send/SendBox.vue
index 16011b46..9ad59430 100644
--- a/frontend/src/views/send/SendBox.vue
+++ b/frontend/src/views/send/SendBox.vue
@@ -128,8 +128,8 @@ onMounted(async () => {
 
 <template>
     <div v-if="settings.address">
-        <n-modal v-model:show="showModal" preset="dialog">
-            <pre>{{ curRow.raw }}</pre>
+        <n-modal v-model:show="showModal" preset="dialog" style="width: 100%;">
+            <pre style="overflow: auto;">{{ curRow.raw }}</pre>
         </n-modal>
         <div style="display: inline-block;">
             <n-pagination v-model:page="page" v-model:page-size="pageSize" :item-count="count"
diff --git a/frontend/src/views/send/SendMail.vue b/frontend/src/views/send/SendMail.vue
index fe430c60..20ce5221 100644
--- a/frontend/src/views/send/SendMail.vue
+++ b/frontend/src/views/send/SendMail.vue
@@ -91,7 +91,7 @@ const send = async () => {
         message.error(error.message || "error");
     } finally {
         message.success(t("successSend"));
-        router.push('/sendbox');
+        router.push('/user');
     }
 }
 
diff --git a/worker/src/send_mail_api.js b/worker/src/send_mail_api.js
index 2de74269..96b119a6 100644
--- a/worker/src/send_mail_api.js
+++ b/worker/src/send_mail_api.js
@@ -120,6 +120,8 @@ api.post('/api/send_mail', async (c) => {
         if (body?.personalizations?.[0]?.dkim_private_key) {
             delete body.personalizations[0].dkim_private_key;
         }
+        const reqIp = c.req.raw.headers.get("cf-connecting-ip")
+        body.reqIp = reqIp;
         const { success: success2 } = await c.env.DB.prepare(
             `INSERT INTO sendbox (address, raw) VALUES (?, ?)`
         ).bind(address, JSON.stringify(body)).run();