pervert-monkey 1.0.18 → 1.0.19

package/src/userscripts/index.ts

@@ -1 +1 @@
-import './scripts/spankbang';
+import './scripts/camwhores';

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.8',
+  version: '1.0.12',
   description: 'Infinite scroll [optional], Filter by Title, thumb preview',
   match: 'https://*.3hentai.net/*',
 };

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.7',
+  version: '1.6.11',
   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.11',
+  version: '3.0.15',
   description:
     'Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Sort by Duration and Views. Mass friend request button. Download button',
   match: ['https://*.camwhores.tv', 'https://*.camwhores.*/*'],

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

package/src/userscripts/scripts/ebalka.ts

@@ -4,7 +4,7 @@ import { downloader, exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Ebalka PervertMonkey',
-  version: '3.0.8',
+  version: '3.0.12',
   description:
     'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration, Download button.',
   match: [

package/src/userscripts/scripts/eporner.ts

@@ -5,7 +5,7 @@ import { OnHover } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Eporner PervertMonkey',
-  version: '2.0.10',
+  version: '2.0.14',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader, Duration and HD, Sort by Views and Duration',
   match: ['https://*.eporner.com/*', 'https://*.eporner.*/*'],

package/src/userscripts/scripts/erome.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Erome PervertMonkey',
-  version: '5.0.9',
+  version: '5.0.13',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Video/Photo albums, Sort by Views. Show/Hide Photos in album. Remove disclaimer.',
   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.8',
+  version: '2.0.12',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: ['https://*.eroprofile.com/*'],
 };

package/src/userscripts/scripts/javhdporn.ts

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

package/src/userscripts/scripts/missav.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Missav PervertMonkey',
-  version: '3.0.7',
+  version: '3.0.11',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by 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.9',
+  version: '5.0.13',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Duration, Sort by Duration and Views',
   match: ['https://motherless.com/*'],

package/src/userscripts/scripts/namethatporn.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'NameThatPorn PervertMonkey',
-  version: '3.0.8',
+  version: '3.0.12',
   description: 'Infinite scroll [optional], Filter by Title, Uploader and Solved/Unsolved',
   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.8',
+  version: '4.0.12',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.nhentai.net/*', 'https://*.nhentai.*/*'],
 };
@@ -21,7 +21,6 @@ const nhentaiRules = new Rules({
   gropeStrategy: 'all-in-all',
 });
 
-// 2026: now only one language works, problem in nhentai.net itself
 const filterDescriptors = {
   english: { query: 'english', name: '🇬🇧' },
   japanese: { query: 'japanese', name: '🇯🇵' },

package/src/userscripts/scripts/obmenvsem.ts

@@ -4,8 +4,8 @@ import { Rules } from '../../core';
 import { fetchHtml, parseUrl } from '../../utils';
 
 export const meta: MonkeyUserScript = {
-  name: 'Obmensvem PervertMonkey',
-  version: '1.0.9',
+  name: 'Obmenvsem PervertMonkey',
+  version: '1.0.14',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://*.obmenvsem.com/*',

package/src/userscripts/scripts/pornhub.ts

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

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.8',
+  version: '4.0.12',
   description:
     'Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views',
   match: ['https://*.spankbang.com/*', 'https://*.spankbang.*/*'],

package/src/userscripts/scripts/thisvid.ts

@@ -13,7 +13,6 @@ import {
   objectToFormData,
   parseCssUrl,
   parseHtml,
-  querySelectorLast,
   querySelectorLastNumber,
   range,
   replaceElementTag,
@@ -21,8 +20,8 @@ import {
 } from '../../utils';
 
 export const meta: MonkeyUserScript = {
-  name: 'ThisVid.com Improved',
-  version: '8.0.8',
+  name: 'ThisVid.com PervertMonkey',
+  version: '8.0.13',
   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 📼',
   match: ['https://*.thisvid.com/*'],
@@ -52,10 +51,46 @@ const IS_MEMBER_FRIEND =
     'is in your friends',
   );
 
+function fixContainersDuplication() {
+  const containers = document.querySelectorAll<HTMLElement>(
+    'div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)',
+  );
+
+  if (containers.length < 2 || getCommonParents(containers).length > 1) return;
+
+  const mainContainer = containers.values().find((e) => e.id);
+  const badContainers = containers.values().filter((e) => !e.id);
+
+  badContainers.forEach((e) => {
+    mainContainer?.append(...e.children);
+    mainContainer && e.remove();
+  });
+}
+
+fixContainersDuplication();
+
 function fixPlaylistThumbUrl(src: string) {
   return src.replace(/playlist\/\d+\/video/, () => 'videos');
 }
 
+function getImgData(thumb: HTMLElement) {
+  const img = thumb.querySelector('img') as HTMLImageElement;
+  const privateThumb = thumb.querySelector('.private') as HTMLElement;
+
+  let imgSrc = img?.getAttribute('data-original') as string;
+
+  if (privateThumb) {
+    imgSrc = parseCssUrl(privateThumb.style.background);
+    privateThumb.removeAttribute('style');
+  }
+
+  img.removeAttribute('data-original');
+  img.removeAttribute('data-cnt');
+  img.classList.remove('lazy-load');
+
+  return { img, imgSrc };
+}
+
 const defaultRulesConfig: RulesConfig = {
   thumbs: {
     selector:
@@ -70,30 +105,9 @@ const defaultRulesConfig: RulesConfig = {
       views: { selector: '.view', type: 'number' },
     },
   },
-  thumbImg: {
-    getImgData(thumb: HTMLElement) {
-      const img = thumb.querySelector('img') as HTMLImageElement;
-      const privateThumb = thumb.querySelector('.private') as HTMLElement;
-
-      let imgSrc = img?.getAttribute('data-original') as string;
-
-      if (privateThumb) {
-        imgSrc = parseCssUrl(privateThumb.style.background);
-        privateThumb.removeAttribute('style');
-      }
-
-      img.removeAttribute('data-original');
-      img.removeAttribute('data-cnt');
-      img.classList.remove('lazy-load');
-
-      return { img, imgSrc };
-    },
-  },
-  containerSelector: () =>
-    (querySelectorLast(
-      document,
-      'div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder)',
-    ) as HTMLElement) || document.querySelector<HTMLElement>('.thumbs-items'),
+  thumbImg: { getImgData },
+  containerSelectorLast:
+    'div:has(> .tumbpu[title]):not(.thumbs-photo), div:has(> .thumb-holder), .thumbs-items',
   animatePreview,
   schemeOptions: [
     'Title Filter',
@@ -107,14 +121,7 @@ const defaultRulesConfig: RulesConfig = {
       content: [{ autoRequestAccess: false, label: 'check access sends friend requests' }],
     },
   ],
-  gropeStrategy:
-    getCommonParents([
-      ...document.querySelectorAll<HTMLElement>(
-        'div:has(> .tumbpu[title]):not(.thumbs-photo) > .tumbpu[title], .thumb-holder',
-      ),
-    ]).length < 2
-      ? 'all-in-one'
-      : 'all-in-all',
+  gropeStrategy: 'all-in-all',
 };
 
 const config: RulesConfig =
@@ -552,6 +559,7 @@ async function createPrivateFeed() {
   const hideMemberVideos = (e: PointerEvent, ignore = true) => {
     const container = (e.target as HTMLElement)?.closest('div') as HTMLElement;
     let id = container.id;
+    feedGenerator.skip(1);
 
     const videosCount = querySelectorLastNumber(`#${id}`);
     document

package/src/userscripts/scripts/xhamster.ts

@@ -13,8 +13,8 @@ import {
 } from '../../utils';
 
 export const meta: MonkeyUserScript = {
-  name: 'Xhamster Improved',
-  version: '5.0.9',
+  name: 'Xhamster PervertMonkey',
+  version: '5.0.14',
   description:
     'Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views',
   match: ['https://*.xhamster.com/*', 'https://*.xhamster.*/*'],

package/src/userscripts/scripts/xvideos.ts

@@ -4,8 +4,8 @@ import { Rules } from '../../core';
 import { exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
-  name: 'XVideos Improved',
-  version: '4.0.9',
+  name: 'XVideos PervertMonkey',
+  version: '4.0.14',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Duration. Sort by Duration and Views.',
   match: 'https://*.xvideos.com/*',

package/src/utils/dom/index.ts

@@ -8,11 +8,11 @@ export {
   watchElementChildrenCount,
 } from './dom-observers';
 
-export function findSelfOrChild<T extends HTMLElement>(
+export function querySelectorOrSelf<T extends Element = HTMLElement>(
   element: T,
   selector: string,
 ): T | null {
-  if (element.matches(selector)) {
+  if (element.matches?.(selector)) {
     return element as T;
   }
   return element.querySelector<T>(selector);
@@ -23,7 +23,10 @@ export function querySelectorLast<T extends Element = HTMLElement>(
   selector: string,
 ): T | undefined {
   const nodes = root.querySelectorAll<T>(selector);
-  return nodes.length > 0 ? nodes[nodes.length - 1] : undefined;
+  if (nodes.length < 1) {
+    return querySelectorOrSelf<T>(root as T, selector) || undefined;
+  }
+  return nodes[nodes.length - 1];
 }
 
 export function querySelectorLastNumber(selector: string, e: ParentNode = document) {
@@ -33,7 +36,7 @@ export function querySelectorLastNumber(selector: string, e: ParentNode = docume
 
 export function querySelectorText(e: ParentNode, selector?: string): string {
   if (typeof selector !== 'string') return '';
-  const text = e.querySelector<HTMLElement>(selector)?.innerText || '';
+  const text = querySelectorOrSelf(e as HTMLElement, selector)?.innerText || '';
   return sanitizeStr(text);
 }
 
@@ -78,12 +81,13 @@ export function removeClassesAndDataAttributes(
   });
 }
 
-export function getCommonParents(elements: HTMLCollection | HTMLElement[]): HTMLElement[] {
-  const parents = Array.from(elements)
-    .map((e) => e.parentElement)
-    .filter((parent): parent is HTMLElement => parent !== null);
-
-  return [...new Set(parents)];
+export function getCommonParents<T extends HTMLElement>(
+  elements: Iterable<T>,
+): HTMLElement[] {
+  return Map.groupBy(elements, (e) => e.parentElement)
+    .keys()
+    .filter((e) => e !== null)
+    .toArray();
 }
 
 export function findNextSibling<T extends Element = HTMLElement>(e: T) {

package/src/utils/parsers/index.ts

@@ -9,7 +9,7 @@ export function parseIntegerOr(n: string | number, or: number): number {
   return Number.isSafeInteger(num) ? num : or;
 }
 
-export function parseNumberWithLetter(str: string): number {
+export function parseNumericAbbreviation(str: string): number {
   const multipliers = { k: 1e3, m: 1e6 } as const;
   const match = str.trim().match(/([\d., ]+)(\w)?/);