From ecbbea0ae0eac908f3b7a915c88dbe8ba0df0512 Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Mon, 26 Feb 2024 19:35:27 +0800
Subject: [PATCH] fix: filterout and chatgpt

---
 lib/middleware/parameter.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/middleware/parameter.ts b/lib/middleware/parameter.ts
index 8700e281a..ec1f8bf64 100644
--- a/lib/middleware/parameter.ts
+++ b/lib/middleware/parameter.ts
@@ -5,7 +5,7 @@ import got from '@/utils/got';
 import { config } from '@/config';
 import { RE2JS } from 're2js';
 import markdownit from 'markdown-it';
-import htmlToText from 'html-to-text';
+import { convert } from 'html-to-text';
 import sanitizeHtml from 'sanitize-html';
 import { MiddlewareHandler } from 'hono';
 import cache from '@/utils/cache';
@@ -245,11 +245,12 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
                 const category = item.category || [];
                 let isFilter = true;
 
-                if (ctx.req.query('filterout')) {
+                if (ctx.req.query('filterout') || ctx.req.query('filterout_title')) {
                     const titleRegex = makeRegex(ctx.req.query('filterout_title') || ctx.req.query('filterout')!);
-                    const descriptionRegex = makeRegex(ctx.req.query('filterout_description') || ctx.req.query('filterout')!);
-
                     isFilter = titleRegex instanceof RE2JS ? !titleRegex.matcher(title).find() : !title.match(titleRegex);
+                }
+                if (ctx.req.query('filterout') || ctx.req.query('filterout_description')) {
+                    const descriptionRegex = makeRegex(ctx.req.query('filterout_description') || ctx.req.query('filterout')!);
                     isFilter = isFilter && (descriptionRegex instanceof RE2JS ? !descriptionRegex.matcher(description).find() : !description.match(descriptionRegex));
                 }
                 if (ctx.req.query('filterout_author')) {
@@ -330,7 +331,7 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
                     if (item.description) {
                         try {
                             const summary = await cache.tryGet(`openai:${item.link}`, async () => {
-                                const text = htmlToText.htmlToText(item.description!);
+                                const text = convert(item.description!);
                                 if (text.length < 300) {
                                     return '';
                                 }