pervert-monkey 1.0.13 → 1.0.15

package/src/userscripts/scripts/erome.ts

@@ -4,8 +4,9 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Erome PervertMonkey',
-  version: '5.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Video/Photo albums',
+  version: '5.0.6',
+  description:
+    'Infinite scroll [optional], Filter by Title, Uploader and Video/Photo albums, Sort by Views',
   match: ['*://*.erome.com/*'],
 };
 
@@ -22,13 +23,12 @@ const rules = new Rules({
     selectors: {
       title: '.album-title',
       uploader: '.album-user',
-      videoAlbum: { type: 'boolean', selector: '.album-videos' },
+      videoAlbum: { selector: '.album-videos', type: 'boolean' },
+      views: { selector: '.album-bottom-views', type: 'float' },
     },
   },
   storeOptions: { showPhotos: true },
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
+  customDataFilterFns: [
     {
       filterPhotoAlbums: (el, state) =>
         (state.filterPhotoAlbums && !el.videoAlbum) as boolean,
@@ -39,7 +39,8 @@ const rules = new Rules({
     },
   ],
   schemeOptions: [
-    'Text Filter',
+    'Title Filter',
+    'Uploader Filter',
     {
       title: 'Filter Albums',
       content: [
@@ -53,6 +54,7 @@ const rules = new Rules({
         },
       ],
     },
+    'Sort By Views',
     'Badge',
     'Advanced',
   ],

package/src/userscripts/scripts/eroprofile.ts

@@ -3,8 +3,8 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Eroprofile PervertMonkey',
-  version: '2.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '2.0.6',
+  description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: ['https://*.eroprofile.com/*'],
 };
 
@@ -23,18 +23,10 @@ const rules = new Rules({
     },
   },
   containerSelector: '.videoGrid',
-  customDataSelectorFns: ['filterInclude', 'filterExclude', 'filterDuration'],
   schemeOptions: [
-    'Text Filter',
+    'Title Filter',
     'Duration Filter',
-    {
-      title: 'Sort By ',
-      content: [
-        {
-          'sort by duration': () => {},
-        },
-      ],
-    },
+    'Sort By Duration',
     'Badge',
     'Advanced',
   ],

package/src/userscripts/scripts/javhdporn.ts

@@ -3,12 +3,10 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Javhdporn PervertMonkey',
-  version: '3.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
-  match: [
-    "https://*.javhdporn.net/*",
-    "https://*.javhdporn.*/*"
-  ],
+  version: '3.0.6',
+  description:
+    'Infinite scroll [optional], Filter by Title and Duration, Sort By Duration and Views',
+  match: ['https://*.javhdporn.net/*', 'https://*.javhdporn.*/*'],
 };
 
 const rules = new Rules({
@@ -18,10 +16,11 @@ const rules = new Rules({
     selectors: {
       title: 'header.entry-header',
       duration: '.duration',
-    }
+      views: { selector: '.views', type: 'float' },
+    },
   },
   paginationStrategyOptions: {
     pathnameSelector: /\/page\/(\d+)\/?$/,
   },
-  schemeOptions: ['Text Filter', 'Badge', 'Duration Filter', 'Advanced'],
+  schemeOptions: ['Title Filter', 'Duration Filter', 'Sort By', 'Badge', 'Advanced'],
 });

package/src/userscripts/scripts/missav.ts

@@ -3,8 +3,8 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Missav PervertMonkey',
-  version: '3.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '3.0.6',
+  description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://*.missav123.com/*',
     'https://*.missav.*/*',
@@ -24,8 +24,14 @@ const rules = new Rules({
     selectors: {
       title: 'div > div > a.text-secondary',
       duration: 'div > a > span.text-xs',
-    }
+    },
   },
   thumbImg: { strategy: 'auto' },
-  schemeOptions: ['Text Filter', 'Duration Filter', 'Badge', 'Advanced'],
+  schemeOptions: [
+    'Title Filter',
+    'Duration Filter',
+    'Sort By Duration',
+    'Badge',
+    'Advanced',
+  ],
 });

package/src/userscripts/scripts/motherless.ts

@@ -5,8 +5,8 @@ import { fetchWith, OnHover, replaceElementTag, Tick } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Motherless PervertMonkey',
-  version: '5.0.4',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '5.0.7',
+  description: 'Infinite scroll [optional], Filter by Title, Uploader and Duration, Sort by Duration and Views',
   match: ['https://motherless.com/*'],
   grant: ['GM_addElement', 'GM_addStyle', 'unsafeWindow'],
 };
@@ -31,7 +31,14 @@ const rules = new Rules({
   },
   animatePreview,
   gropeStrategy: 'all-in-all',
-  schemeOptions: ['Text Filter', 'Sort By', 'Duration Filter', 'Badge', 'Advanced'],
+  schemeOptions: [
+    'Title Filter',
+    'Uploader Filter',
+    'Duration Filter',
+    'Sort By',
+    'Badge',
+    'Advanced',
+  ],
 });
 
 function animatePreview(_: HTMLElement) {
@@ -174,9 +181,7 @@ function applySearchFilters() {
   let pathname = window.location.pathname;
 
   const wordsToFilter =
-    (rules.store.state.filterExcludeWords as string)
-      .replace(/f:/g, '')
-      .match(/(?<!user:)\b\w+\b(?!\s*:)/g) || [];
+    (rules.store.state.filterExcludeWords as string).match(/\w+/g) || [];
 
   wordsToFilter
     .filter((w) => !pathname.includes(w))

package/src/userscripts/scripts/namethatporn.ts

@@ -4,8 +4,8 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'NameThatPorn PervertMonkey',
-  version: '3.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Un/Solved',
+  version: '3.0.6',
+  description: 'Infinite scroll [optional], Filter by Title, Uploader and Solved/Unsolved',
   match: ['https://namethatporn.com/*'],
 };
 
@@ -16,26 +16,18 @@ const rules = new Rules({
     selectors: {
       title: '.item_title, .nsw_r_tit',
       uploader: '.item_answer b, .nsw_r_desc',
-      solved: {
-        type: 'boolean',
-        selector: '.item_solved, .nsw_r_slvd',
-      },
+      solved: { selector: '.item_solved, .nsw_r_slvd', type: 'boolean' },
     },
   },
   thumbImg: {
-    selector: (img: HTMLImageElement) => {
-      return (
-        img.getAttribute('data-dyn')?.concat('.webp') || (img.getAttribute('src') as string)
-      );
-    },
+    selector: (img: HTMLImageElement) =>
+      img.getAttribute('data-dyn')?.concat('.webp') || (img.getAttribute('src') as string),
   },
   paginationStrategyOptions: {
     paginationSelector: '#smi_wrp, #nsw_p',
   },
   gropeStrategy: 'all-in-all',
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
+  customDataFilterFns: [
     {
       filterSolved: (el, state) => (state.filterSolved && el.solved) as boolean,
     },
@@ -44,7 +36,8 @@ const rules = new Rules({
     },
   ],
   schemeOptions: [
-    'Text Filter',
+    'Title Filter',
+    'Uploader Filter',
     {
       title: 'Filter Status',
       content: [

package/src/userscripts/scripts/nhentai.ts

@@ -4,7 +4,7 @@ import { parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'NHentai PervertMonkey',
-  version: '4.0.3',
+  version: '4.0.6',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.nhentai.net/*', 'https://*.nhentai.*/*'],
 };
@@ -14,18 +14,10 @@ const IS_SEARCH_PAGE = /^\/search\//.test(location.pathname);
 
 const nhentaiRules = new Rules({
   thumbs: { selector: '.gallery' },
-  thumb: {
-    selectors: {
-      title: '.caption'
-    }
-  },
-  thumbImg: {
-    strategy: 'auto',
-    remove: 'auto'
-  },
+  thumb: { selectors: { title: '.caption' } },
+  thumbImg: { strategy: 'auto', remove: 'auto' },
   containerSelectorLast: '.index-container, .container',
-  customDataSelectorFns: ['filterInclude', 'filterExclude'],
-  schemeOptions: ['Text Filter', 'Badge', 'Advanced'],
+  schemeOptions: ['Title Filter', 'Badge', 'Advanced'],
   gropeStrategy: 'all-in-all',
 });
 
@@ -57,7 +49,8 @@ function filtersUI() {
     const btns = parseHtml(`<div class="sort-type"></div>`);
     groupOfButtons.forEach((k) => {
       const btn = parseHtml(
-        `<a href="#" ${state.custom[k] ? 'style="background: rgba(59, 49, 70, 1)"' : ''
+        `<a href="#" ${
+          state.custom[k] ? 'style="background: rgba(59, 49, 70, 1)"' : ''
         }>${filterDescriptors[k as keyof typeof filterDescriptors].name}</a>`,
       );
       btn.addEventListener('click', (e) => {

package/src/userscripts/scripts/obmenvsem.ts

@@ -5,8 +5,8 @@ import { fetchHtml, parseUrl } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Obmensvem PervertMonkey',
-  version: '1.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '1.0.6',
+  description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: ['https://*.obmenvsem.com/*', 'https://*.obmenvsem.*/*'],
   grant: ['GM_addStyle', 'GM_addElement', 'unsafeWindow'],
 };
@@ -67,5 +67,11 @@ const rules = new Rules({
       return img.src;
     },
   },
-  schemeOptions: ['Text Filter', 'Duration Filter', 'Badge', 'Advanced'],
+  schemeOptions: [
+    'Title Filter',
+    'Duration Filter',
+    'Sort By Duration',
+    'Badge',
+    'Advanced',
+  ],
 });

package/src/userscripts/scripts/pornhub.ts

@@ -3,8 +3,9 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'PornHub PervertMonkey',
-  version: '4.0.3',
-  description: 'Infinite scroll [optional]. Filter by Title and Duration',
+  version: '4.0.6',
+  description:
+    'Infinite scroll [optional]. Filter by Title, Uploader and Duration. Sort by Duration and Views',
   match: ['https://*.pornhub.com/*'],
   exclude: 'https://*.pornhub.com/embed/*',
 };
@@ -19,20 +20,28 @@ const rules = new Rules({
       .filter((e) => e.children.length > 0 && e.checkVisibility())
       .pop() as HTMLElement,
 
-  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',
+      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() {

package/src/userscripts/scripts/spankbang.ts

@@ -3,8 +3,9 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'SpankBang.com PervertMonkey',
-  version: '4.0.3',
-  description: 'Infinite scroll [optional]. Filter by Title and Duration',
+  version: '4.0.6',
+  description:
+    'Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views',
   match: ['https://*.spankbang.com/*', 'https://*.spankbang.*/*'],
 };
 
@@ -17,11 +18,34 @@ const rules = new Rules({
   thumb: {
     selectors: {
       title: '[title]',
-      tags: { selector: '[data-testid="title"]', type: 'string' },
       duration: '[data-testid="video-item-length"]',
-    }
+      // tags: { selector: '[data-testid="title"]', type: 'string' },
+      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: (el, state) => !!state.qualityLow && el.quality !== '' },
+    { qualityHD: (el, state) => !!state.qualityHD && el.quality !== 'HD' },
+    { quality4k: (el, state) => !!state.quality4k && el.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());

package/src/userscripts/scripts/thisvid.ts

@@ -13,6 +13,7 @@ import {
   objectToFormData,
   parseCssUrl,
   parseHtml,
+  querySelectorLast,
   querySelectorLastNumber,
   range,
   replaceElementTag,
@@ -21,9 +22,9 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'ThisVid.com Improved',
-  version: '8.0.3',
+  version: '8.0.6',
   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 📼',
+    '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 📼',
   match: ['https://*.thisvid.com/*'],
 };
 
@@ -88,36 +89,18 @@ const defaultRulesConfig: RulesConfig = {
       return { img, imgSrc };
     },
   },
-  containerSelectorLast: '.thumbs-items',
+  containerSelector: () =>
+    (querySelectorLast(
+      document,
+      'div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)',
+    ) as HTMLElement) || document.querySelector<HTMLElement>('.thumbs-items'),
   animatePreview,
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
-    'filterDuration',
-    {
-      filterPrivate: (el, state) => (state.filterPrivate && el.private) as boolean,
-    },
-    {
-      filterPublic: (el, state) => (state.filterPublic && !el.private) as boolean,
-    },
-    {
-      filterHD: (el, state) => (state.filterHD && !el.hd) as boolean,
-    },
-    {
-      filterNonHD: (el, state) => (state.filterNonHD && el.hd) as boolean,
-    },
-  ],
   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',
@@ -398,6 +381,8 @@ function animatePreview(_: HTMLElement) {
     (target) => {
       const img = target.querySelector('img') as HTMLImageElement;
       const orig = img.getAttribute('src') as string;
+      if (!orig) return;
+
       tick.start(
         () => iteratePreviewFrames(img),
         () => {
@@ -610,7 +595,7 @@ async function createPrivateFeed() {
       paginationSelector: '.footer',
     },
     schemeOptions: [
-      'Text Filter',
+      'Title Filter',
       'Duration Filter',
       'Privacy Filter',
       'Badge',

package/src/userscripts/scripts/xhamster.ts

@@ -11,12 +11,12 @@ import {
   waitForElementToAppear,
   watchElementChildrenCount,
 } from '../../utils';
-import { findSelfOrChild } from '../../utils/dom';
 
 export const meta: MonkeyUserScript = {
   name: 'Xhamster Improved',
-  version: '5.0.4',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '5.0.7',
+  description:
+    'Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views',
   match: ['https://*.xhamster.com/*', 'https://*.xhamster.*/*'],
   exclude: 'https://*.xhamster.com/embed*',
   grant: ['GM_addElement', 'GM_addStyle', 'unsafeWindow'],
@@ -93,10 +93,8 @@ const rules = new Rules({
     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: {
@@ -104,10 +102,7 @@ const rules = new Rules({
     remove: '[loading]',
   },
   gropeStrategy: 'all-in-all',
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
-    'filterDuration',
+  customDataFilterFns: [
     {
       filterWatched: (el, state) => !!(state.filterWatched && el.watched),
     },
@@ -116,8 +111,7 @@ const rules = new Rules({
     },
   ],
   schemeOptions: [
-    'Text Filter',
-    'Badge',
+    'Title Filter',
     {
       title: 'Filter Watched',
       content: [
@@ -125,7 +119,9 @@ const rules = new Rules({
         { filterUnwatched: false, label: 'unwatched' },
       ],
     },
+    'Sort By',
     'Duration Filter',
+    'Badge',
     'Advanced',
   ],
   animatePreview,
@@ -156,7 +152,6 @@ function animatePreview() {
     const videoSrc = e
       .querySelector('[data-previewvideo]')
       ?.getAttribute('data-previewvideo') as string;
-    console.log(container, videoSrc);
     return createPreviewVideoElement(videoSrc, container);
   });
 }

package/src/userscripts/scripts/xvideos.ts

@@ -5,8 +5,9 @@ import { exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'XVideos Improved',
-  version: '4.0.4',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '4.0.7',
+  description:
+    'Infinite scroll [optional], Filter by Title, Uploader and Duration. Sort by Duration and Views.',
   match: 'https://*.xvideos.com/*',
 };
 
@@ -24,6 +25,8 @@ const rules = new Rules({
       title: '[class*=title]',
       uploader: '[class*=name]',
       duration: '[class*=duration]',
+      views: { selector: '.metadata a ~ span', type: 'float' },
+      quality: { selector: '.video-hd-mark', type: 'string' },
     },
     callback: (thumb) => {
       setTimeout(() => {
@@ -32,7 +35,33 @@ const rules = new Rules({
       }, 200);
     },
   },
-  schemeOptions: ['Text Filter', 'Duration Filter', 'Badge', 'Advanced'],
+  customDataFilterFns: [
+    { qualityLow: (el, state) => !!state.qualityLow && el.quality !== '' },
+    { quality360: (el, state) => !!state.quality360 && el.quality !== '360p' },
+    { quality720: (el, state) => !!state.quality720 && el.quality !== '720p' },
+    { quality1080: (el, state) => !!state.quality1080 && el.quality !== '1080p' },
+    { quality1440: (el, state) => !!state.quality1440 && el.quality !== '1440p' },
+    { quality4k: (el, state) => !!state.quality4k && el.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,
 });
 

package/src/utils/parsers/index.ts

@@ -11,11 +11,14 @@ export function parseIntegerOr(n: string | number, or: number): number {
 
 export function parseNumberWithLetter(str: string): number {
   const multipliers = { k: 1e3, m: 1e6 } as const;
-  const match = str.trim().match(/^([\d.]+)(\w)?$/);
+  const match = str.trim().match(/([\d., ]+)(\w)?/);
 
   if (!match) return 0;
 
-  const num = parseFloat(match[1]);
+  const s1 = match[1].replace(/,/g, '.').replace(/[ ]/g, '');
+  const s2 = s1.split('.').filter(Boolean).length < 3 ? s1 : s1.replace('.', '');
+
+  const num = parseFloat(s2);
   const suffix = match[2]?.toLowerCase() as keyof typeof multipliers;
 
   if (suffix && suffix in multipliers) {