pervert-monkey 1.0.13 → 1.0.17

package/dist/userscripts/obmenvsem.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         Obmensvem PervertMonkey
 // @namespace    pervertmonkey
-// @version      1.0.3
+// @version      1.0.8
 // @author       violent-orangutan
-// @description  Infinite scroll [optional], Filter by Title and Duration
+// @description  Infinite scroll [optional], Filter by Title and Duration, Sort by Duration
 // @license      MIT
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=obmenvsem.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -12,7 +12,8 @@
 // @supportURL   https://github.com/smartacephale/sleazy-fork/issues
 // @match        https://*.obmenvsem.com/*
 // @match        https://*.obmenvsem.*/*
-// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.13/dist/core/pervertmonkey.core.umd.js
+// @match        https://*.obmenvsems.*/*
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -77,7 +78,13 @@
         return img.src;
       }
     },
-    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"]
+    schemeOptions: [
+      "Title Filter",
+      "Duration Filter",
+      "Sort By Duration",
+      "Badge",
+      "Advanced"
+    ]
   });
 
 })(core, utils);

package/dist/userscripts/pornhub.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         PornHub PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.3
+// @version      4.0.7
 // @author       violent-orangutan
-// @description  Infinite scroll [optional]. Filter by Title and Duration
+// @description  Infinite scroll [optional]. Filter by Title, Uploader and Duration. Sort by Duration and Views
 // @license      MIT
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=pornhub.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -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.13/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -28,20 +28,28 @@
       overwritePaginationLast: (n) => n === 9 ? 9999 : n
     },
     containerSelector: () => [...document.querySelectorAll("ul:has(> li[data-video-vkey])")].filter((e) => e.children.length > 0 && e.checkVisibility()).pop(),
-    dataHomogenity: { id: true, className: true },
+    containerHomogenity: { id: true, className: true },
     thumbs: { selector: "li[data-video-vkey]" },
     thumb: {
       selectors: {
         title: "span.title",
         uploader: ".usernameWrap",
-        duration: ".duration"
+        duration: ".duration",
+        views: { selector: ".views", type: "float" }
       }
     },
     thumbImg: {
       selector: ["data-mediumthumb", "data-image"]
     },
     gropeStrategy: "all-in-all",
-    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"]
+    schemeOptions: [
+      "Title Filter",
+      "Uploader Filter",
+      "Duration Filter",
+      "Sort By",
+      "Badge",
+      "Advanced"
+    ]
   });
   function bypassAgeVerification() {
     cookieStore.set({

package/dist/userscripts/spankbang.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         SpankBang.com PervertMonkey
 // @namespace    pervertmonkey
-// @version      4.0.3
+// @version      4.0.7
 // @author       violent-orangutan
-// @description  Infinite scroll [optional]. Filter by Title and Duration
+// @description  Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views
 // @license      MIT
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=spankbang.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -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.13/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -22,7 +22,7 @@
 (function (core) {
   'use strict';
 
-  new core.Rules({
+  const rules = new core.Rules({
     containerSelector: ".main-container .js-media-list, .main_content_container .video-list",
     paginationStrategyOptions: {
       paginationSelector: ".paginate-bar, .pagination"
@@ -31,13 +31,34 @@
     thumb: {
       selectors: {
         title: "[title]",
-        tags: { selector: '[data-testid="title"]', type: "string" },
-        duration: '[data-testid="video-item-length"]'
+        duration: '[data-testid="video-item-length"]',
+views: { selector: '[data-testid="views"]', type: "float" },
+        quality: { selector: '[data-testid="video-item-resolution"]', type: "string" }
       }
     },
     thumbImg: { strategy: "auto" },
     gropeStrategy: "all-in-all",
-    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"]
+    customDataFilterFns: [
+      { qualityLow: (e, state) => !!state.qualityLow && e.quality !== "" },
+      { qualityHD: (e, state) => !!state.qualityHD && e.quality !== "HD" },
+      { quality4k: (e, state) => !!state.quality4k && e.quality !== "4K" }
+    ],
+    schemeOptions: [
+      "Title Filter",
+      "Duration Filter",
+      {
+        title: "Quality Filter",
+        content: [
+          { qualityLow: false, label: "Low" },
+          { qualityHD: false, label: "HD" },
+          { quality4k: false, label: "4K" }
+        ]
+      },
+      "Sort By",
+      "Badge",
+      "Advanced"
+    ]
   });
+  console.log(rules.dataManager.data.values().toArray());
 
 })(core);

package/dist/userscripts/thisvid.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         ThisVid.com Improved
 // @namespace    pervertmonkey
-// @version      8.0.3
+// @version      8.0.7
 // @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 📼
+// @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
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=thisvid.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -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.13/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -929,36 +929,17 @@ function takeWhile(predicate) {
         return { img, imgSrc };
       }
     },
-    containerSelectorLast: ".thumbs-items",
+    containerSelector: () => utils.querySelectorLast(
+      document,
+      "div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)"
+    ) || document.querySelector(".thumbs-items"),
     animatePreview,
-    customDataSelectorFns: [
-      "filterInclude",
-      "filterExclude",
-      "filterDuration",
-      {
-        filterPrivate: (el, state) => state.filterPrivate && el.private
-      },
-      {
-        filterPublic: (el, state) => state.filterPublic && !el.private
-      },
-      {
-        filterHD: (el, state) => state.filterHD && !el.hd
-      },
-      {
-        filterNonHD: (el, state) => state.filterNonHD && el.hd
-      }
-    ],
     schemeOptions: [
-      "Text Filter",
+      "Title Filter",
       "Duration Filter",
       "Privacy Filter",
-      {
-        title: "HD Filter",
-        content: [
-          { filterHD: false, label: "hd" },
-          { filterNonHD: false, label: "non-hd" }
-        ]
-      },
+      "HD Filter",
+      "Sort By",
       "Badge",
       {
         title: "Advanced",
@@ -1014,9 +995,9 @@ function takeWhile(predicate) {
     }
     return g();
   }
-  function getMembers(el) {
-    const friendsList = el.querySelector("#list_members_friends_items") || el;
-    return Array.from(friendsList.querySelectorAll(".tumbpu") || []).map((e) => e.href.match(/\d+/)?.[0]).filter((_) => _);
+  function getMembers(e) {
+    const friendsList = e.querySelector("#list_members_friends_items") || e;
+    return Array.from(friendsList.querySelectorAll(".tumbpu") || []).map((e2) => e2.href.match(/\d+/)?.[0]).filter((_) => _);
   }
   async function friendMemberFriends(orientationFilter) {
     const memberId = window.location.pathname.match(/\d+/)?.[0];
@@ -1164,6 +1145,7 @@ function takeWhile(predicate) {
       (target) => {
         const img = target.querySelector("img");
         const orig = img.getAttribute("src");
+        if (!orig) return;
         tick.start(
           () => iteratePreviewFrames(img),
           () => {
@@ -1322,7 +1304,7 @@ function takeWhile(predicate) {
         paginationSelector: ".footer"
       },
       schemeOptions: [
-        "Text Filter",
+        "Title Filter",
         "Duration Filter",
         "Privacy Filter",
         "Badge",

package/dist/userscripts/xhamster.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         Xhamster Improved
 // @namespace    pervertmonkey
-// @version      5.0.4
+// @version      5.0.8
 // @author       violent-orangutan
-// @description  Infinite scroll [optional], Filter by Title and Duration
+// @description  Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views
 // @license      MIT
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=xhamster.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -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.13/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -80,10 +80,8 @@
       selectors: {
         title: ".video-thumb-info__name,.video-thumb-info>a",
         duration: ".thumb-image-container__duration",
-        watched: {
-          type: "boolean",
-          selector: '[data-role="video-watched'
-        }
+        watched: { selector: '[data-role="video-watched', type: "boolean" },
+        views: { selector: ".video-thumb-views", type: "float" }
       }
     },
     thumbImg: {
@@ -91,20 +89,16 @@
       remove: "[loading]"
     },
     gropeStrategy: "all-in-all",
-    customDataSelectorFns: [
-      "filterInclude",
-      "filterExclude",
-      "filterDuration",
+    customDataFilterFns: [
       {
-        filterWatched: (el, state) => !!(state.filterWatched && el.watched)
+        filterWatched: (e, state) => !!(state.filterWatched && e.watched)
       },
       {
-        filterUnwatched: (el, state) => !!(state.filterUnwatched && !el.watched)
+        filterUnwatched: (e, state) => !!(state.filterUnwatched && !e.watched)
       }
     ],
     schemeOptions: [
-      "Text Filter",
-      "Badge",
+      "Title Filter",
       {
         title: "Filter Watched",
         content: [
@@ -112,7 +106,9 @@
           { filterUnwatched: false, label: "unwatched" }
         ]
       },
+      "Sort By",
       "Duration Filter",
+      "Badge",
       "Advanced"
     ],
     animatePreview
@@ -138,17 +134,16 @@
     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));
-    utils.waitForElementToAppear(document.body, 'button[data-role="show-more-next"]', (el) => {
+    utils.waitForElementToAppear(document.body, 'button[data-role="show-more-next"]', (e) => {
       const observer = new utils.Observer((target) => {
         target.click();
       });
-      observer.observe(el);
+      observer.observe(e);
     });
   }
   if (IS_VIDEO_PAGE) {

package/dist/userscripts/xvideos.user.js

@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name         XVideos Improved
 // @namespace    pervertmonkey
-// @version      4.0.4
+// @version      4.0.8
 // @author       violent-orangutan
-// @description  Infinite scroll [optional], Filter by Title and Duration
+// @description  Infinite scroll [optional], Filter by Title, Uploader and Duration. Sort by Duration and Views.
 // @license      MIT
 // @icon         https://www.google.com/s2/favicons?sz=64&domain=xvideos.com
 // @homepage     https://github.com/smartacephale/sleazy-fork
@@ -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.13/dist/core/pervertmonkey.core.umd.js
+// @require      https://cdn.jsdelivr.net/npm/pervert-monkey@1.0.17/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
@@ -35,7 +35,9 @@
       selectors: {
         title: "[class*=title]",
         uploader: "[class*=name]",
-        duration: "[class*=duration]"
+        duration: "[class*=duration]",
+        views: { selector: ".metadata a ~ span", type: "float" },
+        quality: { selector: ".video-hd-mark", type: "string" }
       },
       callback: (thumb) => {
         setTimeout(() => {
@@ -44,7 +46,33 @@
         }, 200);
       }
     },
-    schemeOptions: ["Text Filter", "Duration Filter", "Badge", "Advanced"],
+    customDataFilterFns: [
+      { qualityLow: (e, state) => !!state.qualityLow && e.quality !== "" },
+      { quality360: (e, state) => !!state.quality360 && e.quality !== "360p" },
+      { quality720: (e, state) => !!state.quality720 && e.quality !== "720p" },
+      { quality1080: (e, state) => !!state.quality1080 && e.quality !== "1080p" },
+      { quality1440: (e, state) => !!state.quality1440 && e.quality !== "1440p" },
+      { quality4k: (e, state) => !!state.quality4k && e.quality !== "4k" }
+    ],
+    schemeOptions: [
+      "Title Filter",
+      "Uploader Filter",
+      "Duration Filter",
+      {
+        title: "Quality Filter",
+        content: [
+          { qualityLow: false, label: "Low" },
+          { quality360: false, label: "360p" },
+          { quality720: false, label: "720p" },
+          { quality1080: false, label: "1080p" },
+          { quality1440: false, label: "1440p" },
+          { quality4k: false, label: "4k" }
+        ]
+      },
+      "Sort By",
+      "Badge",
+      "Advanced"
+    ],
     animatePreview
   });
   function animatePreview(container) {

package/package.json

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

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

@@ -0,0 +1,52 @@
+import { RegexFilter } from '../../utils';
+import type { DataFilterFnFrom } from './data-filter-fn';
+
+function createTextFilter(
+  filterName: string,
+  dataPropName: string,
+  positive: boolean,
+): DataFilterFnFrom<(_: string) => boolean> {
+  const filterNameValue = `${filterName}Words`;
+  return {
+    handle(e, state, searchFilter) {
+      if (!Object.hasOwn(state, filterName) || !state[filterName]) return false;
+      return !searchFilter?.(e[dataPropName] as string);
+    },
+    $preDefine: (state) => {
+      const r = new RegexFilter(state[filterNameValue] as string);
+      if (positive) return (s: string) => r.hasEvery(s);
+      return (s: string) => r.hasNone(s);
+    },
+    deps: [filterNameValue],
+  };
+}
+
+const filterDuration: DataFilterFnFrom<(_: number) => boolean> = {
+  handle(e, state, notInRange) {
+    if (!state.filterDuration) return false;
+    return !!notInRange?.(e.duration as number);
+  },
+  $preDefine: (state) => {
+    const from = state.filterDurationFrom as number;
+    const to = state.filterDurationTo as number;
+    function notInRange(d: number): boolean {
+      return d < from || d > to;
+    }
+    return notInRange;
+  },
+  deps: ['filterDurationFrom', 'filterDurationTo'],
+};
+
+export const defaultDataFilterFns: Record<string, DataFilterFnFrom<any>> = {
+  filterDuration,
+
+  filterExclude: createTextFilter('filterExclude', 'title', false),
+  filterInclude: createTextFilter('filterInclude', 'title', true),
+  filterUploaderExclude: createTextFilter('filterUploaderExclude', 'uploader', false),
+  filterUploaderInclude: createTextFilter('filterUploaderInclude', 'uploader', true),
+
+  filterHD: (e, state) => (state.filterHD && !e.hd) as boolean,
+  filterNonHD: (e, state) => (state.filterNonHD && e.hd) as boolean,
+  filterPrivate: (e, state) => (state.filterPrivate && e.private) as boolean,
+  filterPublic: (e, state) => (state.filterPublic && !e.private) as boolean,
+};

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

@@ -0,0 +1,62 @@
+import type { StoreState } from 'jabroni-outfit';
+import type { DataElement } from './data-manager';
+
+export type DataFilterFnHandle<R> = (
+  el: DataElement,
+  state: StoreState,
+  $preDefineResult?: R,
+) => boolean;
+
+export type DataFilterFnFrom<R> = Partial<DataFilterFn<R>> | DataFilterFnHandle<R>;
+
+export type DataFilterFnRenderedResult = {
+  name: string;
+  condition: boolean;
+};
+
+export type DataFilterFnRendered = (v: DataElement) => DataFilterFnRenderedResult;
+
+export class DataFilterFn<R> {
+  public static prefix = 'filter-';
+
+  public static setPrefix(name: string) {
+    return `${DataFilterFn.prefix}${name}`;
+  }
+
+  constructor(
+    public handle: DataFilterFnHandle<R>,
+    public deps: string[] = [],
+    public name: string,
+    public $preDefine?: (state: StoreState) => R,
+  ) {
+    this.name = DataFilterFn.setPrefix(name);
+  }
+
+  public static from<R>(options: DataFilterFnFrom<R>, name: string) {
+    if (typeof options === 'function') {
+      const deps = [name];
+      return new DataFilterFn(options, deps, name);
+    }
+    
+    return new DataFilterFn(
+      options.handle as DataFilterFnHandle<R>,
+      options.deps,
+      name,
+      options.$preDefine,
+    );
+  }
+
+  public renderFn(state: StoreState) {
+    const name = this.name;
+
+    return (): DataFilterFnRendered => {
+      const preDefined = this.$preDefine?.(state);
+
+      return (a: DataElement) => {
+        const condition = this.handle(a, state, preDefined);
+
+        return ({ condition, name });
+      };
+    };
+  }
+}