pervert-monkey 1.0.25 → 1.0.27

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

@@ -15,9 +15,17 @@ export class DataManager {
   );
   public dataFilter: DataFilter;
 
+  public static create(
+    rules: Rules,
+    o: Partial<Pick<DataManager, 'removeDuplicates' | 'containerHomogenity'>> = {},
+  ) {
+    return new DataManager(rules, o.removeDuplicates, o.containerHomogenity);
+  }
+
   constructor(
-    private rules: Rules,
-    private containerHomogenity?: Parameters<typeof areElementsAlike>[2],
+    public rules: Rules,
+    public removeDuplicates = false,
+    public containerHomogenity?: Parameters<typeof areElementsAlike>[2],
   ) {
     this.dataFilter = new DataFilter(this.rules);
   }
@@ -65,7 +73,7 @@ export class DataManager {
   public async parseData(
     html: HTMLElement,
     container?: HTMLElement,
-    removeDuplicates = false,
+    removeDuplicates = this.removeDuplicates,
     shouldLazify = true,
   ) {
     const thumbs = this.rules.thumbsParser.getThumbs(html);

package/src/core/parsers/pagination-parser/index.ts

@@ -19,19 +19,15 @@ export function getPaginationStrategy(
   const { url, searchParamSelector } = options;
 
   if (!pagination) {
-    // console.error('Found No Pagination');
     return _paginationStrategy;
   }
 
   if (typeof options.getPaginationUrlGenerator === 'function') {
-    // console.log(PaginationStrategy.name);
     return new PaginationStrategy(options);
   }
 
   const pageLinks = getPaginationLinks(pagination, url).map((l) => new URL(l));
 
-  // console.log({ pageLinks: pageLinks.map((l) => l.href) });
-
   const selectStrategy = (): typeof PaginationStrategy => {
     if (PaginationStrategyDataParams.testLinks(pagination)) {
       return PaginationStrategyDataParams;

package/src/core/parsers/pagination-parser/pagination-strategies/PaginationStrategyPathnameParams.ts

@@ -7,7 +7,8 @@ export class PaginationStrategyPathnameParams extends PaginationStrategy {
     const href = typeof a === 'string' ? a : a.href;
     const { pathname } = new URL(href, this.doc.baseURI || this.url.origin);
     return parseInt(
-      pathname.match(this.pathnameSelector)?.pop() || this.offsetMin.toString(),
+      pathname.match(this.pathnameSelector)?.filter(Boolean)?.pop() ||
+        this.offsetMin.toString(),
     );
   };
 
@@ -55,19 +56,53 @@ export class PaginationStrategyPathnameParams extends PaginationStrategy {
   getPaginationUrlGenerator(url_: URL = this.url) {
     const url = new URL(url_.href);
 
+    // console.log('this.pathnameSelector', this.pathnameSelector);
+
     const pathnameSelectorPlaceholder = this.pathnameSelector
       .toString()
       .replace(/\\{1,}/g, '')
       .replace(/[$?()]+/g, '')
       .replace(/\/{1,}/g, '/');
 
+    // console.log({ pathnameSelectorPlaceholder, 'url.pathname': url.pathname });
+
     if (!this.pathnameSelector.test(url.pathname)) {
       url.pathname = url.pathname
         .concat(pathnameSelectorPlaceholder.replace(/d\+/, this.offsetMin.toString()))
         .replace(/\/{1,}/g, '/');
     }
 
+    // console.log({ pathnameSelectorPlaceholder, 'url.pathname': url.pathname });
+
     const paginationUrlGenerator = (offset: number) => {
+      // console.log({
+      //   pathname: url.pathname,
+      //   replace: '',
+      //   pathnameSelector: this.pathnameSelector,
+      //   pathnameSelectorPlaceholder: pathnameSelectorPlaceholder.replace(
+      //     /d\+/,
+      //     offset.toString(),
+      //   ),
+      // });
+
+      // pathnameSelectorPlaceholder.replace()
+      // need to create tests
+
+      //   url.pathname = url.pathname.replace(
+      //     this.pathnameSelector,
+      //     (a, b, c, d) => {
+      //       console.log({ a, b, c, d, pathnameSelectorPlaceholder });
+      //       if (a.length + 1 < pathnameSelectorPlaceholder.length) {
+      //         return a.replace(/\d+/, offset.toString());
+      //       }
+      //       // return a;
+      //       return pathnameSelectorPlaceholder.replace(/d\+/, offset.toString());
+      //     },
+      //     // pathnameSelectorPlaceholder.replace(/d\+/, offset.toString()),
+      //   );
+      //   return url.href;
+      // };
+
       url.pathname = url.pathname.replace(
         this.pathnameSelector,
         pathnameSelectorPlaceholder.replace(/d\+/, offset.toString()),

package/src/core/rules/index.ts

@@ -62,7 +62,7 @@ export class Rules {
   public paginationStrategy: PaginationStrategy;
 
   public dataManager: DataManager;
-  public containerHomogenity: ConstructorParameters<typeof DataManager>[1];
+  public dataManagerOptions: Parameters<typeof DataManager.create>[1] = {};
 
   public customDataFilterFns: (Record<string, DataFilterFnFrom<any>> | string)[] = [];
   private hookDataFilterFns() {
@@ -157,7 +157,7 @@ export class Rules {
 
     this.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
 
-    this.dataManager = new DataManager(this, this.containerHomogenity);
+    this.dataManager = DataManager.create(this, this.dataManagerOptions);
 
     this.inputController.dispose();
     this.inputController = new JabronioGuiController(this.store, this.dataManager);
@@ -188,7 +188,7 @@ export class Rules {
     this.gui = this.createGui();
 
     this.hookDataFilterFns();
-    this.dataManager = new DataManager(this, this.containerHomogenity);
+    this.dataManager = DataManager.create(this, this.dataManagerOptions);
     this.inputController = new JabronioGuiController(this.store, this.dataManager);
 
     this.reset();

package/src/userscripts/index.ts

@@ -1 +1 @@
-import './scripts/motherless';
+import './scripts/xmegadrive';

package/src/userscripts/meta.json

@@ -6,5 +6,5 @@
   "grant": ["unsafeWindow", "GM_addStyle"],
   "homepageURL": "https://sleazyfork.org/en/users/1253342-smartacephale",
   "supportURL": "https://github.com/smartacephale/sleazy-fork/issues",
-  "source": "https://github.com/smartacephale"
+  "source": "https://github.com/smartacephale/sleazy-fork"
 }

package/src/userscripts/scripts/3hentai.ts

@@ -4,7 +4,7 @@ import { circularShift, OnHover, Tick } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: '3Hentai PervertMonkey',
-  version: '1.0.19',
+  version: '1.0.20',
   description: 'Infinite scroll [optional], Filter by Title, thumb preview',
   match: 'https://*.3hentai.net/*',
 };

package/src/userscripts/scripts/camgirlfinder.ts

@@ -2,7 +2,7 @@ import type { MonkeyUserScript } from 'vite-plugin-monkey';
 
 export const meta: MonkeyUserScript = {
   name: 'CamGirlFinder PervertMonkey',
-  version: '1.6.18',
+  version: '1.6.19',
   description:
     'Adds model links for CamWhores, webcamrecordings, recu.me, camvideos, privat-zapisi',
   match: ['https://camgirlfinder.net/*'],

package/src/userscripts/scripts/camwhores.ts

@@ -17,10 +17,10 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'CamWhores PervertMonkey',
-  version: '3.0.22',
+  version: '3.0.24',
   description:
     'Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Sort by Duration and Views. Mass friend request button. Download button',
-  match: ['https://*.camwhores.tv', 'https://*.camwhores.*/*'],
+  match: ['https://*.camwhores.tv/*', 'https://*.camwhores.*/*'],
   exclude: 'https://*.camwhores.tv/*mode=async*',
 };
 

package/src/userscripts/scripts/e-hentai.ts

@@ -4,7 +4,7 @@ import { fetchHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'E-Hentai PervertMonkey',
-  version: '1.0.19',
+  version: '1.0.20',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.e-hentai.org/*'],
 };

package/src/userscripts/scripts/ebalka.ts

@@ -4,7 +4,7 @@ import { downloader, exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Ebalka PervertMonkey',
-  version: '3.0.20',
+  version: '3.0.21',
   description:
     'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration, Download button.',
   match: [
@@ -49,7 +49,7 @@ function animatePreview(container: HTMLElement) {
     const src = e.querySelector('.card__image')?.getAttribute('data-preview') as string;
 
     const videoElem =
-      parseHtml(`<video style="position: absolute; left: 0px; top: 0px; visibility: visible; margin-top: -1px;"
+      parseHtml(`<video style="position: absolute; left: 50%; top: 50%; transform: translate(-50%,-50%) scale(1.1); visibility: visible; margin-top: -1px;"
       autoplay="" loop="" playsinline="true" webkit-playsinline="true" src="${src}"></video>`) as HTMLVideoElement;
     e.appendChild(videoElem);
 

package/src/userscripts/scripts/eporner.ts

@@ -5,22 +5,24 @@ import { OnHover } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Eporner PervertMonkey',
-  version: '2.0.21',
+  version: '2.1.4',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader, Duration and HD, Sort by Views and Duration',
   match: ['https://*.eporner.com/*', 'https://*.eporner.*/*'],
+  supportURL: 'https://sleazyfork.org/en/scripts/552559-eporner-pervertmonkey/feedback',
 };
 
-const show_video_prev = (unsafeWindow as any).show_video_prev;
-
 const rules = new Rules({
   paginationStrategyOptions: {
     paginationSelector: '.numlist2',
+    // pathnameSelector: /\/(\d+)\/?$/,
+    // pathnameSelector: /\/(\d+)\/([\w-]+\/)?$/
+    overwritePaginationLast: (n, _) => (n === 9 ? 9999 : n),
   },
   thumbs: { selector: 'div[id^=vf][data-id]' },
   thumb: {
     selectors: {
-      title: 'a',
+      title: 'a[href*=video-]',
       uploader: '[title="Uploader"]',
       duration: '[title="Duration"]',
       views: { selector: '[title="Views"]', type: 'float' },
@@ -31,14 +33,40 @@ const rules = new Rules({
     strategy: 'auto',
     remove: 'auto',
   },
-  containerSelectorLast: '#vidresults',
+  containerSelectorLast: 'div:has(div[id^=vf][data-id])',
   customDataFilterFns: [
-    { quality360: (el, state) => !!state.quality360 && el.quality !== 360 },
-    { quality480: (el, state) => !!state.quality480 && el.quality !== 480 },
-    { quality720: (el, state) => !!state.quality720 && el.quality !== 720 },
-    { quality1080: (el, state) => !!state.quality1080 && el.quality !== 1080 },
-    { quality2k: (el, state) => !!state.quality2k && el.quality !== 2 },
-    { quality4k: (el, state) => !!state.quality4k && el.quality !== 4 },
+    {
+      qualityFilter: {
+        handle(el, state) {
+          const hasAnyQualitySelected =
+            state.quality360 ||
+            state.quality480 ||
+            state.quality720 ||
+            state.quality1080 ||
+            state.quality2k ||
+            state.quality4k;
+
+          if (!hasAnyQualitySelected) return false;
+
+          return !(
+            (state.quality360 && el.quality === 360) ||
+            (state.quality480 && el.quality === 480) ||
+            (state.quality720 && el.quality === 720) ||
+            (state.quality1080 && el.quality === 1080) ||
+            (state.quality2k && el.quality === 2) ||
+            (state.quality4k && el.quality === 4)
+          );
+        },
+        deps: [
+          'quality360',
+          'quality480',
+          'quality720',
+          'quality1080',
+          'quality2k',
+          'quality4k',
+        ],
+      },
+    },
   ],
   schemeOptions: [
     'Title Filter',
@@ -65,9 +93,7 @@ const rules = new Rules({
 
 function animatePreview(doc: HTMLElement) {
   OnHover.create(doc, 'div[id^=vf][data-id]', (e) => {
-    const target = e as HTMLImageElement;
-    const thumb = target.closest('[data-id]');
-    const id = thumb?.getAttribute('data-id');
-    show_video_prev(id);
+    const thumb = e.closest('[data-id]');
+    (unsafeWindow as any).EP.thumbs.preview.start(thumb);
   });
 }

package/src/userscripts/scripts/erome.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Erome PervertMonkey',
-  version: '5.0.20',
+  version: '5.0.21',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Video/Photo albums, Sort by Views. Show/Hide Photos in album. Remove disclaimer. Restore Search Bar',
   match: ['*://*.erome.com/*'],

package/src/userscripts/scripts/eroprofile.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Eroprofile PervertMonkey',
-  version: '2.0.19',
+  version: '2.0.21',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: ['https://*.eroprofile.com/*'],
 };
@@ -12,17 +12,17 @@ document.querySelector('.videoGrid')?.after(document.querySelector('.clB') as HT
 
 const rules = new Rules({
   paginationStrategyOptions: {
-    paginationSelector: '.boxNav2',
+    paginationSelector: '.page-nav',
     searchParamSelector: 'pnum',
   },
-  thumbs: { selector: '.video' },
+  thumbs: { selector: '.grid-tile-video' },
   thumb: {
     selectors: {
-      title: '[title]',
-      duration: '.videoDur',
+      title: '.title',
+      duration: '.duration',
     },
   },
-  containerSelector: '.videoGrid',
+  containerSelector: 'div:has(>.grid-tile-video)',
   schemeOptions: [
     'Title Filter',
     'Duration Filter',

package/src/userscripts/scripts/javhdporn.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Javhdporn PervertMonkey',
-  version: '3.0.19',
+  version: '3.0.20',
   description:
     'Infinite scroll [optional], Filter by Title and Duration, Sort By Duration and Views',
   match: ['https://*.javhdporn.net/*', 'https://*.javhdporn.*/*'],

package/src/userscripts/scripts/missav.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Missav PervertMonkey',
-  version: '3.0.18',
+  version: '3.0.19',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://*.missav123.com/*',

package/src/userscripts/scripts/motherless.ts

@@ -1,14 +1,20 @@
 import type { MonkeyUserScript } from 'vite-plugin-monkey';
 import { GM_addElement, GM_addStyle, unsafeWindow } from '$';
 import { Rules } from '../../core';
-import { fetchWith, OnHover, replaceElementTag, Tick } from '../../utils';
+import {
+  fetchWith,
+  OnHover,
+  replaceElementTag,
+  Tick,
+  waitForElementToAppear,
+} from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Motherless PervertMonkey',
-  version: '5.0.20',
+  version: '5.0.25',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Duration, Sort by Duration and Views',
-  match: ['https://motherless.com/*'],
+  match: ['https://motherless.xxx/*'],
   grant: ['GM_addElement', 'GM_addStyle', 'unsafeWindow'],
 };
 
@@ -16,7 +22,7 @@ export const meta: MonkeyUserScript = {
 const $ = (unsafeWindow as any).$;
 
 const rules = new Rules({
-  containerSelectorLast: '.content-inner',
+  containerSelector: '.content-inner',
   thumbs: { selector: '.thumb-container, .mobile-thumb' },
   thumb: {
     selectors: {
@@ -142,25 +148,28 @@ async function desktopAddMobGalleries() {
   const galleries = document.querySelector('.media-related-galleries');
   if (!galleries) return;
 
+  await new Promise((resolve) => {
+    waitForElementToAppear(document, '.thumb-container.gallery-container', resolve);
+  });
+
+  const mobDom = await fetchWith<HTMLElement>(window.location.href, {
+    type: 'html',
+    mobile: true,
+  });
+  const mobGalleries = mobDom.querySelectorAll<HTMLElement>('.ml-gallery-thumb');
+
   const galleriesContainer = galleries.querySelector('.content-inner') as HTMLElement;
-  const galleriesCount = galleries.querySelectorAll('.gallery-container').length;
-  const mobDom = await fetchWith(window.location.href, { type: 'html', mobile: true });
-  const mobGalleries = (mobDom as HTMLElement).querySelectorAll<HTMLElement>(
-    '.ml-gallery-thumb',
-  );
-
-  for (const [i, x] of mobGalleries.entries()) {
-    if (i > galleriesCount - 1) {
-      galleriesContainer.append(mobileGalleryToDesktop(x));
-    }
+
+  for (const x of mobGalleries.values()) {
+    const mobGallery = mobileGalleryToDesktop(x);
+    const mobGalleryId = (mobGallery.querySelector('a') as HTMLAnchorElement).href
+      .split('/')
+      .at(-1);
+    if (galleriesContainer.querySelector(`a[href*=${mobGalleryId}]`)) continue;
+    galleriesContainer.append(mobGallery);
   }
 }
 
-const overwrite1 = (x: string) => `@media only screen and (max-width: 1280px) {
-  #categories-page.inner ${x} }`;
-
-rules.dataManager.dataFilter.createCssFilters(overwrite1);
-
 GM_addStyle(`
 .img-container, .desktop-thumb { min-height: 150px; max-height: 150px; }
 

package/src/userscripts/scripts/namethatporn.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'NameThatPorn PervertMonkey',
-  version: '3.0.19',
+  version: '3.0.20',
   description: 'Infinite scroll [optional], Filter by Title, Uploader and Solved/Unsolved',
   match: ['https://namethatporn.com/*'],
 };

package/src/userscripts/scripts/nhentai.ts

@@ -4,7 +4,7 @@ import { parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'NHentai PervertMonkey',
-  version: '4.0.19',
+  version: '4.0.20',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.nhentai.net/*', 'https://*.nhentai.*/*'],
 };

package/src/userscripts/scripts/obmenvsem.ts

@@ -5,7 +5,7 @@ import { fetchHtml, parseUrl } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Obmenvsem PervertMonkey',
-  version: '1.0.21',
+  version: '1.0.22',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://*.obmenvsem.com/*',

package/src/userscripts/scripts/pornhub.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'PornHub PervertMonkey',
-  version: '4.0.19',
+  version: '4.0.20',
   description:
     'Infinite scroll [optional]. Filter by Title, Uploader and Duration. Sort by Duration and Views',
   match: ['https://*.pornhub.com/*'],
@@ -20,7 +20,9 @@ const rules = new Rules({
       .filter((e) => e.children.length > 0 && e.checkVisibility())
       .sort((a, b) => b.children.length - a.children.length)?.[0] as HTMLElement,
 
-  containerHomogenity: { id: true, className: true },
+  dataManagerOptions: {
+    containerHomogenity: { id: true, className: true },
+  },
   thumbs: { selector: 'li[data-video-vkey]' },
   thumb: {
     selectors: {

package/src/userscripts/scripts/simpcity.ts

@@ -3,13 +3,72 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Simpcity PervertMonkey',
-  version: '1.0.1',
-  description: 'Infinite scroll [optional], Filter by Title',
-  match: 'https://simpcity.cr/threads/*',
+  version: '1.0.3',
+  description: 'Infinite scroll [optional], Filter by Title and Uploader, Sort by Views',
+  match: [
+    'https://simpcity.cr/threads/*',
+    'https://simpcity.cr/watched/threads*',
+    'https://simpcity.cr/forums/*',
+    'https://simpcity.cr/account/bookmarks*',
+    'https://simpcity.cr/tags/*',
+  ],
   'run-at': 'document-end',
 };
 
-const rules = new Rules({
+const IS_WATCHED_THREADS = /^\/watched\/threads/.test(location.pathname);
+const IS_FORUM_PAGE = /^\/forums\//.test(location.pathname);
+const IS_BOOKMARKS_PAGE = /^\/account\/bookmarks/.test(location.pathname);
+const IS_TAGS_PAGE = /^\/tags\//.test(location.pathname);
+
+type RulesConfig = ConstructorParameters<typeof Rules>[0];
+
+const structItemConfig: RulesConfig = {
+  containerSelectorLast: '.structItemContainer-group, .structItemContainer',
+  paginationStrategyOptions: {
+    paginationSelector: '.block-outer--after .pageNav',
+    pathnameSelector: /\/page-(\d+)\/?$/,
+  },
+  thumbs: {
+    selector: '.structItem.structItem--thread',
+  },
+  thumb: {
+    selectors: {
+      title: '.structItem-title a',
+      uploader: '.structItem-parts .username',
+      views: {
+        selector: '.structItem-cell--meta dl:nth-of-type(2) dd',
+        type: 'float',
+      },
+      replies: {
+        selector: '.structItem-cell--meta dl:nth-of-type(1) dd',
+        type: 'float',
+      },
+    },
+  },
+  gropeStrategy: 'all-in-all',
+  schemeOptions: ['Title Filter', 'Uploader Filter', 'Sort By Views', 'Badge', 'Advanced'],
+};
+
+const contentRowConfig: RulesConfig = {
+  containerSelector: 'ol.block-body, ol.listPlain',
+  paginationStrategyOptions: {
+    paginationSelector: '.block-outer--after .pageNav',
+    pathnameSelector: /\/page-(\d+)\/?$/,
+  },
+  thumbs: {
+    selector: 'li.block-row',
+  },
+  thumb: {
+    selectors: {
+      title: '.contentRow-title a',
+      uploader: '.contentRow-minor .username',
+    },
+    getUrlSelector: '.contentRow-title a',
+  },
+  schemeOptions: ['Title Filter', 'Uploader Filter', 'Badge', 'Advanced'],
+};
+
+const threadConfig: RulesConfig = {
   containerSelector: '.js-replyNewMessageContainer',
   paginationStrategyOptions: {
     paginationSelector: '.block-container + * .pageNav',
@@ -24,4 +83,12 @@ const rules = new Rules({
   },
   gropeStrategy: 'all-in-all',
   schemeOptions: ['Title Filter', 'Badge', 'Advanced'],
-});
+};
+
+const rules = new Rules(
+  IS_BOOKMARKS_PAGE || IS_TAGS_PAGE
+    ? contentRowConfig
+    : IS_WATCHED_THREADS || IS_FORUM_PAGE
+      ? structItemConfig
+      : threadConfig,
+);

package/src/userscripts/scripts/{socialmediagirls copy.ts → socialmediagirls.ts}

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Socialmediagirls PervertMonkey',
-  version: '1.0.4',
+  version: '1.0.5',
   description: 'Infinite scroll [optional], Filter by Title',
   match: 'https://forums.socialmediagirls.com/threads/*',
   'run-at': 'document-end',

package/src/userscripts/scripts/spankbang.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'SpankBang.com PervertMonkey',
-  version: '4.0.19',
+  version: '4.1.0',
   description:
     'Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views',
   match: ['https://*.spankbang.com/*', 'https://*.spankbang.*/*'],
@@ -27,9 +27,25 @@ const rules = new Rules({
   thumbImg: { strategy: 'auto' },
   gropeStrategy: 'all-in-all',
   customDataFilterFns: [
-    { qualityLow: (e, state) => !!state.qualityLow && e.quality !== '' },
-    { qualityHD: (e, state) => !!state.qualityHD && e.quality !== 'HD' },
-    { quality4k: (e, state) => !!state.quality4k && e.quality !== '4K' },
+    {
+      qualityFilter: {
+        handle(el, state) {
+          const hasAnyQualitySelected =
+            state.qualityLow ||
+            state.qualityHD ||
+            state.quality4k;
+
+          if (!hasAnyQualitySelected) return false;
+
+          return !(
+            (state.qualityLow && el.quality === '') ||
+            (state.qualityHD && el.quality === 'HD') ||
+            (state.quality4k && el.quality === '4K')
+          );
+        },
+        deps: ['qualityLow', 'qualityHD', 'quality4k'],
+      },
+    },
   ],
   schemeOptions: [
     'Title Filter',