Fix potential duplicate emails

Author: pycanis

apps/server/src/email.ts

@@ -103,7 +103,7 @@ const sendEmail = async (claim: Claims) => {
 
 	if (process.env.NODE_ENV !== "production") {
 		console.log("Not running prod, logging email params");
-		console.log("Email params: ", emailParams);
+		console.log("Email params: ", { ...emailParams, html: "<truncated>" });
 
 		return;
 	}

apps/server/src/handleIncomingPayment.ts

@@ -1,24 +1,21 @@
 import { ClaimStatus, prisma } from "@repo/database";
 import { sendEmail } from "./email";
 import { notifyPaymentSubscribers } from "./notifyPaymentSubscribers";
-import type { Invoice__Output } from "./protos/generated/lnrpc/Invoice";
 
-export const handleIncomingPayment = async ({ paymentRequest, state }: Invoice__Output) => {
-	if (state === "SETTLED") {
-		const claim = await prisma.claims.findUnique({
-			where: { paymentRequest, status: ClaimStatus.AWAITING_PAYMENT },
-		});
+export const handleIncomingPayment = async (paymentRequest: string) => {
+	const claim = await prisma.claims.findUnique({
+		where: { paymentRequest, status: ClaimStatus.AWAITING_PAYMENT },
+	});
 
-		if (!claim) return;
+	if (!claim) return;
 
-		await prisma.claims.update({
-			where: { paymentRequest },
-			data: { status: ClaimStatus.PAID },
-		});
+	await prisma.claims.update({
+		where: { paymentRequest },
+		data: { status: ClaimStatus.PAID },
+	});
 
-		notifyPaymentSubscribers(paymentRequest);
+	notifyPaymentSubscribers(paymentRequest);
 
-		// todo: handle multiple platforms
-		await sendEmail(claim);
-	}
+	// todo: handle multiple platforms
+	await sendEmail(claim);
 };

apps/server/src/subscribeInvoices.ts

@@ -42,12 +42,14 @@ export const subscribeInvoices = () => {
 	stream.on("data", (data: Invoice__Output) => {
 		reconnectAttempts = 0;
 
-		if (data.state === "SETTLED") {
-			lastSettleIndex = Number(data.settleIndex);
+		const settleIndex = Number(data.settleIndex);
+
+		if (settleIndex && settleIndex > lastSettleIndex) {
+			lastSettleIndex = settleIndex;
 			saveLastSettleIndex(lastSettleIndex);
-		}
 
-		handleIncomingPayment(data);
+			handleIncomingPayment(data.paymentRequest);
+		}
 	});
 
 	stream.on("error", (err: unknown) => {