pervert-monkey 1.0.13 → 1.0.17

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.7',
   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',
@@ -192,8 +175,8 @@ async function getMemberFriends(
   return g();
 }
 
-function getMembers(el: HTMLElement) {
-  const friendsList = el.querySelector('#list_members_friends_items') || el;
+function getMembers(e: HTMLElement) {
+  const friendsList = e.querySelector('#list_members_friends_items') || e;
   return Array.from(friendsList.querySelectorAll<HTMLAnchorElement>('.tumbpu') || [])
     .map((e) => e.href.match(/\d+/)?.[0] as string)
     .filter((_) => _);
@@ -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.8',
+  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,20 +102,16 @@ const rules = new Rules({
     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: [
@@ -125,7 +119,9 @@ const rules = new Rules({
         { filterUnwatched: false, label: 'unwatched' },
       ],
     },
+    'Sort By',
     'Duration Filter',
+    'Badge',
     'Advanced',
   ],
   animatePreview,
@@ -156,18 +152,17 @@ function animatePreview() {
     const videoSrc = e
       .querySelector('[data-previewvideo]')
       ?.getAttribute('data-previewvideo') as string;
-    console.log(container, videoSrc);
     return createPreviewVideoElement(videoSrc, container);
   });
 }
 
 function expandMoreVideoPage() {
   watchElementChildrenCount(rules.container, () => setTimeout(rules.gropeInit, 1800));
-  waitForElementToAppear(document.body, 'button[data-role="show-more-next"]', (el) => {
+  waitForElementToAppear(document.body, 'button[data-role="show-more-next"]', (e) => {
     const observer = new Observer((target) => {
       (target as HTMLButtonElement).click();
     });
-    observer.observe(el);
+    observer.observe(e);
   });
 }
 

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.8',
+  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: (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,
 });
 

package/src/utils/dom/dom-observers.ts

@@ -4,10 +4,10 @@ export function waitForElementToAppear(
   callback: (el: Element) => void,
 ) {
   const observer = new MutationObserver((_mutations) => {
-    const el = parent.querySelector(selector);
-    if (el) {
+    const e = parent.querySelector(selector);
+    if (e) {
       observer.disconnect();
-      callback(el);
+      callback(e);
     }
   });
 

package/src/utils/dom/index.ts

@@ -80,7 +80,7 @@ export function removeClassesAndDataAttributes(
 
 export function getCommonParents(elements: HTMLCollection | HTMLElement[]): HTMLElement[] {
   const parents = Array.from(elements)
-    .map((el) => el.parentElement)
+    .map((e) => e.parentElement)
     .filter((parent): parent is HTMLElement => parent !== null);
 
   return [...new Set(parents)];

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) {