新增tg和第三方邮件转发

mail-worker/src/service/email-service.js

@@ -17,7 +17,6 @@ import account from '../entity/account';
 import starService from './star-service';
 import dayjs from 'dayjs';
 import kvConst from '../const/kv-const';
-import constant from '../const/constant';
 
 const emailService = {
 
@@ -514,7 +513,7 @@ const emailService = {
 		}
 
 		if (accountEmail) {
-			conditions.push(like(account.email, `${accountEmail}%`));
+			conditions.push(like(email.toEmail, `${accountEmail}%`));
 		}
 
 		if (name) {
@@ -535,16 +534,14 @@ const emailService = {
 			conditions.push(lt(email.emailId, emailId));
 		}
 
-		const query = orm(c).select({ ...email, userEmail: user.email, accountEmail: account.email })
+		const query = orm(c).select({ ...email, userEmail: user.email })
 			.from(email)
 			.leftJoin(user, eq(email.userId, user.userId))
-			.leftJoin(account, eq(email.accountId, account.accountId))
 			.where(and(...conditions));
 
 		const queryCount = orm(c).select({ total: count() })
 			.from(email)
 			.leftJoin(user, eq(email.userId, user.userId))
-			.leftJoin(account, eq(email.accountId, account.accountId))
 			.where(and(...countConditions));
 
 		if (timeSort) {
@@ -574,10 +571,10 @@ const emailService = {
 	},
 
 	async completeReceive(c, status, emailId) {
-		await orm(c).update(email).set({
+		return await orm(c).update(email).set({
 			isDel: isDel.NORMAL,
 			status: status
-		}).where(eq(email.emailId, emailId)).run();
+		}).where(eq(email.emailId, emailId)).returning().get();
 	}
 };
 

mail-worker/src/service/setting-service.js

@@ -7,7 +7,6 @@ import r2Service from './r2-service';
 import emailService from './email-service';
 import accountService from './account-service';
 import userService from './user-service';
-import starService from './star-service';
 import constant from '../const/constant';
 import BizError from '../error/biz-error';
 
@@ -32,20 +31,20 @@ const settingService = {
 
 	async get(c) {
 		const settingRow = await this.query(c);
-		settingRow.secretKey = settingRow.secretKey ? `${settingRow.secretKey.slice(0, 12)}******`: null ;
+		settingRow.secretKey = settingRow.secretKey ? `${settingRow.secretKey.slice(0, 12)}******` : null;
 		Object.keys(settingRow.resendTokens).forEach(key => {
 			settingRow.resendTokens[key] = `${settingRow.resendTokens[key].slice(0, 12)}******`;
 		});
-		return settingRow
+		return settingRow;
 	},
 
 	async set(c, params) {
-		const settingData  = await this.query(c)
-		let resendTokens = {...settingData.resendTokens,...params.resendTokens}
+		const settingData = await this.query(c);
+		let resendTokens = { ...settingData.resendTokens, ...params.resendTokens };
 		Object.keys(resendTokens).forEach(domain => {
-			if(!resendTokens[domain]) delete resendTokens[domain]
-		})
-		params.resendTokens = JSON.stringify(resendTokens)
+			if (!resendTokens[domain]) delete resendTokens[domain];
+		});
+		params.resendTokens = JSON.stringify(resendTokens);
 		await orm(c).update(setting).set({ ...params }).returning().get();
 		await this.refresh(c);
 	},
@@ -109,6 +108,25 @@ const settingService = {
 		await emailService.physicsDeleteAll(c);
 		await accountService.physicsDeleteAll(c);
 		await userService.physicsDeleteAll(c);
+	},
+
+	async websiteConfig(c) {
+		const settingRow = await this.get(c);
+		return {
+			register: settingRow.register,
+			title: settingRow.title,
+			manyEmail: settingRow.manyEmail,
+			addEmail: settingRow.addEmail,
+			autoRefreshTime: settingRow.autoRefreshTime,
+			addEmailVerify: settingRow.addEmailVerify,
+			registerVerify: settingRow.registerVerify,
+			send: settingRow.send,
+			r2Domain: settingRow.r2Domain,
+			siteKey: settingRow.siteKey,
+			background: settingRow.background,
+			loginOpacity: settingRow.loginOpacity,
+			domainList:settingRow.domainList
+		};
 	}
 };