Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions apps/web/app/(app)/admin/GmailUrlConverter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
convertGmailUrlBody,
type ConvertGmailUrlBody,
} from "@/utils/actions/admin.validation";
import { internalDateToDate } from "@/utils/date";

export function GmailUrlConverter() {
const {
Expand Down Expand Up @@ -90,10 +91,19 @@ export function GmailUrlConverter() {
<code className="text-sm">{result.data.threadId}</code>
</div>
<div>
<span className="text-sm font-medium">Message IDs: </span>
<code className="text-sm">
{result.data.messageIds.join(", ")}
</code>
<span className="text-sm font-medium">Messages: </span>
<div className="space-y-1">
{result.data.messages.map((msg) => (
<div key={msg.id} className="text-sm">
<code>{msg.id}</code>
{msg.date && (
<span className="ml-2 text-muted-foreground">
({internalDateToDate(msg.date).toLocaleString()})
</span>
)}
</div>
))}
</div>
</div>
</div>
)}
Expand Down
11 changes: 10 additions & 1 deletion apps/web/app/api/google/webhook/process-history.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,16 @@ async function processHistory(options: ProcessHistoryOptions, logger: Logger) {

const allEvents = [
...(h.messagesAdded || [])
.filter(isInboxOrSentMessage)
.filter((m) => {
const isRelevant = isInboxOrSentMessage(m);
if (!isRelevant) {
logger.info("Skipping message not in inbox or sent", {
messageId: m.message?.id,
labelIds: m.message?.labelIds,
});
}
return isRelevant;
})
.map((m) => ({ type: HistoryEventType.MESSAGE_ADDED, item: m })),
...(h.labelsAdded || []).map((m) => ({
type: HistoryEventType.LABEL_ADDED,
Expand Down
8 changes: 6 additions & 2 deletions apps/web/utils/actions/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,15 @@ export const adminConvertGmailUrlAction = adminActionClient
throw new SafeError("Could not find thread for message");
}

const messageIds = thread.messages?.map((m) => m.id) || [];
const messages =
thread.messages?.map((m) => ({
id: m.id,
date: m.internalDate || null,
})) || [];

return {
threadId: thread.id,
messageIds: messageIds,
messages: messages,
rfc822MessageId: cleanMessageId,
};
});
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.20.20
v2.20.21
Loading