From da04190d47f56e04dfefc77545c71c6bdc5b635b Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Mon, 8 Jan 2024 03:32:05 +0100
Subject: [PATCH] Drop invalid jobs

---
 packages/backend/src/queue/index.ts              | 10 +---------
 packages/backend/src/queue/processors/deliver.ts |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index 64ebfabdbd..1cb2d9e651 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -28,7 +28,6 @@ import {
 	webhookDeliverQueue,
 } from "./queues.js";
 import type {ThinUser} from "./types.js";
-import {URL} from "node:url";
 
 function renderError(e: Error): any {
 	return {
@@ -170,16 +169,9 @@ export function deliver(user: ThinUser, content: unknown, to: string | null) {
 		to,
 	};
 
-	try {
-		new URL(data.to);
-	} catch (e) {
-		deliverLogger.error(`Failed URL parse, incorrect data: ${JSON.stringify(data)}`);
-		return null;
-	}
-
 	return deliverQueue.add(data, {
 		attempts: config.deliverJobMaxAttempts || 12,
-		timeout: 1 * 60 * 1000, // 1min
+		timeout: 60 * 1000, // 1min
 		backoff: {
 			type: "apBackoff",
 		},
diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts
index 17d38450ff..191c148356 100644
--- a/packages/backend/src/queue/processors/deliver.ts
+++ b/packages/backend/src/queue/processors/deliver.ts
@@ -20,9 +20,9 @@ export default async (job: Bull.Job<DeliverJobData>) => {
 	try {
 		host = new URL(job.data.to).host;
 	} catch (e) {
-		logger.error(`${e}`);
-		logger.error(`Failed URL parse: ${job}`);
-		return null;
+		logger.error(`Invalid URL: ${e}`);
+		await job.discard();
+		throw e;
 	}
 
 	const puny = toPuny(host);