pervert-monkey 1.0.11 → 1.0.13

package/src/userscripts/scripts/ebalka.ts

@@ -4,7 +4,7 @@ import { exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Ebalka PervertMonkey',
-  version: '3.0.1',
+  version: '3.0.3',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: [
     'https://b.ebalka.zip/*',
@@ -21,13 +21,13 @@ const rules = new Rules({
     paginationSelector: '.pagination:not([id *= member])',
   },
   thumbs: {
-    selector: '.card_video'
+    selector: '.card_video',
   },
   thumb: {
     selectors: {
       title: '.card__title',
       duration: '.card__spot > span:last-child',
-    }
+    },
   },
   animatePreview,
   schemeOptions: ['Text Filter', 'Badge', 'Duration Filter', 'Advanced'],
@@ -50,13 +50,8 @@ function animatePreview(container: HTMLElement) {
     };
   }
 
-  OnHover.create(
-    container,
-    (target) => target.tagName === 'IMG',
-    (target) => {
-      const thumb = target.closest('.card') as HTMLElement;
-      const onOverCallback = animateThumb(thumb);
-      return { leaveTarget: thumb, onOverCallback };
-    },
-  );
+  OnHover.create(container, '.card_video', (target) => {
+    const thumb = target.closest('.card') as HTMLElement;
+    return animateThumb(thumb);
+  });
 }

package/src/userscripts/scripts/eporner.ts

@@ -5,7 +5,7 @@ import { OnHover } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Eporner PervertMonkey',
-  version: '2.0.2',
+  version: '2.0.4',
   description: 'Infinite scroll [optional], Filter by Title, Duration and HD',
   match: ['https://*.eporner.com/*', 'https://*.eporner.*/*'],
 };
@@ -16,6 +16,7 @@ const rules = new Rules({
   paginationStrategyOptions: {
     paginationSelector: '.numlist2',
   },
+  thumbs: { selector: 'div[id^=vf][data-id]' },
   thumb: {
     selectors: {
       quality: { type: 'number', selector: '[title="Quality"]' },
@@ -28,9 +29,6 @@ const rules = new Rules({
     strategy: 'auto',
     remove: 'auto',
   },
-  thumbs: {
-    selector: 'div[id^=vf][data-id]',
-  },
   containerSelectorLast: '#vidresults',
   customDataSelectorFns: [
     'filterInclude',
@@ -82,14 +80,10 @@ const rules = new Rules({
 });
 
 function animatePreview(doc: HTMLElement) {
-  OnHover.create(
-    doc,
-    (e) => e instanceof HTMLImageElement,
-    (e) => {
-      const target = e as HTMLImageElement;
-      const thumb = target.closest('[data-id]');
-      const id = thumb?.getAttribute('data-id');
-      show_video_prev(id);
-    },
-  );
+  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);
+  });
 }

package/src/userscripts/scripts/erome.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Erome PervertMonkey',
-  version: '5.0.1',
+  version: '5.0.3',
   description: 'Infinite scroll [optional], Filter by Title and Video/Photo albums',
   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.1',
+  version: '2.0.3',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: ['https://*.eroprofile.com/*'],
 };
@@ -20,7 +20,7 @@ const rules = new Rules({
     selectors: {
       title: '[title]',
       duration: '.videoDur',
-    }
+    },
   },
   containerSelector: '.videoGrid',
   customDataSelectorFns: ['filterInclude', 'filterExclude', 'filterDuration'],
@@ -31,7 +31,7 @@ const rules = new Rules({
       title: 'Sort By ',
       content: [
         {
-          'sort by duration': () => { },
+          'sort by duration': () => {},
         },
       ],
     },

package/src/userscripts/scripts/javhdporn.ts

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

package/src/userscripts/scripts/missav.ts

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

package/src/userscripts/scripts/motherless.ts

@@ -5,7 +5,7 @@ import { fetchWith, OnHover, replaceElementTag, Tick } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Motherless PervertMonkey',
-  version: '5.0.2',
+  version: '5.0.4',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: ['https://motherless.com/*'],
   grant: ['GM_addElement', 'GM_addStyle', 'unsafeWindow'],
@@ -22,6 +22,7 @@ const rules = new Rules({
       uploader: '.uploader',
       title: '.title',
       duration: '.size',
+      views: { selector: '.hits', type: 'float' },
     },
   },
   thumbImg: { strategy: 'auto' },
@@ -30,32 +31,19 @@ const rules = new Rules({
   },
   animatePreview,
   gropeStrategy: 'all-in-all',
-  schemeOptions: ['Text Filter', 'Duration Filter', 'Badge', 'Advanced'],
+  schemeOptions: ['Text Filter', 'Sort By', 'Duration Filter', 'Badge', 'Advanced'],
 });
 
 function animatePreview(_: HTMLElement) {
-  const ANIMATION_INTERVAL = 500;
-  const tick = new Tick(ANIMATION_INTERVAL);
-  let currentOverlay: HTMLElement | null = null;
-
-  function onLeave(target: HTMLElement) {
-    tick.stop();
-
-    const img = target.querySelector('img.static') as HTMLElement;
-    img.classList.remove('animating');
-
-    if (currentOverlay) {
-      currentOverlay.style.display = 'none';
-    }
-  }
+  const tick = new Tick(500);
 
   function onOver(target: HTMLElement) {
     $('.video').off();
-    const container = target.closest('.desktop-thumb.video') as HTMLElement;
+    const container = target.querySelector('.desktop-thumb.video') as HTMLElement;
     const img = container.querySelector('img.static') as HTMLImageElement;
     const stripSrc = img.getAttribute('data-strip-src');
 
-    img.classList.add('animating');
+    container.classList.toggle('animating');
 
     let overlay = img.nextElementSibling as HTMLElement;
     if (!overlay || overlay.tagName !== 'DIV') {
@@ -64,54 +52,37 @@ function animatePreview(_: HTMLElement) {
         'style',
         'z-index: 8; position: absolute; top: 0; left: 0; pointer-events: none;',
       );
-      img.parentNode?.insertBefore(overlay, img.nextSibling);
+      img.after(overlay);
     }
 
-    currentOverlay = overlay;
     overlay.style.display = 'block';
 
     let j = 0;
-    const containerHeight = container.offsetHeight;
+    const containerHeight = container.offsetHeight + 20;
+    const w = img.offsetWidth;
+    const h = img.offsetHeight;
+    const widthRatio = Math.floor((1000.303 * w) / 100);
+    const heightRatio = Math.floor((228.6666 * h) / 100);
+    const verticalOffset = (containerHeight - h) / 2;
 
     tick.start(() => {
-      const w = img.offsetWidth;
-      const h = img.offsetHeight;
-
-      const widthRatio = Math.floor((1000.303 * w) / 100);
-      const heightRatio = Math.floor((228.6666 * h) / 100);
-
-      const verticalOffset = (containerHeight - h) / 2;
-
       Object.assign(overlay.style, {
         width: `${w}px`,
         height: `${containerHeight}px`,
         backgroundImage: `url('${stripSrc}')`,
         backgroundSize: `${widthRatio}px ${heightRatio}px`,
         backgroundPosition: `-${(j++ * w) % widthRatio}px ${verticalOffset}px`,
-        backgroundRepeat: 'no-repeat',
       });
     });
 
-    const onOverCallback = () => onLeave(container);
-    return { onOverCallback, leaveTarget: container };
+    return () => {
+      tick.stop();
+      container.classList.toggle('animating');
+      overlay.style.display = 'none';
+    };
   }
 
-  OnHover.create(
-    document.body,
-    (e) => {
-      const container = e.closest('.desktop-thumb.video') as HTMLElement;
-      if (!container) return false;
-
-      const img = container.querySelector('img.static') as HTMLImageElement;
-      if (!img) return false;
-
-      const stripSrc = img.getAttribute('data-strip-src');
-      if (!stripSrc || img.classList.contains('animating')) return false;
-
-      return true;
-    },
-    onOver,
-  );
+  OnHover.create(document.body, '.thumb-container, .mobile-thumb', onOver);
 }
 
 //====================================================================================================

package/src/userscripts/scripts/namethatporn.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'NameThatPorn PervertMonkey',
-  version: '3.0.1',
+  version: '3.0.3',
   description: 'Infinite scroll [optional], Filter by Title and Un/Solved',
   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.1',
+  version: '4.0.3',
   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: 'Obmensvem PervertMonkey',
-  version: '1.0.1',
+  version: '1.0.3',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: ['https://*.obmenvsem.com/*', 'https://*.obmenvsem.*/*'],
   grant: ['GM_addStyle', 'GM_addElement', 'unsafeWindow'],

package/src/userscripts/scripts/pornhub.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'PornHub PervertMonkey',
-  version: '4.0.1',
+  version: '4.0.3',
   description: 'Infinite scroll [optional]. Filter by Title and Duration',
   match: ['https://*.pornhub.com/*'],
   exclude: 'https://*.pornhub.com/embed/*',

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.1',
+  version: '4.0.3',
   description: 'Infinite scroll [optional]. Filter by Title and Duration',
   match: ['https://*.spankbang.com/*', 'https://*.spankbang.*/*'],
 };

package/src/userscripts/scripts/thisvid.ts

@@ -21,7 +21,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'ThisVid.com Improved',
-  version: '8.0.1',
+  version: '8.0.3',
   description:
     'Infinite scroll [optional]. Preview for private videos. Filter: title, duration, public/private. Check access to private vids. Mass friend request button. Sorts messages. Download button 📼',
   match: ['https://*.thisvid.com/*'],
@@ -390,25 +390,24 @@ function animatePreview(_: HTMLElement) {
     );
   }
 
-  function animate(container: HTMLElement) {
-    OnHover.create(
-      container,
-      (target) => !!target.getAttribute('src'),
-      (target) => {
-        const e = target as HTMLImageElement;
-        const orig = target.getAttribute('src') as string;
-        tick.start(
-          () => iteratePreviewFrames(e),
-          () => {
-            e.src = orig;
-          },
-        );
-      },
-      () => tick.stop(),
-    );
-  }
+  const container = document.querySelector<HTMLElement>('.content') || document.body;
+
+  OnHover.create(
+    container,
+    'div:has(> .tumbpu[title]):not(.thumbs-photo) > .tumbpu[title], .thumb-holder',
+    (target) => {
+      const img = target.querySelector('img') as HTMLImageElement;
+      const orig = img.getAttribute('src') as string;
+      tick.start(
+        () => iteratePreviewFrames(img),
+        () => {
+          img.src = orig;
+        },
+      );
 
-  animate(document.querySelector('.content') || document.body);
+      return () => tick.stop();
+    },
+  );
 }
 
 //====================================================================================================

package/src/userscripts/scripts/xhamster.ts

@@ -11,10 +11,11 @@ import {
   waitForElementToAppear,
   watchElementChildrenCount,
 } from '../../utils';
+import { findSelfOrChild } from '../../utils/dom';
 
 export const meta: MonkeyUserScript = {
   name: 'Xhamster Improved',
-  version: '5.0.2',
+  version: '5.0.4',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: ['https://*.xhamster.com/*', 'https://*.xhamster.*/*'],
   exclude: 'https://*.xhamster.com/embed*',
@@ -150,16 +151,14 @@ function animatePreview() {
     return () => exterminateVideo(video);
   }
 
-  OnHover.create(
-    document.body,
-    (e) => e.classList.contains('thumb-image-container__image'),
-    (e) => {
-      const videoSrc = e.parentElement?.getAttribute('data-previewvideo') as string;
-      const onOverCallback = createPreviewVideoElement(videoSrc, e);
-      const leaveTarget = e.parentElement?.parentElement as HTMLElement;
-      return { leaveTarget, onOverCallback };
-    },
-  );
+  OnHover.create(document.body, '.video-thumb', (e) => {
+    const container = e.querySelector('.thumb-image-container__image') as HTMLElement;
+    const videoSrc = e
+      .querySelector('[data-previewvideo]')
+      ?.getAttribute('data-previewvideo') as string;
+    console.log(container, videoSrc);
+    return createPreviewVideoElement(videoSrc, container);
+  });
 }
 
 function expandMoreVideoPage() {

package/src/userscripts/scripts/xvideos.ts

@@ -5,7 +5,7 @@ import { exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'XVideos Improved',
-  version: '4.0.2',
+  version: '4.0.4',
   description: 'Infinite scroll [optional], Filter by Title and Duration',
   match: 'https://*.xvideos.com/*',
 };
@@ -67,14 +67,9 @@ function animatePreview(container: HTMLElement) {
     return src.replace(/\w+\.\w+$/, () => 'preview.mp4');
   }
 
-  OnHover.create(
-    container,
-    (target) => target.tagName === 'IMG' && target.id.includes('pic_'),
-    (target) => {
-      const videoSrc = getVideoURL((target as HTMLImageElement).src);
-      const onOverCallback = createPreviewElement(videoSrc, target);
-      const leaveTarget = target.closest('.thumb-inside') as HTMLElement;
-      return { leaveTarget, onOverCallback };
-    },
-  );
+  OnHover.create(container, 'div.thumb-block[id^=video_]:not(.thumb-ad)', (target) => {
+    const img = target.querySelector('img') as HTMLImageElement;
+    const videoSrc = getVideoURL(img.src);
+    return createPreviewElement(videoSrc, img);
+  });
 }

package/src/utils/dom/index.ts

@@ -8,6 +8,16 @@ export {
   watchElementChildrenCount,
 } from './dom-observers';
 
+export function findSelfOrChild<T extends HTMLElement>(
+  element: T,
+  selector: string,
+): T | null {
+  if (element.matches(selector)) {
+    return element as T;
+  }
+  return element.querySelector<T>(selector);
+}
+
 export function querySelectorLast<T extends Element = HTMLElement>(
   root: ParentNode = document,
   selector: string,

package/src/utils/events/on-hover.ts

@@ -1,39 +1,31 @@
 export class OnHover {
-  private handleLeaveEvent() {
-    this.onLeave?.(this.target as HTMLElement);
-    this.onOverFinally?.();
+  private handleLeave() {
+    this.onOverCallback?.();
+    this.onOverCallback = undefined;
     this.target = undefined;
-    this.onOverFinally = undefined;
-    this.leaveSubject = undefined;
   }
 
-  private handleEvent(e: PointerEvent) {
-    const currentTarget = e.target as HTMLElement;
-    if (!this.subjectSelector(currentTarget) || this.target === currentTarget) return;
-    this.leaveSubject?.dispatchEvent(new PointerEvent('pointerleave'));
+  private handleHover(e: PointerEvent) {
+    const newTarget = (e.target as HTMLElement).closest<HTMLElement>(this.targetSelector);
+    if (!newTarget || this.target === newTarget) return;
 
-    this.target = currentTarget;
-    const result = this.onOver(this.target);
-    this.onOverFinally = result?.onOverCallback;
-    this.leaveSubject = result?.leaveTarget || this.target;
-    this.leaveSubject.addEventListener('pointerleave', (_) => this.handleLeaveEvent(), {
-      once: true,
-    });
+    this.target?.dispatchEvent(new PointerEvent('pointerleave'));
+    this.target = newTarget;
+
+    this.onOverCallback = this.onOver(this.target) as undefined | (() => void);
+
+    this.target.addEventListener('pointerleave', () => this.handleLeave(), { once: true });
   }
 
-  private target: HTMLElement | undefined;
-  private leaveSubject: HTMLElement | undefined;
-  private onOverFinally: (() => void) | undefined;
+  private target?: HTMLElement;
+  private onOverCallback?: () => void;
 
   constructor(
     private container: HTMLElement,
-    private subjectSelector: (target: HTMLElement) => boolean,
-    private onOver: (
-      target: HTMLElement,
-    ) => void | { onOverCallback?: () => void; leaveTarget?: HTMLElement },
-    private onLeave?: (target: HTMLElement) => void,
+    private targetSelector: string,
+    private onOver: (target: HTMLElement) => void | (() => void),
   ) {
-    this.container.addEventListener('pointerover', (e) => this.handleEvent(e));
+    this.container.addEventListener('pointerover', (e) => this.handleHover(e));
   }
 
   static create(...args: ConstructorParameters<typeof OnHover>) {

package/src/utils/events/tick.ts

@@ -18,9 +18,7 @@ export class Tick {
     if (this.tick !== undefined) {
       clearInterval(this.tick);
       this.tick = undefined;
-    }
-    if (this.callbackFinal) {
-      this.callbackFinal();
+      this.callbackFinal?.();
       this.callbackFinal = undefined;
     }
   }

package/src/utils/parsers/index.ts

@@ -9,6 +9,22 @@ export function parseIntegerOr(n: string | number, or: number): number {
   return Number.isSafeInteger(num) ? num : or;
 }
 
+export function parseNumberWithLetter(str: string): number {
+  const multipliers = { k: 1e3, m: 1e6 } as const;
+  const match = str.trim().match(/^([\d.]+)(\w)?$/);
+
+  if (!match) return 0;
+
+  const num = parseFloat(match[1]);
+  const suffix = match[2]?.toLowerCase() as keyof typeof multipliers;
+
+  if (suffix && suffix in multipliers) {
+    return num * multipliers[suffix];
+  }
+
+  return num;
+}
+
 // "data:02;body+head:async;void:;zero:;"
 export function parseDataParams(str: string): Record<string, string> {
   const paramsStr = decodeURI(str.trim()).split(';');