mirror of
https://github.com/beilunyang/moemail.git
synced 2026-09-05 23:36:37 +08:00
fix: new received emails not showing
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import { NextResponse } from "next/server"
|
import { NextResponse } from "next/server"
|
||||||
import { createDb } from "@/lib/db"
|
import { createDb } from "@/lib/db"
|
||||||
import { emails, messages } from "@/lib/schema"
|
import { emails, messages } from "@/lib/schema"
|
||||||
import { eq, and, lt, or, sql, ne } from "drizzle-orm"
|
import { eq, and, lt, or, sql, ne, isNull } from "drizzle-orm"
|
||||||
import { encodeCursor, decodeCursor } from "@/lib/cursor"
|
import { encodeCursor, decodeCursor } from "@/lib/cursor"
|
||||||
import { getUserId } from "@/lib/apiKey"
|
import { getUserId } from "@/lib/apiKey"
|
||||||
import { checkBasicSendPermission } from "@/lib/send-permissions"
|
import { checkBasicSendPermission } from "@/lib/send-permissions"
|
||||||
@@ -87,7 +87,12 @@ export async function GET(
|
|||||||
|
|
||||||
const baseConditions = and(
|
const baseConditions = and(
|
||||||
eq(messages.emailId, id),
|
eq(messages.emailId, id),
|
||||||
messageType === 'sent' ? eq(messages.type, "sent") : ne(messages.type, "sent")
|
messageType === 'sent'
|
||||||
|
? eq(messages.type, "sent")
|
||||||
|
: or(
|
||||||
|
ne(messages.type, "sent"),
|
||||||
|
isNull(messages.type)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
const totalResult = await db.select({ count: sql<number>`count(*)` })
|
const totalResult = await db.select({ count: sql<number>`count(*)` })
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ const handleEmail = async (message: ForwardableEmailMessage, env: Env) => {
|
|||||||
subject: parsedMessage.subject || '(无主题)',
|
subject: parsedMessage.subject || '(无主题)',
|
||||||
content: parsedMessage.text || '',
|
content: parsedMessage.text || '',
|
||||||
html: parsedMessage.html || '',
|
html: parsedMessage.html || '',
|
||||||
|
type: 'received',
|
||||||
}).returning().get()
|
}).returning().get()
|
||||||
|
|
||||||
const webhook = await db.query.webhooks.findFirst({
|
const webhook = await db.query.webhooks.findFirst({
|
||||||
|
|||||||
Reference in New Issue
Block a user