pervert-monkey 1.0.11 → 1.0.13

package/dist/userscripts/spankbang.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         SpankBang.com PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.1
+// @version      4.0.3
 // @author       violent-orangutan
 // @description  Infinite scroll [optional]. Filter by Title and Duration
 // @license      MIT
@@ -12,14 +12,14 @@
 // @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.10/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.13/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
 // @run-at       document-idle
 // ==/UserScript==
 
-(function (core, utils) {
+(function (core) {
   'use strict';
 
   new core.Rules({
@@ -31,45 +31,13 @@
     thumb: {
       selectors: {
         title: "[title]",
+        tags: { selector: '[data-testid="title"]', type: "string" },
         duration: '[data-testid="video-item-length"]'
       }
     },
     thumbImg: { strategy: "auto" },
     gropeStrategy: "all-in-all",
-    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"],
-    animatePreview
+    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"]
   });
-  function animatePreview(container) {
-    function createPreviewElement(src) {
-      return utils.parseHtml(`
-    <div class="video-js vjs-controls-disabled vjs-workinghover vjs-v7 vjs-playing vjs-has-started mp4t_video-dimensions vjs-user-inactive"
-        id="mp4t_video" tabindex="-1" lang="en" translate="no" role="region" aria-label="Video Player"
-        style="opacity: 1;">
-        <video id="mp4t_video_html5_api" class="vjs-tech" tabindex="-1" autoplay="autoplay" muted="muted" playsinline="playsinline"
-                src="${src}">
-        </video>
-    </div>`);
-    }
-    function animateThumb(e) {
-      const src = e.querySelector("[data-preview]")?.getAttribute("data-preview");
-      const vid = createPreviewElement(src);
-      e.append(vid);
-      return () => {
-        const v = vid.querySelector("video");
-        utils.exterminateVideo(v);
-        vid.remove();
-      };
-    }
-    utils.OnHover.create(
-      container,
-      (e) => e.tagName === "IMG",
-      (e) => {
-        const target = e;
-        const leaveTarget = target.closest(".thumb");
-        const onOverCallback = animateThumb(leaveTarget);
-        return { leaveTarget, onOverCallback };
-      }
-    );
-  }
 
-})(core, utils);
+})(core);

package/dist/userscripts/thisvid.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         ThisVid.com Improved
 // @namespace    pervertmonkey
-// @version      8.0.1
+// @version      8.0.3
 // @author       violent-orangutan
 // @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 📼
 // @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.10/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.13/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
@@ -907,8 +907,8 @@ function takeWhile(predicate) {
     },
     thumb: {
       selectors: {
-        titleSelector: ".title",
-        durationSelector: ".duration",
+        title: ".title",
+        duration: ".duration",
         private: { selector: ".private", type: "boolean" },
         hd: { selector: ".quality", type: "boolean" },
         views: { selector: ".view", type: "number" }
@@ -1157,24 +1157,22 @@ function takeWhile(predicate) {
         (_2, n) => `${utils.circularShift(parseInt(n), 6)}`
       );
     }
-    function animate(container) {
-      utils.OnHover.create(
-        container,
-        (target) => !!target.getAttribute("src"),
-        (target) => {
-          const e = target;
-          const orig = target.getAttribute("src");
-          tick.start(
-            () => iteratePreviewFrames(e),
-            () => {
-              e.src = orig;
-            }
-          );
-        },
-        () => tick.stop()
-      );
-    }
-    animate(document.querySelector(".content") || document.body);
+    const container = document.querySelector(".content") || document.body;
+    utils.OnHover.create(
+      container,
+      "div:has(> .tumbpu[title]):not(.thumbs-photo) > .tumbpu[title], .thumb-holder",
+      (target) => {
+        const img = target.querySelector("img");
+        const orig = img.getAttribute("src");
+        tick.start(
+          () => iteratePreviewFrames(img),
+          () => {
+            img.src = orig;
+          }
+        );
+        return () => tick.stop();
+      }
+    );
   }
   async function getMemberVideos(id, type = "private") {
     const { uploadedPrivate, uploadedPublic, name } = await getMemberData(id);

package/dist/userscripts/xhamster.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Xhamster Improved
 // @namespace    pervertmonkey
-// @version      5.0.2
+// @version      5.0.4
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration
 // @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.10/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.13/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
@@ -24,6 +24,7 @@
 (function (core, utils) {
   'use strict';
 
+  var _GM_addElement = (() => typeof GM_addElement != "undefined" ? GM_addElement : undefined)();
   var _unsafeWindow = (() => typeof unsafeWindow != "undefined" ? unsafeWindow : undefined)();
 
   const IS_VIDEO_PAGE = /^\/videos|moments\//.test(location.pathname);
@@ -74,8 +75,8 @@
     paginationStrategyOptions,
     getPaginationData,
     containerSelectorLast: ".thumb-list",
-    thumbs: { selector: "video-thumb" },
-thumb: {
+    thumbs: { selector: ".video-thumb" },
+    thumb: {
       selectors: {
         title: ".video-thumb-info__name,.video-thumb-info>a",
         duration: ".thumb-image-container__duration",
@@ -87,7 +88,7 @@ thumb: {
     },
     thumbImg: {
       strategy: "auto",
-      shouldDelete: "[loading]"
+      remove: "[loading]"
     },
     gropeStrategy: "all-in-all",
     customDataSelectorFns: [
@@ -118,7 +119,7 @@ thumb: {
   });
   function animatePreview() {
     function createPreviewVideoElement(src, mount) {
-      const video = GM_addElement("video", {
+      const video = _GM_addElement("video", {
         playsInline: true,
         autoplay: true,
         loop: true,
@@ -134,16 +135,12 @@ thumb: {
       );
       return () => utils.exterminateVideo(video);
     }
-    utils.OnHover.create(
-      document.body,
-      (e) => e.classList.contains("thumb-image-container__image"),
-      (e) => {
-        const videoSrc = e.parentElement?.getAttribute("data-previewvideo");
-        const onOverCallback = createPreviewVideoElement(videoSrc, e);
-        const leaveTarget = e.parentElement?.parentElement;
-        return { leaveTarget, onOverCallback };
-      }
-    );
+    utils.OnHover.create(document.body, ".video-thumb", (e) => {
+      const container = e.querySelector(".thumb-image-container__image");
+      const videoSrc = e.querySelector("[data-previewvideo]")?.getAttribute("data-previewvideo");
+      console.log(container, videoSrc);
+      return createPreviewVideoElement(videoSrc, container);
+    });
   }
   function expandMoreVideoPage() {
     utils.watchElementChildrenCount(rules.container, () => setTimeout(rules.gropeInit, 1800));

package/dist/userscripts/xvideos.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         XVideos Improved
 // @namespace    pervertmonkey
-// @version      4.0.2
+// @version      4.0.4
 // @author       violent-orangutan
 // @description  Infinite scroll [optional], Filter by Title and Duration
 // @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.10/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.13/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
@@ -74,16 +74,11 @@
     function getVideoURL(src) {
       return src.replace(/\w+\.\w+$/, () => "preview.mp4");
     }
-    utils.OnHover.create(
-      container,
-      (target) => target.tagName === "IMG" && target.id.includes("pic_"),
-      (target) => {
-        const videoSrc = getVideoURL(target.src);
-        const onOverCallback = createPreviewElement(videoSrc, target);
-        const leaveTarget = target.closest(".thumb-inside");
-        return { leaveTarget, onOverCallback };
-      }
-    );
+    utils.OnHover.create(container, "div.thumb-block[id^=video_]:not(.thumb-ad)", (target) => {
+      const img = target.querySelector("img");
+      const videoSrc = getVideoURL(img.src);
+      return createPreviewElement(videoSrc, img);
+    });
   }
 
 })(core, utils);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pervert-monkey",
   "description": "daddy told us not to be ashamed of our userscripts",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "license": "MIT",
   "keywords": [
     "userscript",

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

@@ -14,7 +14,7 @@ export class DataManager {
 
   constructor(
     private rules: Rules,
-    private parseDataParentHomogenity?: Parameters<typeof checkHomogenity>[2]
+    private parentHomogenity?: Parameters<typeof checkHomogenity>[2],
   ) {
     this.dataFilter = new DataFilter(this.rules);
   }
@@ -82,10 +82,10 @@ export class DataManager {
     const dataOffset = this.data.size;
     const fragment = document.createDocumentFragment();
     const parent = container || this.rules.container;
-    const homogenity = !!this.parseDataParentHomogenity;
+    const homogenity = !!this.parentHomogenity;
 
     for (const thumbElement of thumbs) {
-      const url = this.rules.getThumbUrl(thumbElement);
+      const url = this.rules.thumbDataParser.getUrl(thumbElement);
       if (
         !url ||
         this.data.has(url) ||
@@ -94,7 +94,7 @@ export class DataManager {
           !checkHomogenity(
             parent,
             thumbElement.parentElement as HTMLElement,
-            this.parseDataParentHomogenity as object,
+            this.parentHomogenity as object,
           ))
       ) {
         if (removeDuplicates) thumbElement.remove();

package/src/core/jabroni-config/index.ts

@@ -1,2 +1,3 @@
-export * from './default-scheme'
-export * from './default-store'
+export * from './default-scheme';
+export * from './default-store';
+export * from './jabroni-gui-controller';

package/src/core/jabroni-config/jabroni-gui-controller.ts

@@ -0,0 +1,61 @@
+import type { JabronioStore } from 'jabroni-outfit';
+import { map, Subject, scan, shareReplay, takeUntil } from 'rxjs';
+import type { DataManager } from '../data-handler';
+
+interface DirectionalEventState {
+  type?: string;
+  direction: boolean;
+}
+
+export class JabronioGuiController {
+  constructor(
+    private store: JabronioStore,
+    private dataManager: DataManager,
+  ) {
+    this.directionalEventObservable$ = this.directionalEvent();
+    this.setupStoreListeners();
+  }
+
+  private readonly destroy$ = new Subject<void>();
+
+  public dispose() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  private directionalEventObservable$?: ReturnType<typeof this.directionalEvent>;
+
+  private directionalEvent() {
+    return this.store.eventSubject.pipe(
+      scan(
+        (acc: DirectionalEventState, value: string) => ({
+          type: value,
+          direction: acc.type === value ? !acc.direction : true,
+        }),
+        { type: undefined, direction: true },
+      ),
+      map(({ type, direction }) => ({
+        type: type as keyof typeof this.eventsMap,
+        direction,
+      })),
+      shareReplay(1),
+      takeUntil(this.destroy$),
+    );
+  }
+
+  private readonly eventsMap = {
+    'sort by duration': (direction: boolean) =>
+      this.dataManager.sortBy('duration', direction),
+    'sort by views': (direction: boolean) => this.dataManager.sortBy('views', direction),
+  } as const;
+
+  private setupStoreListeners() {
+    this.directionalEventObservable$?.subscribe((e) => {
+      this.eventsMap[e.type](e.direction);
+    });
+
+    this.store.stateSubject.pipe(takeUntil(this.destroy$)).subscribe((a) => {
+      this.dataManager.applyFilters(a as { [key: string]: boolean });
+    });
+  }
+}

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

@@ -1,4 +1,5 @@
 import {
+  parseNumberWithLetter,
   querySelectorLast,
   querySelectorText,
   sanitizeStr,
@@ -6,7 +7,7 @@ import {
 } from '../../utils';
 
 type Primitive = string | number | boolean;
-type PrimitiveString = 'boolean' | 'string' | 'number' | 'duration';
+type PrimitiveString = 'boolean' | 'string' | 'number' | 'float' | 'duration';
 type ThumbData = Record<string, Primitive>;
 type ThumbDataSelector = {
   name: string;
@@ -25,6 +26,10 @@ export class ThumbDataParser {
     return { title, duration };
   }
 
+  public getUrl(thumb: HTMLElement | HTMLAnchorElement) {
+    return ((thumb.querySelector('a[href]') || thumb) as HTMLAnchorElement).href;
+  }
+
   private preprocessCustomThumbDataSelectors() {
     if (!this.selectors) return;
     Object.entries(this.selectors).forEach(([key, value]) => {
@@ -66,6 +71,10 @@ export class ThumbDataParser {
     if (type === 'duration') {
       return timeToSeconds(querySelectorText(thumb, selector));
     }
+    if (type === 'float') {
+      const value = querySelectorText(thumb, selector);
+      return parseNumberWithLetter(value);
+    }
     return Number.parseInt(querySelectorText(thumb, selector));
   }
 

package/src/core/rules/index.ts

@@ -6,20 +6,21 @@ import {
 } from '../../utils';
 import { DataManager, type DataSelectorFn } from '../data-handler';
 import { InfiniteScroller, type OffsetGenerator } from '../infinite-scroll';
-import { DefaultScheme, type SchemeOptions, StoreStateDefault } from '../jabroni-config';
+import {
+  DefaultScheme,
+  JabronioGuiController,
+  type SchemeOptions,
+  StoreStateDefault,
+} from '../jabroni-config';
 import {
   getPaginationStrategy,
   type PaginationStrategy,
   ThumbDataParser,
   ThumbImgParser,
-  ThumbsParser
+  ThumbsParser,
 } from '../parsers';
 
 export class Rules {
-  public getThumbUrl(thumb: HTMLElement | HTMLAnchorElement) {
-    return ((thumb.querySelector('a[href]') || thumb) as HTMLAnchorElement).href;
-  }
-
   public thumb: Parameters<typeof ThumbDataParser.create>[0] = {};
   public thumbDataParser: ThumbDataParser;
 
@@ -73,6 +74,7 @@ export class Rules {
   public schemeOptions: SchemeOptions = [];
   public store: JabronioStore;
   public gui: JabronioGUI;
+  public inputController: JabronioGuiController;
 
   private createStore() {
     const config = { ...StoreStateDefault, ...this.storeOptions };
@@ -117,35 +119,6 @@ export class Rules {
     return window.self !== window.top;
   }
 
-  private setupStoreListeners() {
-    const eventsMap = {
-      'sort by duration': {
-        action: (direction: boolean) => this.dataManager.sortBy('duration', direction),
-      },
-    };
-
-    let lastEvent: undefined | string;
-    let direction = true;
-
-    this.store.eventSubject.subscribe((event) => {
-      if (event === lastEvent) {
-        direction = !direction;
-      } else {
-        lastEvent = event;
-        direction = true;
-      }
-
-      if (event in eventsMap) {
-        const ev = eventsMap[event as keyof typeof eventsMap];
-        ev?.action(direction);
-      }
-    });
-
-    this.store.stateSubject.subscribe((a) => {
-      this.dataManager.applyFilters(a as { [key: string]: boolean });
-    });
-  }
-
   private mutationObservers: MutationObserver[] = [];
 
   public resetOnPaginationOrContainerDeath = true;
@@ -171,8 +144,6 @@ export class Rules {
   public onResetCallback?: () => void;
 
   private reset() {
-    // console.log('\nRESET\n');
-
     this.mutationObservers.forEach((o) => {
       o.disconnect();
     });
@@ -181,7 +152,9 @@ export class Rules {
     this.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
 
     this.dataManager = new DataManager(this, this.dataHomogenity);
-    this.setupStoreListeners();
+
+    this.inputController.dispose();
+    this.inputController = new JabronioGuiController(this.store, this.dataManager);
 
     this.resetInfiniteScroller();
 
@@ -209,8 +182,8 @@ export class Rules {
     this.gui = this.createGui();
 
     this.dataManager = new DataManager(this, this.dataHomogenity);
+    this.inputController = new JabronioGuiController(this.store, this.dataManager);
 
     this.reset();
-    // console.log('data', this.dataManager.data.values().toArray());
   }
 }

package/src/userscripts/index.ts

@@ -1 +1 @@
-import './scripts/eporner'
+import './scripts/motherless'

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.2',
+  version: '1.0.4',
   description: 'Infinite scroll [optional], Filter by Title',
   match: 'https://*.3hentai.net/*',
 };
@@ -12,12 +12,12 @@ export const meta: MonkeyUserScript = {
 const rules = new Rules({
   containerSelectorLast: '.listing-container',
   thumbs: {
-    selector: '.doujin-col'
+    selector: '.doujin-col',
   },
   thumb: {
     selectors: {
       title: '.title',
-    }
+    },
   },
   thumbImg: {
     strategy: 'auto',
@@ -33,27 +33,23 @@ function animatePreview() {
   const end = 9999;
 
   function rotate(src: string) {
-    return src.replace(/(\d+)(?=t\.jpg$)/,
-      (_, n) => `${circularShift(parseInt(n), end)}`);
+    return src.replace(/(\d+)(?=t\.jpg$)/, (_, n) => `${circularShift(parseInt(n), end)}`);
   }
 
-  OnHover.create(
-    document.body,
-    (e) => e instanceof HTMLImageElement && e.src.endsWith('.jpg'),
-    (e) => {
-      const t = e as HTMLImageElement;
-      const origin = t.src;
-      t.src = t.src.replace(/\w+\.\w+$/, '1t.jpg');
-      t.onerror = (_) => tick.stop();
-      tick.start(
-        () => {
-          t.src = rotate(t.src);
-        },
-        () => {
-          t.src = origin;
-        },
-      );
-    },
-    (_) => tick.stop()
-  );
+  OnHover.create(document.body, '.doujin-col', (e) => {
+    const img = e.querySelector('img') as HTMLImageElement;
+    const origin = img.src;
+    img.src = img.src.replace(/\w+\.\w+$/, '1t.jpg');
+    img.onerror = (_) => tick.stop();
+    tick.start(
+      () => {
+        img.src = rotate(img.src);
+      },
+      () => {
+        img.src = origin;
+      },
+    );
+
+    return () => tick.stop();
+  });
 }

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.0',
+  version: '1.6.2',
   description:
     'Adds model links for CamWhores, webcamrecordings, recu.me, camvideos, privat-zapisi',
   match: ['https://camgirlfinder.net/*'],

package/src/userscripts/scripts/camwhores.ts

@@ -17,7 +17,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'CamWhores PervertMonkey',
-  version: '3.0.4',
+  version: '3.0.6',
   description:
     'Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Mass friend request button. Download button',
   match: ['https://*.camwhores.tv', 'https://*.camwhores.*/*'],
@@ -48,7 +48,7 @@ const rules = new Rules({
   },
   thumbs: {
     selector:
-      '.list-videos .item, .playlist .item, .list-playlists > div > .item, .item:has(.title)'
+      '.list-videos .item, .playlist .item, .list-playlists > div > .item, .item:has(.title)',
   },
   thumb: {
     strategy: 'auto-select',
@@ -108,28 +108,21 @@ function animatePreview(container: HTMLElement) {
 
   OnHover.create(
     container,
-    (target) =>
-      target.tagName === 'IMG' &&
-      target.classList.contains('thumb') &&
-      !!target.getAttribute('src') &&
-      !/data:image|avatar/.test(target.getAttribute('src') as string),
-    (_target) => {
-      const target = _target as HTMLImageElement;
-      const origin = target.src;
-      const count = parseInt(target.getAttribute('data-cnt') as string) || 5;
+    '.list-videos .item, .playlist .item, .list-playlists > div > .item, .item:has(.title)',
+    (e) => {
+      const img = e.querySelector('img') as HTMLImageElement;
+      const origin = img.src;
+      const count = parseInt(img.getAttribute('data-cnt') as string) || 5;
       tick.start(
         () => {
-          target.src = rotateImg(target.src, count);
+          img.src = rotateImg(img.src, count);
         },
         () => {
-          target.src = origin;
+          img.src = origin;
         },
       );
-      return {
-        leaveTarget: target.closest('.item') as HTMLElement,
-      };
+      return () => tick.stop();
     },
-    () => tick.stop(),
   );
 }
 

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.0',
+  version: '1.0.2',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.e-hentai.org/*'],
 };