From 49298030beb5afa72e94b64324157fc32e9ebd93 Mon Sep 17 00:00:00 2001
From: Batorian <53831711+Batorian@users.noreply.github.com>
Date: Sun, 14 Jul 2024 12:27:53 +0200
Subject: [PATCH] fix: [Novel Fire]: Remove Bloat and Correct Filters (#1052)

* novel-fire: initial commit

* novel-fire: added search novels

* novel-fire: added icon

* novel-fire: fix filter

* novel-fire: fix summary

* novel-fire: added parse chapter

* novel-fire: update version

* novel-fire: update icon

* novel-fire: remove pages and parse all pages in parallel

* novel-fire: remove bloat

* novel-fire: fix bloat removal

* novel-fire: fix filter

* novel-fire: revert version
---
 src/plugins/english/novelfire.ts | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/plugins/english/novelfire.ts b/src/plugins/english/novelfire.ts
index de27184..1d19f58 100644
--- a/src/plugins/english/novelfire.ts
+++ b/src/plugins/english/novelfire.ts
@@ -7,7 +7,7 @@ import { Plugin } from '@typings/plugin';
 class NovelFire implements Plugin.PluginBase {
   id = 'novelfire';
   name = 'Novel Fire';
-  version = '1.0.0';
+  version = '1.0.1';
   icon = 'src/en/novelfire/icon.png';
   site = 'https://novelfire.net/';
 
@@ -35,7 +35,8 @@ class NovelFire implements Plugin.PluginBase {
       params.append('rating', filters.rating.value);
       params.append('status', filters.status.value);
       params.append('sort', filters.sort.value);
-      url += `?${params.toString()}&page=${pageNo}`;
+      params.append('page', pageNo.toString());
+      url += `?${params.toString()}`;
     } else {
       url += `?ctgcon=and&totalchapter=0&ratcon=min&rating=0&status=-1&sort=all-time-rank&page=${pageNo}`;
     }
@@ -169,7 +170,9 @@ class NovelFire implements Plugin.PluginBase {
     bloatElements.map(tag => {
       if (tag instanceof RegExp) {
         loadedCheerio('*')
-          .filter((_, el) => tag.test(loadedCheerio(el).prop('tagName')!))
+          .filter((_, el) =>
+            tag.test(loadedCheerio(el).prop('tagName')!.toLowerCase()),
+          )
           .remove();
       } else {
         loadedCheerio(tag).remove();
@@ -345,12 +348,12 @@ class NovelFire implements Plugin.PluginBase {
       value: '0',
       options: [
         { label: 'All', value: '0' },
-        { label: '<50', value: '1%2C49' },
-        { label: '50-100', value: '50%2C100' },
-        { label: '100-200', value: '100%2C200' },
-        { label: '200-500', value: '200%2C500' },
-        { label: '500-1000', value: '500%2C1000' },
-        { label: '>1000', value: '1001%2C1000000' },
+        { label: '<50', value: '1,49' },
+        { label: '50-100', value: '50,100' },
+        { label: '100-200', value: '100,200' },
+        { label: '200-500', value: '200,500' },
+        { label: '500-1000', value: '500,1000' },
+        { label: '>1000', value: '1001,1000000' },
       ],
       type: FilterTypes.Picker,
     },