pervert-monkey 1.0.18 → 1.0.19

package/dist/userscripts/3hentai.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         3Hentai PervertMonkey
 // @namespace    pervertmonkey
-// @version      1.0.8
+// @version      1.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, thumb preview
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.3hentai.net/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/camgirlfinder.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         CamGirlFinder PervertMonkey
 // @namespace    pervertmonkey
-// @version      1.6.7
+// @version      1.6.11
 // @author       violent-orangutan
 // @description  Adds model links for CamWhores, webcamrecordings, recu.me, camvideos, privat-zapisi
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://camgirlfinder.net/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        none
 // @run-at       document-idle

package/dist/userscripts/camwhores.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         CamWhores PervertMonkey
 // @namespace    pervertmonkey
-// @version      3.0.11
+// @version      3.0.15
 // @author       violent-orangutan
 // @description  Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Sort by Duration and Views. Mass friend request button. Download button
 // @license      MIT
@@ -13,7 +13,7 @@
 // @match        https://*.camwhores.tv
 // @match        https://*.camwhores.*/*
 // @exclude      https://*.camwhores.tv/*mode=async*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/e-hentai.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         E-Hentai PervertMonkey
 // @namespace    pervertmonkey
-// @version      1.0.8
+// @version      1.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.e-hentai.org/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/ebalka.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Ebalka PervertMonkey
 // @namespace    pervertmonkey
-// @version      3.0.8
+// @version      3.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration, Sort by Duration, Download button.
 // @license      MIT
@@ -15,7 +15,7 @@
 // @match        https://*ebalka.*.*/*
 // @match        https://*.ebalk*.*/*
 // @match        https://*.fuckingbear*.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/eporner.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Eporner PervertMonkey
 // @namespace    pervertmonkey
-// @version      2.0.10
+// @version      2.0.14
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Uploader, Duration and HD, Sort by Views and Duration
 // @license      MIT
@@ -12,7 +12,7 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.eporner.com/*
 // @match        https://*.eporner.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/erome.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Erome PervertMonkey
 // @namespace    pervertmonkey
-// @version      5.0.9
+// @version      5.0.13
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Uploader and Video/Photo albums, Sort by Views. Show/Hide Photos in album. Remove disclaimer.
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        *://*.erome.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/eroprofile.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Eroprofile PervertMonkey
 // @namespace    pervertmonkey
-// @version      2.0.8
+// @version      2.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration, Sort by Duration
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.eroprofile.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/javhdporn.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Javhdporn PervertMonkey
 // @namespace    pervertmonkey
-// @version      3.0.8
+// @version      3.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration, Sort By Duration and Views
 // @license      MIT
@@ -12,7 +12,7 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.javhdporn.net/*
 // @match        https://*.javhdporn.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/missav.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Missav PervertMonkey
 // @namespace    pervertmonkey
-// @version      3.0.7
+// @version      3.0.11
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration, Sort by Duration
 // @license      MIT
@@ -15,7 +15,7 @@
 // @match        https://*.missav.ws/*
 // @match        https://*.missav.to/*
 // @match        https://*.missav.live/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/motherless.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Motherless PervertMonkey
 // @namespace    pervertmonkey
-// @version      5.0.9
+// @version      5.0.13
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Uploader and Duration, Sort by Duration and Views
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://motherless.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addElement
 // @grant        GM_addStyle

package/dist/userscripts/namethatporn.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         NameThatPorn PervertMonkey
 // @namespace    pervertmonkey
-// @version      3.0.8
+// @version      3.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Uploader and Solved/Unsolved
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://namethatporn.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/nhentai.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         NHentai PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.8
+// @version      4.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title
 // @license      MIT
@@ -12,7 +12,7 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.nhentai.net/*
 // @match        https://*.nhentai.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/obmenvsem.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
-// @name         Obmensvem PervertMonkey
+// @name         Obmenvsem PervertMonkey
 // @namespace    pervertmonkey
-// @version      1.0.9
+// @version      1.0.14
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration, Sort by Duration
 // @license      MIT
@@ -13,7 +13,7 @@
 // @match        https://*.obmenvsem.com/*
 // @match        https://*.obmenvsem.*/*
 // @match        https://*.obmenvsems.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addElement
 // @grant        GM_addStyle

package/dist/userscripts/pornhub.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         PornHub PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.8
+// @version      4.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional]. Filter by Title, Uploader and Duration. Sort by Duration and Views
 // @license      MIT
@@ -12,7 +12,7 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.pornhub.com/*
 // @exclude      https://*.pornhub.com/embed/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/spankbang.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         SpankBang.com PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.8
+// @version      4.0.12
 // @author       violent-orangutan
 // @description  Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views
 // @license      MIT
@@ -12,7 +12,7 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.spankbang.com/*
 // @match        https://*.spankbang.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/dist/userscripts/thisvid.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
-// @name         ThisVid.com Improved
+// @name         ThisVid.com PervertMonkey
 // @namespace    pervertmonkey
-// @version      8.0.8
+// @version      8.0.13
 // @author       violent-orangutan
 // @description  Infinite scroll [optional]. Preview for private videos. Filter by Title, Duration, Quality and Public/Private. Sort by Duration and Views. Private/Public feed of friends uploads. Check access to private vids. Mass friend request button. Sorts messages. Download button 📼
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.thisvid.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow
@@ -898,9 +898,35 @@ function takeWhile(predicate) {
   const IS_MEMBER_FRIEND = IS_OTHER_MEMBER_PAGE && document.querySelector(".case-left")?.innerText.includes(
     "is in your friends"
   );
+  function fixContainersDuplication() {
+    const containers = document.querySelectorAll(
+      "div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)"
+    );
+    if (containers.length < 2 || utils.getCommonParents(containers).length > 1) return;
+    const mainContainer = containers.values().find((e) => e.id);
+    const badContainers = containers.values().filter((e) => !e.id);
+    badContainers.forEach((e) => {
+      mainContainer?.append(...e.children);
+      mainContainer && e.remove();
+    });
+  }
+  fixContainersDuplication();
   function fixPlaylistThumbUrl(src) {
     return src.replace(/playlist\/\d+\/video/, () => "videos");
   }
+  function getImgData(thumb) {
+    const img = thumb.querySelector("img");
+    const privateThumb = thumb.querySelector(".private");
+    let imgSrc = img?.getAttribute("data-original");
+    if (privateThumb) {
+      imgSrc = utils.parseCssUrl(privateThumb.style.background);
+      privateThumb.removeAttribute("style");
+    }
+    img.removeAttribute("data-original");
+    img.removeAttribute("data-cnt");
+    img.classList.remove("lazy-load");
+    return { img, imgSrc };
+  }
   const defaultRulesConfig = {
     thumbs: {
       selector: "div:has(> .tumbpu[title]):not(.thumbs-photo) > .tumbpu[title], .thumb-holder"
@@ -914,25 +940,8 @@ function takeWhile(predicate) {
         views: { selector: ".view", type: "number" }
       }
     },
-    thumbImg: {
-      getImgData(thumb) {
-        const img = thumb.querySelector("img");
-        const privateThumb = thumb.querySelector(".private");
-        let imgSrc = img?.getAttribute("data-original");
-        if (privateThumb) {
-          imgSrc = utils.parseCssUrl(privateThumb.style.background);
-          privateThumb.removeAttribute("style");
-        }
-        img.removeAttribute("data-original");
-        img.removeAttribute("data-cnt");
-        img.classList.remove("lazy-load");
-        return { img, imgSrc };
-      }
-    },
-    containerSelector: () => utils.querySelectorLast(
-      document,
-      "div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)"
-    ) || document.querySelector(".thumbs-items"),
+    thumbImg: { getImgData },
+    containerSelectorLast: "div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder), .thumbs-items",
     animatePreview,
     schemeOptions: [
       "Title Filter",
@@ -946,11 +955,7 @@ function takeWhile(predicate) {
         content: [{ autoRequestAccess: false, label: "check access sends friend requests" }]
       }
     ],
-    gropeStrategy: utils.getCommonParents([
-      ...document.querySelectorAll(
-        "div:has(> .tumbpu[title]):not(.thumbs-photo) > .tumbpu[title], .thumb-holder"
-      )
-    ]).length < 2 ? "all-in-one" : "all-in-all"
+    gropeStrategy: "all-in-all"
   };
   const config = IS_MY_MEMBER_PAGE || IS_MY_WALL ? await( createPrivateFeed()) : defaultRulesConfig;
   const rules = new core.Rules(config);
@@ -1271,6 +1276,7 @@ function takeWhile(predicate) {
     const hideMemberVideos = (e, ignore = true) => {
       const container2 = e.target?.closest("div");
       let id = container2.id;
+      feedGenerator.skip(1);
       const videosCount = utils.querySelectorLastNumber(`#${id}`);
       document.querySelectorAll(`#${id}~a`).values().take(videosCount).forEach((e2) => {
         e2.remove();

package/dist/userscripts/xhamster.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
-// @name         Xhamster Improved
+// @name         Xhamster PervertMonkey
 // @namespace    pervertmonkey
-// @version      5.0.9
+// @version      5.0.14
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views
 // @license      MIT
@@ -13,7 +13,7 @@
 // @match        https://*.xhamster.com/*
 // @match        https://*.xhamster.*/*
 // @exclude      https://*.xhamster.com/embed*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addElement
 // @grant        GM_addStyle

package/dist/userscripts/xvideos.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
-// @name         XVideos Improved
+// @name         XVideos PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.9
+// @version      4.0.14
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title, Uploader and Duration. Sort by Duration and Views.
 // @license      MIT
@@ -11,7 +11,7 @@
 // @source       github:smartacephale/sleazy-fork
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.xvideos.com/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.18/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.19/dist/core/pervertmonkey.core.umd.js
 // @require      data:application/javascript,var core = window.pervertmonkey.core || pervertmonkey.core; var utils = core;
 // @grant        GM_addStyle
 // @grant        unsafeWindow

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pervert-monkey",
   "description": "daddy told us not to be ashamed of our userscripts",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "license": "MIT",
   "keywords": [
     "userscript",
@@ -36,9 +36,9 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "build:userscripts": "node vite.build.userscripts.ts",
-    "build:test": "node vite.build.test.ts",
-    "build:inc": "node vite.build.version.inc.ts"
+    "build:test": "node ./build/vite.build.test.ts",
+    "build:u": "node ./build/vite.build.userscripts.ts",
+    "build:uinc": "npm run build:u -- --inc"
   },
   "devDependencies": {
     "@types/node": "^25.2.3",

package/src/core/data-handler/data-filter.ts

@@ -9,7 +9,7 @@ import { defaultDataFilterFns } from './data-filter-fn-defaults';
 
 export class DataFilter {
   public filters = new Map<string, () => DataFilterFnRendered>();
-  public filterMapping: Record<string, string> = {};
+  public filterDepsMapping: Record<string, string> = {};
 
   constructor(private rules: Rules) {
     this.registerFilters(rules.customDataFilterFns);
@@ -51,7 +51,7 @@ export class DataFilter {
     dataFilterFn.deps.push(customSelectorName);
 
     dataFilterFn.deps.forEach((name) => {
-      Object.assign(this.filterMapping, { [name]: customSelectorName });
+      Object.assign(this.filterDepsMapping, { [name]: customSelectorName });
     });
 
     this.filters.set(customSelectorName, dataFilterFn.renderFn(this.rules.store.state));
@@ -59,8 +59,8 @@ export class DataFilter {
 
   public selectFilters(filters: { [key: string]: boolean }) {
     const selectedFilters = Object.keys(filters)
-      .filter((k) => k in this.filterMapping)
-      .map((k) => this.filterMapping[k])
+      .filter((k) => k in this.filterDepsMapping)
+      .map((k) => this.filterDepsMapping[k])
       .map((k) => this.filters.get(k) as () => DataFilterFnRendered);
     return selectedFilters;
   }

package/src/core/infinite-scroll/index.ts

@@ -10,7 +10,6 @@ export type OffsetGenerator<T = GeneratorResult> = Generator<T> | AsyncGenerator
 type IScrollerSubject = { type: 'scroll'; scroller: InfiniteScroller; page: HTMLElement };
 
 export class InfiniteScroller {
-  public enabled = true;
   public paginationOffset = 1;
   public rules: Rules;
 
@@ -69,7 +68,7 @@ export class InfiniteScroller {
   }
 
   generatorConsumer = async () => {
-    if (!this.enabled) return false;
+    if (!this.rules.store.state.infiniteScrollEnabled) return true;
 
     const { value, done } = await this.paginationGenerator.next();
     if (done) return false;
@@ -106,11 +105,9 @@ export class InfiniteScroller {
   }
 
   static create(rules: Rules) {
-    const enabled = rules.store.state.infiniteScrollEnabled as boolean;
-
     rules.store.state.$paginationLast = rules.paginationStrategy.getPaginationLast();
 
-    const infiniteScroller = new InfiniteScroller({ enabled, rules });
+    const infiniteScroller = new InfiniteScroller({ rules });
 
     rules.store.state.$paginationOffset = infiniteScroller.paginationOffset;
 
@@ -125,10 +122,6 @@ export class InfiniteScroller {
       }
     });
 
-    rules.store.stateSubject.subscribe(() => {
-      infiniteScroller.enabled = rules.store.state.infiniteScrollEnabled as boolean;
-    });
-
     return infiniteScroller;
   }
 }

package/src/core/parsers/thumb-data-parser.ts

@@ -1,6 +1,7 @@
 import {
-  parseNumberWithLetter,
+  parseNumericAbbreviation,
   querySelectorLast,
+  querySelectorOrSelf,
   querySelectorText,
   sanitizeStr,
   timeToSeconds,
@@ -71,7 +72,7 @@ export class ThumbDataParser {
     { type, selector }: ThumbDataSelector,
   ): Primitive {
     if (type === 'boolean') {
-      return !!thumb.querySelector(selector);
+      return !!querySelectorOrSelf(thumb, selector);
     }
     if (type === 'string') {
       return sanitizeStr(querySelectorLast(thumb, selector)?.innerText || '');
@@ -81,7 +82,7 @@ export class ThumbDataParser {
     }
     if (type === 'float') {
       const value = querySelectorText(thumb, selector);
-      return parseNumberWithLetter(value);
+      return parseNumericAbbreviation(value);
     }
     return Number.parseInt(querySelectorText(thumb, selector));
   }

package/src/core/parsers/thumbs-parser.ts

@@ -3,22 +3,21 @@ export class ThumbsParser {
   public strategy: 'default' | 'auto' = 'default';
   public transform?: (thumb: HTMLElement) => void;
 
-  public static create(options: Partial<Pick<ThumbsParser, 'selector' | 'strategy' | 'transform'>> = {}, containerSelector: string) {
-    return Object.assign(new ThumbsParser(containerSelector), options);
+  public static create(
+    options: Partial<Pick<ThumbsParser, 'selector' | 'strategy' | 'transform'>> = {},
+  ) {
+    return Object.assign(new ThumbsParser(), options);
   }
-  constructor(public containerSelector: string) { }
 
-  public getThumbs(html: HTMLElement): HTMLElement[] {
-    if (!html) return [];
-    let thumbs: HTMLElement[];
+  public getThumbs(container: HTMLElement): HTMLElement[] {
+    if (!container) return [];
 
     if (this.strategy === 'auto') {
       if (typeof this.selector !== 'string') return [];
-      const container = html.querySelector(this.containerSelector);
-      thumbs = [...(container?.children || [])] as HTMLElement[];
+      return [...(container?.children || [])] as HTMLElement[];
     }
 
-    thumbs = Array.from(html.querySelectorAll<HTMLElement>(this.selector));
+    const thumbs = Array.from(container.querySelectorAll<HTMLElement>(this.selector));
 
     if (typeof this.transform === 'function') {
       thumbs.forEach(this.transform);
@@ -26,4 +25,4 @@ export class ThumbsParser {
 
     return thumbs;
   }
-}
+}

package/src/core/rules/index.ts

@@ -2,6 +2,7 @@ import { JabronioGUI, JabronioStore, type JabroniTypes, setupScheme } from 'jabr
 import {
   getCommonParents,
   querySelectorLast,
+  querySelectorOrSelf,
   waitForElementToDisappear,
 } from '../../utils';
 import { DataManager } from '../data-handler';
@@ -37,10 +38,10 @@ export class Rules {
 
   get container() {
     if (typeof this.containerSelectorLast === 'string') {
-      return querySelectorLast(document, this.containerSelectorLast) as HTMLElement;
+      return querySelectorLast(document.body, this.containerSelectorLast) as HTMLElement;
     }
     if (typeof this.containerSelector === 'string') {
-      return document.querySelector<HTMLElement>(this.containerSelector) as HTMLElement;
+      return querySelectorOrSelf(document.body, this.containerSelector) as HTMLElement;
     }
     return this.containerSelector();
   }
@@ -48,10 +49,8 @@ export class Rules {
   public intersectionObservableSelector?: string;
 
   public get intersectionObservable() {
-    return (
-      this.intersectionObservableSelector &&
-      document.querySelector(this.intersectionObservableSelector)
-    );
+    if (!this.intersectionObservableSelector) return undefined;
+    return document.querySelector<HTMLElement>(this.intersectionObservableSelector);
   }
 
   public get observable(): HTMLElement {
@@ -179,7 +178,7 @@ export class Rules {
 
     this.thumbDataParser = ThumbDataParser.create(this.thumb);
     this.thumbImgParser = ThumbImgParser.create(this.thumbImg);
-    this.thumbsParser = ThumbsParser.create(this.thumbs, this.containerSelector as string);
+    this.thumbsParser = ThumbsParser.create(this.thumbs);
 
     this.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);