From b7308587c6874a4033b3c6f2c9dfa5fae5b5d584 Mon Sep 17 00:00:00 2001
From: Dream Hunter <dreamhunter2333@gmail.com>
Date: Thu, 9 May 2024 18:43:09 +0800
Subject: [PATCH] feat: admin search mailbox && fix generateName multi dot &&
 user jwt exp in 30 days && UI globalTabplacement && useSideMargin (#214)

* fix: generateName multi dot && user jwt exp in 30 days

* feat: support admin search mailbox

* fix: DELETE mail bug(should be raw_mails)

* feat: UI add globalTabplacement

* feat: UI add useSideMargin option
---
 CHANGELOG.md                                 |   5 +
 frontend/src/App.vue                         |   9 +-
 frontend/src/api/index.js                    |   2 +-
 frontend/src/store/index.js                  |   4 +
 frontend/src/views/Admin.vue                 |  16 ++-
 frontend/src/views/Index.vue                 |   4 +-
 frontend/src/views/User.vue                  |   4 +-
 frontend/src/views/admin/Mails.vue           |  18 ++-
 frontend/src/views/admin/Maintenance.vue     |   9 ++
 frontend/src/views/common/Appearance.vue     |  82 +++++++++++
 frontend/src/views/index/AccountSettings.vue |  26 +---
 frontend/src/views/index/Login.vue           |   5 +-
 worker/src/admin_api/index.js                | 144 ++++++-------------
 worker/src/common.js                         |  29 ++++
 worker/src/mails_api/send_mail_api.js        |   2 +-
 worker/src/router.js                         |   2 +-
 worker/src/user_api/user.js                  |   5 +-
 worker/src/worker.js                         |  12 +-
 18 files changed, 231 insertions(+), 147 deletions(-)
 create mode 100644 frontend/src/views/common/Appearance.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a00267ae..f13aa760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@
 ### function changs
 
 - 增加用户注册功能，可绑定邮箱地址，绑定后可自动获取邮箱JWT凭证
+- 增加默认以文本显示邮件，文本和HTML邮箱显示方式切换按钮
+- 修复 `BUG` 随机生成的邮箱名字不合法 #211
+- `admin` 邮件页面支持邮件内容搜索 #210
+- 修复删除地址时邮件未删除的BUG #213
+- UI 增加全局标签页位置配置, 侧边距配置
 
 ## v0.3.3
 
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 82c67190..4268290f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -8,10 +8,11 @@ import Header from './views/Header.vue';
 import Footer from './views/Footer.vue';
 
 
-const { localeCache, isDark, loading } = useGlobalState()
+const { localeCache, isDark, loading, useSideMargin } = useGlobalState()
 const theme = computed(() => isDark.value ? darkTheme : null)
 const localeConfig = computed(() => localeCache.value == 'zh' ? zhCN : null)
 const isMobile = useIsMobile()
+const showSideMargin = computed(() => !isMobile.value && !useSideMargin.value);
 
 const { locale } = useI18n({
   useScope: 'global',
@@ -39,8 +40,8 @@ onMounted(async () => {
     <n-spin description="loading..." :show="loading">
       <n-message-provider>
         <n-grid x-gap="12" :cols="12">
-          <n-gi v-if="!isMobile" span="1"></n-gi>
-          <n-gi :span="isMobile ? 12 : 10">
+          <n-gi v-if="!showSideMargin" span="1"></n-gi>
+          <n-gi :span="showSideMargin ? 12 : 10">
             <div class="main">
               <n-space vertical>
                 <n-layout style="min-height: 80vh;">
@@ -51,7 +52,7 @@ onMounted(async () => {
               </n-space>
             </div>
           </n-gi>
-          <n-gi v-if="!isMobile" span="1"></n-gi>
+          <n-gi v-if="!showSideMargin" span="1"></n-gi>
         </n-grid>
         <n-back-top />
       </n-message-provider>
diff --git a/frontend/src/api/index.js b/frontend/src/api/index.js
index cafb1de3..f2e6933d 100644
--- a/frontend/src/api/index.js
+++ b/frontend/src/api/index.js
@@ -10,7 +10,7 @@ const {
 
 const instance = axios.create({
     baseURL: API_BASE,
-    timeout: 10000
+    timeout: 30000
 });
 
 const apiFetch = async (path, options = {}) => {
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index c369687b..2902a5b1 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -54,6 +54,8 @@ export const useGlobalState = createGlobalState(
         const userJwt = useStorage('userJwt', '');
         const userTab = useStorage('userTab', 'user_settings');
         const indexTab = useStorage('indexTab', 'mailbox');
+        const globalTabplacement = useStorage('globalTabplacement', 'top');
+        const useSideMargin = useStorage('useSideMargin', true);
         const userOpenSettings = ref({
             enable: false,
             enableMailVerify: false,
@@ -91,6 +93,8 @@ export const useGlobalState = createGlobalState(
             indexTab,
             userOpenSettings,
             userSettings,
+            globalTabplacement,
+            useSideMargin,
         }
     },
 )
diff --git a/frontend/src/views/Admin.vue b/frontend/src/views/Admin.vue
index 68deadf3..ed038889 100644
--- a/frontend/src/views/Admin.vue
+++ b/frontend/src/views/Admin.vue
@@ -15,9 +15,10 @@ import UserSettings from './admin/UserSettings.vue';
 import Mails from './admin/Mails.vue';
 import MailsUnknow from './admin/MailsUnknow.vue';
 import Maintenance from './admin/Maintenance.vue';
+import Appearance from './common/Appearance.vue';
 
 const {
-  localeCache, adminAuth, showAdminAuth, adminTab, loading
+  localeCache, adminAuth, showAdminAuth, adminTab, loading, globalTabplacement
 } = useGlobalState()
 const message = useMessage()
 
@@ -44,7 +45,9 @@ const { t } = useI18n({
       unknow: 'Mails with unknow receiver',
       senderAccess: 'Sender Access Control',
       sendBox: 'Send Box',
+      statistics: 'Statistics',
       maintenance: 'Maintenance',
+      appearance: 'Appearance',
       ok: 'OK',
     },
     zh: {
@@ -59,7 +62,9 @@ const { t } = useI18n({
       unknow: '无收件人邮件',
       senderAccess: '发件权限控制',
       sendBox: '发件箱',
+      statistics: '统计',
       maintenance: '维护',
+      appearance: '外观',
       ok: '确定',
     }
   }
@@ -85,8 +90,7 @@ onMounted(async () => {
         </n-button>
       </template>
     </n-modal>
-    <Statistics />
-    <n-tabs type="card" v-model:value="adminTab">
+    <n-tabs type="card" v-model:value="adminTab" :placement="globalTabplacement">
       <n-tab-pane name="account" :tab="t('account')">
         <Account />
       </n-tab-pane>
@@ -114,9 +118,15 @@ onMounted(async () => {
       <n-tab-pane name="sendBox" :tab="t('sendBox')">
         <SendBox />
       </n-tab-pane>
+      <n-tab-pane name="statistics" :tab="t('statistics')">
+        <Statistics />
+      </n-tab-pane>
       <n-tab-pane name="maintenance" :tab="t('maintenance')">
         <Maintenance />
       </n-tab-pane>
+      <n-tab-pane name="appearance" :tab="t('appearance')">
+        <Appearance />
+      </n-tab-pane>
     </n-tabs>
   </div>
 </template>
diff --git a/frontend/src/views/Index.vue b/frontend/src/views/Index.vue
index afc9b110..28560b47 100644
--- a/frontend/src/views/Index.vue
+++ b/frontend/src/views/Index.vue
@@ -11,7 +11,7 @@ import SendBox from './index/SendBox.vue';
 import SendMail from './index/SendMail.vue';
 import AccountSettings from './index/AccountSettings.vue';
 
-const { localeCache, settings, openSettings, indexTab } = useGlobalState()
+const { localeCache, settings, openSettings, indexTab, globalTabplacement } = useGlobalState()
 
 const { t } = useI18n({
   locale: localeCache.value || 'zh',
@@ -45,7 +45,7 @@ const deleteMail = async (curMailId) => {
 <template>
   <div>
     <AddressBar />
-    <n-tabs v-if="settings.address" type="card" v-model:value="indexTab">
+    <n-tabs v-if="settings.address" type="card" v-model:value="indexTab" :placement="globalTabplacement">
       <n-tab-pane name="mailbox" :tab="t('mailbox')">
         <MailBox :showEMailTo="false" :showReply="true" :enableUserDeleteEmail="openSettings.enableUserDeleteEmail"
           :fetchMailData="fetchMailData" :deleteMail="deleteMail" />
diff --git a/frontend/src/views/User.vue b/frontend/src/views/User.vue
index 53b9a899..ea7c40b6 100644
--- a/frontend/src/views/User.vue
+++ b/frontend/src/views/User.vue
@@ -9,7 +9,7 @@ import UserBar from './user/UserBar.vue';
 import BindAddress from './user/BindAddress.vue';
 
 const {
-    localeCache, userTab, userOpenSettings, userSettings
+    localeCache, userTab, globalTabplacement, userSettings
 } = useGlobalState()
 
 const { t } = useI18n({
@@ -33,7 +33,7 @@ const { t } = useI18n({
 <template>
     <div>
         <UserBar />
-        <n-tabs v-if="userSettings.user_email" type="card" v-model:value="userTab">
+        <n-tabs v-if="userSettings.user_email" type="card" v-model:value="userTab" :placement="globalTabplacement">
             <n-tab-pane name="address_management" :tab="t('address_management')">
                 <AddressMangement />
             </n-tab-pane>
diff --git a/frontend/src/views/admin/Mails.vue b/frontend/src/views/admin/Mails.vue
index 72ba4d3d..48730e77 100644
--- a/frontend/src/views/admin/Mails.vue
+++ b/frontend/src/views/admin/Mails.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n'
 
 import { useGlobalState } from '../../store'
@@ -16,19 +16,27 @@ const { t } = useI18n({
     messages: {
         en: {
             addressQueryTip: 'Leave blank to query all addresses',
+            keywordQueryTip: 'Leave blank to not query by keyword',
             query: 'Query',
         },
         zh: {
             addressQueryTip: '留空查询所有地址',
+            keywordQueryTip: '留空不按关键字查询',
             query: '查询',
         }
     }
 });
 
 const mailBoxKey = ref("")
+const mailKeyword = ref("")
 
-const queryAddress = () => {
-    mailBoxKey.value = adminMailTabAddress.value;
+watch([adminMailTabAddress, mailKeyword], () => {
+    adminMailTabAddress.value = adminMailTabAddress.value.trim();
+    mailKeyword.value = mailKeyword.value.trim();
+});
+
+const queryMail = () => {
+    mailBoxKey.value = Date.now();
 }
 
 const fetchMailData = async (limit, offset) => {
@@ -37,6 +45,7 @@ const fetchMailData = async (limit, offset) => {
         + `?limit=${limit}`
         + `&offset=${offset}`
         + (adminMailTabAddress.value ? `&address=${adminMailTabAddress.value}` : '')
+        + (mailKeyword.value ? `&keyword=${mailKeyword.value}` : '')
     );
 }
 
@@ -52,7 +61,8 @@ onMounted(async () => {
     <div>
         <n-input-group>
             <n-input v-model:value="adminMailTabAddress" :placeholder="t('addressQueryTip')" />
-            <n-button @click="queryAddress" type="primary" tertiary>
+            <n-input v-model:value="mailKeyword" :placeholder="t('keywordQueryTip')" />
+            <n-button @click="queryMail" type="primary" tertiary>
                 {{ t('query') }}
             </n-button>
         </n-input-group>
diff --git a/frontend/src/views/admin/Maintenance.vue b/frontend/src/views/admin/Maintenance.vue
index 5bcfb9cd..3629ab35 100644
--- a/frontend/src/views/admin/Maintenance.vue
+++ b/frontend/src/views/admin/Maintenance.vue
@@ -32,6 +32,7 @@ const { t } = useI18n({
             autoCleanup: "Auto cleanup",
             cleanupSuccess: "Cleanup success",
             save: "Save",
+            cronTip: "Enable cron cleanup, need to configure [crons] in worker, please refer to the document",
         },
         zh: {
             tip: '请输入清理天数',
@@ -43,6 +44,7 @@ const { t } = useI18n({
             cleanupSuccess: "清理成功",
             cleanupNow: "立即清理",
             save: "保存",
+            cronTip: "启用定时清理, 需在 worker 配置 [crons] 参数, 请参考文档",
         }
     }
 });
@@ -93,6 +95,9 @@ onMounted(async () => {
 <template>
     <div class="center">
         <n-card>
+            <n-alert :show-icon="false">
+                <span>{{ t('cronTip') }}</span>
+            </n-alert>
             <n-form :model="cleanupModel">
                 <n-form-item-row :label="t('mailBoxLabel')">
                     <n-checkbox v-model:checked="cleanupModel.enableMailsAutoCleanup">
@@ -162,6 +167,10 @@ onMounted(async () => {
     justify-content: center;
 }
 
+.n-alert {
+    margin-bottom: 20px;
+}
+
 .item {
     display: flex;
     margin: 10px;
diff --git a/frontend/src/views/common/Appearance.vue b/frontend/src/views/common/Appearance.vue
new file mode 100644
index 00000000..ea5f7ef4
--- /dev/null
+++ b/frontend/src/views/common/Appearance.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { useI18n } from 'vue-i18n'
+
+import { useGlobalState } from '../../store'
+
+const {
+    localeCache, mailboxSplitSize, useIframeShowMail, preferShowTextMail,
+    globalTabplacement, useSideMargin
+} = useGlobalState()
+
+const { t } = useI18n({
+    locale: localeCache.value || 'zh',
+    messages: {
+        en: {
+            mailboxSplitSize: 'Mailbox Split Size',
+            useIframeShowMail: 'Use iframe Show HTML Mail',
+            preferShowTextMail: 'Display text Mail by default',
+            useSideMargin: 'Turn on the side margins on the left and right sides of the page',
+            globalTabplacement: 'Global Tab Placement',
+            left: 'left',
+            top: 'top',
+            right: 'right',
+            bottom: 'bottom',
+        },
+        zh: {
+            mailboxSplitSize: '邮箱界面分栏大小',
+            preferShowTextMail: '默认以文本显示邮件',
+            useIframeShowMail: '使用iframe显示HTML邮件',
+            globalTabplacement: '全局选项卡位置',
+            useSideMargin: '开启页面左右两侧侧边距',
+            left: '左侧',
+            top: '顶部',
+            right: '右侧',
+            bottom: '底部',
+        }
+    }
+});
+</script>
+
+<template>
+    <div class="center">
+        <n-card>
+            <n-form-item-row :label="t('mailboxSplitSize')">
+                <n-slider v-model:value="mailboxSplitSize" :min="0.25" :max="0.75" :step="0.01" :marks="{
+                    0.25: '0.25',
+                    0.5: '0.5',
+                    0.75: '0.75'
+                }" />
+            </n-form-item-row>
+            <n-form-item-row :label="t('preferShowTextMail')">
+                <n-switch v-model:value="preferShowTextMail" :round="false" />
+            </n-form-item-row>
+            <n-form-item-row :label="t('useIframeShowMail')">
+                <n-switch v-model:value="useIframeShowMail" :round="false" />
+            </n-form-item-row>
+            <n-form-item-row :label="t('useSideMargin')">
+                <n-switch v-model:value="useSideMargin" :round="false" />
+            </n-form-item-row>
+            <n-form-item-row :label="t('globalTabplacement')">
+                <n-radio-group v-model:value="globalTabplacement">
+                    <n-radio-button value="top" :label="t('top')" />
+                    <n-radio-button value="left" :label="t('left')" />
+                    <n-radio-button value="right" :label="t('right')" />
+                    <n-radio-button value="bottom" :label="t('bottom')" />
+                </n-radio-group>
+            </n-form-item-row>
+        </n-card>
+    </div>
+</template>
+
+<style scoped>
+.center {
+    display: flex;
+    justify-content: center;
+}
+
+
+.n-card {
+    max-width: 800px;
+    text-align: left;
+}
+</style>
diff --git a/frontend/src/views/index/AccountSettings.vue b/frontend/src/views/index/AccountSettings.vue
index 658e9a7b..1a9955a0 100644
--- a/frontend/src/views/index/AccountSettings.vue
+++ b/frontend/src/views/index/AccountSettings.vue
@@ -5,10 +5,10 @@ import { useRouter } from 'vue-router'
 
 import { useGlobalState } from '../../store'
 import { api } from '../../api'
+import Appearance from '../common/Appearance.vue'
 
 const {
-    jwt, localeCache, settings, showAddressCredential, loading,
-    mailboxSplitSize, useIframeShowMail, preferShowTextMail
+    jwt, localeCache, settings, showAddressCredential, loading
 } = useGlobalState()
 const router = useRouter()
 const message = useMessage()
@@ -19,9 +19,6 @@ const { t } = useI18n({
     locale: localeCache.value || 'zh',
     messages: {
         en: {
-            mailboxSplitSize: 'Mailbox Split Size',
-            useIframeShowMail: 'Use iframe Show HTML Mail',
-            preferShowTextMail: 'Display text Mail by default',
             logout: "Logout",
             delteAccount: "Delete Account",
             showAddressCredential: 'Show Address Credential',
@@ -30,9 +27,6 @@ const { t } = useI18n({
             delteAccountConfirm: "Are you sure to delete your account and all emails for this account?",
         },
         zh: {
-            mailboxSplitSize: '邮箱界面分栏大小',
-            preferShowTextMail: '默认以文本显示邮件',
-            useIframeShowMail: '使用iframe显示HTML邮件',
             logout: '退出登录',
             delteAccount: "删除账户",
             showAddressCredential: '查看邮箱地址凭证',
@@ -66,21 +60,7 @@ const deleteAccount = async () => {
 <template>
     <div class="center" v-if="settings.address">
         <n-card>
-            <n-card>
-                <n-form-item-row :label="t('mailboxSplitSize')">
-                    <n-slider v-model:value="mailboxSplitSize" :min="0.25" :max="0.75" :step="0.01" :marks="{
-                        0.25: '0.25',
-                        0.5: '0.5',
-                        0.75: '0.75'
-                    }" />
-                </n-form-item-row>
-                <n-form-item-row :label="t('preferShowTextMail')">
-                    <n-switch v-model:value="preferShowTextMail" :round="false" />
-                </n-form-item-row>
-                <n-form-item-row :label="t('useIframeShowMail')">
-                    <n-switch v-model:value="useIframeShowMail" :round="false" />
-                </n-form-item-row>
-            </n-card>
+            <Appearance />
             <n-button @click="showAddressCredential = true" type="primary" secondary block strong>
                 {{ t('showAddressCredential') }}
             </n-button>
diff --git a/frontend/src/views/index/Login.vue b/frontend/src/views/index/Login.vue
index e908cdbe..c1a97f2b 100644
--- a/frontend/src/views/index/Login.vue
+++ b/frontend/src/views/index/Login.vue
@@ -83,9 +83,10 @@ const generateName = async () => {
     try {
         generateNameLoading.value = true;
         const { faker } = await import('https://esm.sh/@faker-js/faker');
-        emailName.value = faker.person
-            .fullName()
+        emailName.value = faker.internet.email()
+            .split('@')[0]
             .replace(/\s+/g, '.')
+            .replace(/\.{2,}/g, '.')
             .replace(/[^a-zA-Z0-9.]/g, '')
             .toLowerCase();
     } catch (error) {
diff --git a/worker/src/admin_api/index.js b/worker/src/admin_api/index.js
index 8ba981ee..643dcb26 100644
--- a/worker/src/admin_api/index.js
+++ b/worker/src/admin_api/index.js
@@ -1,7 +1,7 @@
 import { Hono } from 'hono'
 import { Jwt } from 'hono/utils/jwt'
 import { sendAdminInternalMail, getJsonSetting, saveSetting } from '../utils'
-import { newAddress } from '../common'
+import { newAddress, handleListQuery } from '../common'
 import { CONSTANTS } from '../constants'
 import cleanup_api from './cleanup_api'
 import admin_user_api from './admin_user_api'
@@ -74,7 +74,7 @@ api.delete('/admin/delete_address/:id', async (c) => {
         return c.text("Failed to delete address", 500)
     }
     const { success: mailSuccess } = await c.env.DB.prepare(
-        `DELETE FROM mails WHERE address IN`
+        `DELETE FROM raw_mails WHERE address IN`
         + ` (select name from address where id = ?) `
     ).bind(id).run();
     if (!mailSuccess) {
@@ -107,111 +107,58 @@ api.get('/admin/show_password/:id', async (c) => {
 })
 
 api.get('/admin/mails', async (c) => {
-    const { address, limit, offset } = c.req.query();
-    if (!limit || limit < 0 || limit > 100) {
-        return c.text("Invalid limit", 400)
+    const { address, limit, offset, keyword } = c.req.query();
+    if (address && keyword) {
+        return await handleListQuery(c,
+            `SELECT * FROM raw_mails where address = ? and raw like ? `,
+            `SELECT count(*) as count FROM raw_mails where address = ? and raw like ? `,
+            [address, `%${keyword}%`], limit, offset
+        );
+    } else if (keyword) {
+        return await handleListQuery(c,
+            `SELECT * FROM raw_mails where raw like ? `,
+            `SELECT count(*) as count FROM raw_mails where raw like ? `,
+            [`%${keyword}%`], limit, offset
+        );
+    } else if (address) {
+        return await handleListQuery(c,
+            `SELECT * FROM raw_mails where address = ? `,
+            `SELECT count(*) as count FROM raw_mails where address = ? `,
+            [address], limit, offset
+        );
+    } else {
+        return await handleListQuery(c,
+            `SELECT * FROM raw_mails `,
+            `SELECT count(*) as count FROM raw_mails `,
+            [], limit, offset
+        );
     }
-    if (!offset || offset < 0) {
-        return c.text("Invalid offset", 400)
-    }
-    if (!address) {
-        const { results } = await c.env.DB.prepare(
-            `SELECT * FROM raw_mails order by id desc limit ? offset ?`
-        ).bind(limit, offset).all();
-        let count = 0;
-        if (offset == 0) {
-            const { count: mailCount } = await c.env.DB.prepare(
-                `SELECT count(*) as count FROM raw_mails`
-            ).first();
-            count = mailCount;
-        }
-        return c.json({
-            results: results,
-            count: count
-        })
-    }
-    const { results } = await c.env.DB.prepare(
-        `SELECT * FROM raw_mails where address = ? order by id desc limit ? offset ?`
-    ).bind(address, limit, offset).all();
-    let count = 0;
-    if (offset == 0) {
-        const { count: mailCount } = await c.env.DB.prepare(
-            `SELECT count(*) as count FROM raw_mails where address = ? `
-        ).bind(address).first();
-        count = mailCount;
-    }
-    return c.json({
-        results: results,
-        count: count
-    })
 });
 
 api.get('/admin/mails_unknow', async (c) => {
     const { limit, offset } = c.req.query();
-    if (!limit || limit < 0 || limit > 100) {
-        return c.text("Invalid limit", 400)
-    }
-    if (!offset || offset < 0) {
-        return c.text("Invalid offset", 400)
-    }
-    const { results } = await c.env.DB.prepare(`
-        SELECT * FROM raw_mails
-        where address NOT IN (select name from address)
-        order by id desc limit ? offset ? `
-    ).bind(limit, offset).all();
-    let count = 0;
-    if (offset == 0) {
-        const { count: mailCount } = await c.env.DB.prepare(`
-            SELECT count(*) as count FROM raw_mails
-            where address NOT IN
-            (select name from address)`
-        ).first();
-        count = mailCount;
-    }
-    return c.json({
-        results: results,
-        count: count
-    })
+    return await handleListQuery(c,
+        `SELECT * FROM raw_mails where address NOT IN (select name from address) `,
+        `SELECT count(*) as count FROM raw_mails`
+        + ` where address NOT IN (select name from address) `,
+        [], limit, offset
+    );
 });
 
 api.get('/admin/address_sender', async (c) => {
     const { address, limit, offset } = c.req.query();
-    if (!limit || limit < 0 || limit > 100) {
-        return c.text("Invalid limit", 400)
-    }
-    if (!offset || offset < 0) {
-        return c.text("Invalid offset", 400)
-    }
     if (address) {
-        const { results } = await c.env.DB.prepare(
-            `SELECT * FROM address_sender where address = ? order by id desc limit ? offset ?`
-        ).bind(address, limit, offset).all();
-        let count = 0;
-        if (offset == 0) {
-            const { count: addressCount } = await c.env.DB.prepare(
-                `SELECT count(*) as count FROM address_sender where address = ?`
-            ).bind(address).first();
-            count = addressCount;
-        }
-        return c.json({
-            results: results,
-            count: count
-        })
+        return await handleListQuery(c,
+            `SELECT * FROM address_sender where address = ? `,
+            `SELECT count(*) as count FROM address_sender where address = ? `,
+            [address], limit, offset
+        );
     }
-    const { results } = await c.env.DB.prepare(
-        `SELECT * FROM address_sender order by id desc limit ? offset ? `
-    ).bind(limit, offset).all();
-    let count = 0;
-    if (offset == 0) {
-        const { count: addressCount } = await c.env.DB.prepare(
-            `SELECT count(*) as count FROM address_sender`
-        ).first();
-        count = addressCount;
-    }
-    return c.json({
-        results: results,
-        count: count
-    })
+    return await handleListQuery(c,
+        `SELECT * FROM address_sender `,
+        `SELECT count(*) as count FROM address_sender `,
+        [], limit, offset
+    );
 })
 
 api.post('/admin/address_sender', async (c) => {
@@ -276,9 +223,6 @@ api.get('/admin/sendbox', async (c) => {
 })
 
 api.get('/admin/statistics', async (c) => {
-    const { count: mailCountV1 } = await c.env.DB.prepare(`
-            SELECT count(*) as count FROM mails`
-    ).first();
     const { count: mailCount } = await c.env.DB.prepare(`
             SELECT count(*) as count FROM raw_mails`
     ).first();
@@ -292,7 +236,7 @@ api.get('/admin/statistics', async (c) => {
             SELECT count(*) as count FROM sendbox`
     ).first();
     return c.json({
-        mailCount: (mailCountV1 || 0) + (mailCount || 0),
+        mailCount: mailCount,
         userCount: addressCount,
         activeUserCount7days: activeUserCount7days,
         sendMailCount: sendMailCount
diff --git a/worker/src/common.js b/worker/src/common.js
index 946d2ddb..7bdad7a3 100644
--- a/worker/src/common.js
+++ b/worker/src/common.js
@@ -74,6 +74,7 @@ export const cleanup = async (c, cleanType, cleanDays) => {
         case "address":
             await c.env.DB.prepare(`
                 DELETE FROM address WHERE updated_at < datetime('now', '-${cleanDays} day')`
+                + ` AND id NOT IN (SELECT address_id FROM users_address)`
             ).run();
             break;
         case "sendbox":
@@ -86,3 +87,31 @@ export const cleanup = async (c, cleanType, cleanDays) => {
     }
     return true;
 }
+
+/**
+ *
+ * @param {*} c context
+ * @param {*} query @type {string} query
+ * @param {*} countQuery @type {string} countQuery
+ * @param {*} limit @type {number} limit
+ * @param {*} offset @type {number} offset
+ * @returns {Promise} Promise
+ */
+export const handleListQuery = async (
+    c, query, countQuery, params, limit, offset
+) => {
+    if (!limit || limit < 0 || limit > 100) {
+        return c.text("Invalid limit", 400)
+    }
+    if (!offset || offset < 0) {
+        return c.text("Invalid offset", 400)
+    }
+    const resultsQuery = `${query} order by id desc limit ? offset ?`;
+    const { results } = await c.env.DB.prepare(resultsQuery).bind(
+        ...params, limit, offset
+    ).all();
+    const count = offset == 0 ? await c.env.DB.prepare(
+        countQuery
+    ).bind(...params).first("count") : 0;
+    return c.json({ results, count });
+}
diff --git a/worker/src/mails_api/send_mail_api.js b/worker/src/mails_api/send_mail_api.js
index d9f50d53..9388996b 100644
--- a/worker/src/mails_api/send_mail_api.js
+++ b/worker/src/mails_api/send_mail_api.js
@@ -155,7 +155,7 @@ api.post('/api/send_mail', async (c) => {
 api.post('/external/api/send_mail', async (c) => {
     const { token } = await c.req.json();
     try {
-        const { address } = await Jwt.verify(token, c.env.JWT_SECRET);
+        const { address } = await Jwt.verify(token, c.env.JWT_SECRET, "HS256");
         if (!address) {
             return c.text("No address", 400)
         }
diff --git a/worker/src/router.js b/worker/src/router.js
index 70670079..df07bf90 100644
--- a/worker/src/router.js
+++ b/worker/src/router.js
@@ -162,7 +162,7 @@ api.delete('/api/delete_address', async (c) => {
         return c.text("Failed to delete address", 500)
     }
     const { success: mailSuccess } = await c.env.DB.prepare(
-        `DELETE FROM mails WHERE address = ? `
+        `DELETE FROM raw_mails WHERE address = ? `
     ).bind(address).run();
     if (!mailSuccess) {
         return c.text("Failed to delete mails", 500)
diff --git a/worker/src/user_api/user.js b/worker/src/user_api/user.js
index 7f0ef90b..066a9341 100644
--- a/worker/src/user_api/user.js
+++ b/worker/src/user_api/user.js
@@ -132,7 +132,10 @@ export default {
         // create jwt
         const jwt = await Jwt.sign({
             user_email: email,
-            user_id: user_id
+            user_id: user_id,
+            // 30 days expire in seconds
+            exp: Math.floor(Date.now() / 1000) + 30 * 24 * 60 * 60,
+            iat: Math.floor(Date.now() / 1000),
         }, c.env.JWT_SECRET)
         return c.json({
             jwt: jwt
diff --git a/worker/src/worker.js b/worker/src/worker.js
index b99ab680..bad78dc9 100644
--- a/worker/src/worker.js
+++ b/worker/src/worker.js
@@ -52,7 +52,7 @@ app.use('/api/*', async (c, next) => {
 		await next();
 		return;
 	}
-	return jwt({ secret: c.env.JWT_SECRET })(c, next);
+	return jwt({ secret: c.env.JWT_SECRET, alg: "HS256" })(c, next);
 });
 // user_api auth
 app.use('/user_api/*', async (c, next) => {
@@ -67,7 +67,13 @@ app.use('/user_api/*', async (c, next) => {
 	}
 	try {
 		const token = c.req.raw.headers.get("x-user-token");
-		const payload = await Jwt.verify(token, c.env.JWT_SECRET);
+		const payload = await Jwt.verify(token, c.env.JWT_SECRET, "HS256");
+		// check expired
+		if (!payload.exp) return c.text("Invalid Token", 401);
+		// exp is in seconds
+		if (payload.exp < Math.floor(Date.now() / 1000)) {
+			return c.text("Token Expired", 401)
+		}
 		c.set("userPayload", payload);
 	} catch (e) {
 		console.error(e);
@@ -76,7 +82,7 @@ app.use('/user_api/*', async (c, next) => {
 	if (c.req.path.startsWith('/user_api/bind_address')
 		&& c.req.method === 'POST'
 	) {
-		return jwt({ secret: c.env.JWT_SECRET })(c, next);
+		return jwt({ secret: c.env.JWT_SECRET, alg: "HS256" })(c, next);
 	}
 	await next();
 });