pervert-monkey 1.0.21 → 1.0.23

package/src/userscripts/scripts/javhdporn.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Javhdporn PervertMonkey',
-  version: '3.0.14',
+  version: '3.0.16',
   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.13',
+  version: '3.0.15',
   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.15',
+  version: '5.0.17',
   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.14',
+  version: '3.0.16',
   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.14',
+  version: '4.0.16',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.nhentai.net/*', 'https://*.nhentai.*/*'],
 };

package/src/userscripts/scripts/obmenvsem.ts

@@ -5,7 +5,7 @@ import { fetchHtml, parseUrl } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Obmenvsem PervertMonkey',
-  version: '1.0.16',
+  version: '1.0.18',
   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.14',
+  version: '4.0.16',
   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.14',
+  version: '4.0.16',
   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

@@ -21,7 +21,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'ThisVid.com PervertMonkey',
-  version: '8.0.15',
+  version: '8.0.17',
   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/*'],

package/src/userscripts/scripts/xhamster.ts

@@ -14,7 +14,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'Xhamster PervertMonkey',
-  version: '5.0.16',
+  version: '5.0.18',
   description:
     'Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views',
   match: ['https://*.xhamster.com/*', 'https://*.xhamster.*/*'],
@@ -162,7 +162,7 @@ function expandMoreVideoPage() {
     const observer = new Observer((target) => {
       (target as HTMLButtonElement).click();
     });
-    observer.observe(e);
+    observer.observe(e as HTMLElement);
   });
 }
 

package/src/userscripts/scripts/xvideos.ts

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

package/src/utils/dom/attributes.ts

@@ -0,0 +1,54 @@
+export function copyAttributes<T extends Element = HTMLElement>(target: T, source: T) {
+  for (const attr of source.attributes) {
+    if (attr.nodeValue) {
+      target.setAttribute(attr.nodeName, attr.nodeValue);
+    }
+  }
+}
+
+export function replaceElementTag(e: HTMLElement, tagName: string) {
+  const newTagElement = document.createElement(tagName);
+  copyAttributes(newTagElement, e);
+
+  newTagElement.innerHTML = e.innerHTML;
+  e.parentNode?.replaceChild(newTagElement, e);
+
+  return newTagElement;
+}
+
+export function removeClassesAndDataAttributes(
+  element: HTMLElement,
+  keyword: string,
+): void {
+  Array.from(element.classList).forEach((className) => {
+    if (className.includes(keyword)) {
+      element.classList.remove(className);
+    }
+  });
+
+  Array.from(element.attributes).forEach((attr) => {
+    if (attr.name.startsWith('data-') && attr.name.includes(keyword)) {
+      element.removeAttribute(attr.name);
+    }
+  });
+}
+
+export function areElementsAlike<T extends HTMLElement>(
+  a: T,
+  b: T,
+  options: { id?: boolean; className?: boolean },
+) {
+  if (!a || !b) return false;
+
+  if (options.id && a.id !== b.id) return false;
+
+  if (options.className) {
+    const ca = a.className;
+    const cb = b.className;
+    if (!(ca.length > cb.length ? ca.includes(cb) : cb.includes(ca))) {
+      return false;
+    }
+  }
+
+  return true;
+}

package/src/utils/dom/index.ts

@@ -1,171 +1,10 @@
-import { sanitizeStr } from '../strings';
-import { waitForElementToAppear } from './dom-observers';
-
-export {
-  waitForElementToAppear,
-  waitForElementToDisappear,
-  watchDomChangesWithThrottle,
-  watchElementChildrenCount,
-} from './dom-observers';
-
-export function querySelectorOrSelf<T extends Element = HTMLElement>(
-  element: T,
-  selector: string,
-): T | null {
-  if (element.matches?.(selector)) {
-    return element as T;
-  }
-  return element.querySelector<T>(selector);
-}
-
-export function querySelectorLast<T extends Element = HTMLElement>(
-  root: ParentNode = document,
-  selector: string,
-): T | undefined {
-  const nodes = root.querySelectorAll<T>(selector);
-  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) {
-  const text = querySelectorText(e, selector);
-  return Number(text.match(/\d+/g)?.pop() || 0);
-}
-
-export function querySelectorText(e: ParentNode, selector?: string): string {
-  if (typeof selector !== 'string') return '';
-  const text = querySelectorOrSelf(e as HTMLElement, selector)?.innerText || '';
-  return sanitizeStr(text);
-}
+export * from './attributes';
+export * from './miscellaneous';
+export * from './observers';
+export * from './selectors';
 
 export function parseHtml(html: string): HTMLElement {
   const parsed = new DOMParser().parseFromString(html, 'text/html').body;
   if (parsed.children.length > 1) return parsed;
   return parsed.firstElementChild as HTMLElement;
 }
-
-export function copyAttributes<T extends Element = HTMLElement>(target: T, source: T) {
-  for (const attr of source.attributes) {
-    if (attr.nodeValue) {
-      target.setAttribute(attr.nodeName, attr.nodeValue);
-    }
-  }
-}
-
-export function replaceElementTag(e: HTMLElement, tagName: string) {
-  const newTagElement = document.createElement(tagName);
-  copyAttributes(newTagElement, e);
-
-  newTagElement.innerHTML = e.innerHTML;
-  e.parentNode?.replaceChild(newTagElement, e);
-
-  return newTagElement;
-}
-
-export function removeClassesAndDataAttributes(
-  element: HTMLElement,
-  keyword: string,
-): void {
-  Array.from(element.classList).forEach((className) => {
-    if (className.includes(keyword)) {
-      element.classList.remove(className);
-    }
-  });
-
-  Array.from(element.attributes).forEach((attr) => {
-    if (attr.name.startsWith('data-') && attr.name.includes(keyword)) {
-      element.removeAttribute(attr.name);
-    }
-  });
-}
-
-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) {
-  if (e.nextElementSibling) return e.nextElementSibling;
-  if (e.parentElement) return findNextSibling(e.parentElement);
-  return null;
-}
-
-export function areElementsAlike<T extends HTMLElement>(
-  a: T,
-  b: T,
-  options: { id?: boolean; className?: boolean },
-) {
-  if (!a || !b) return false;
-
-  if (options.id && a.id !== b.id) return false;
-
-  if (options.className) {
-    const ca = a.className;
-    const cb = b.className;
-    if (!(ca.length > cb.length ? ca.includes(cb) : cb.includes(ca))) {
-      return false;
-    }
-  }
-  
-  return true;
-}
-
-export function instantiateTemplate(
-  sourceSelector: string,
-  attributeUpdates: Record<string, string>,
-  contentUpdates: Record<string, string>,
-): string {
-  const source = document.querySelector(sourceSelector) as HTMLElement;
-
-  const wrapper = document.createElement('div');
-  const clone = source.cloneNode(true);
-  wrapper.append(clone);
-
-  Object.entries(attributeUpdates).forEach(([attrName, attrValue]) => {
-    wrapper.querySelectorAll(`[${attrName}]`).forEach((element) => {
-      element.setAttribute(attrName, attrValue);
-    });
-  });
-
-  Object.entries(contentUpdates).forEach(([childSelector, textValue]) => {
-    wrapper.querySelectorAll<HTMLElement>(childSelector).forEach((element) => {
-      element.innerText = textValue;
-    });
-  });
-
-  return wrapper.innerHTML;
-}
-
-export function exterminateVideo(video: HTMLVideoElement) {
-  video.removeAttribute('src');
-  video.load();
-  video.remove();
-}
-
-export function downloader(options: {
-  append?: string;
-  after?: string;
-  buttonHtml: string;
-  doBefore?: () => void;
-}) {
-  const btn = parseHtml(options.buttonHtml);
-
-  if (options.append) document.querySelector(options.append)?.append(btn);
-  if (options.after) document.querySelector(options.after)?.after(btn);
-
-  btn?.addEventListener('click', (e) => {
-    e.preventDefault();
-
-    options.doBefore?.();
-
-    waitForElementToAppear(document.body, 'video', (video: Element) => {
-      window.location.href = video.getAttribute('src') as string;
-    });
-  });
-}

package/src/utils/dom/miscellaneous.ts

@@ -0,0 +1,55 @@
+import { parseHtml, waitForElementToAppear } from '.';
+
+export function exterminateVideo(video: HTMLVideoElement) {
+  video.removeAttribute('src');
+  video.load();
+  video.remove();
+}
+
+export function downloader(options: {
+  append?: string;
+  after?: string;
+  buttonHtml: string;
+  doBefore?: () => void;
+}) {
+  const btn = parseHtml(options.buttonHtml);
+
+  if (options.append) document.querySelector(options.append)?.append(btn);
+  if (options.after) document.querySelector(options.after)?.after(btn);
+
+  btn?.addEventListener('click', (e) => {
+    e.preventDefault();
+
+    options.doBefore?.();
+
+    waitForElementToAppear(document.body, 'video', (video: Element) => {
+      window.location.href = video.getAttribute('src') as string;
+    });
+  });
+}
+
+export function instantiateTemplate(
+  sourceSelector: string,
+  attributeUpdates: Record<string, string>,
+  contentUpdates: Record<string, string>,
+): string {
+  const source = document.querySelector(sourceSelector) as HTMLElement;
+
+  const wrapper = document.createElement('div');
+  const clone = source.cloneNode(true);
+  wrapper.append(clone);
+
+  Object.entries(attributeUpdates).forEach(([attrName, attrValue]) => {
+    wrapper.querySelectorAll(`[${attrName}]`).forEach((element) => {
+      element.setAttribute(attrName, attrValue);
+    });
+  });
+
+  Object.entries(contentUpdates).forEach(([childSelector, textValue]) => {
+    wrapper.querySelectorAll<HTMLElement>(childSelector).forEach((element) => {
+      element.innerText = textValue;
+    });
+  });
+
+  return wrapper.innerHTML;
+}

package/src/utils/dom/selectors.ts

@@ -0,0 +1,48 @@
+import { sanitizeStr } from '../strings';
+
+export function querySelectorOrSelf<T extends Element = HTMLElement>(
+  element: T,
+  selector: string,
+): T | null {
+  if (element.matches?.(selector)) {
+    return element as T;
+  }
+  return element.querySelector<T>(selector);
+}
+
+export function querySelectorLast<T extends Element = HTMLElement>(
+  root: ParentNode = document,
+  selector: string,
+): T | undefined {
+  const nodes = root.querySelectorAll<T>(selector);
+  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) {
+  const text = querySelectorText(e, selector);
+  return Number(text.match(/\d+/g)?.pop() || 0);
+}
+
+export function querySelectorText(e: ParentNode, selector?: string): string {
+  if (typeof selector !== 'string') return '';
+  const text = querySelectorOrSelf(e as HTMLElement, selector)?.innerText || '';
+  return sanitizeStr(text);
+}
+
+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) {
+  if (e.nextElementSibling) return e.nextElementSibling;
+  if (e.parentElement) return findNextSibling(e.parentElement);
+  return null;
+}

package/src/utils/events/index.ts

@@ -1,2 +1,2 @@
-export { OnHover } from './on-hover';
-export { Tick } from './tick';
+export * from './on-hover';
+export * from './tick';

package/src/utils/observers/index.ts

@@ -1,40 +1,45 @@
 export { LazyImgLoader } from './lazy-image-loader';
 
-export class Observer {
-  public observer: IntersectionObserver;
+export class Observer<T extends Element = HTMLElement> {
   private timeout?: number;
-  constructor(private callback: (entry: Element) => void) {
+  private observer: IntersectionObserver;
+
+  constructor(private callback: (entry: T) => void) {
     this.observer = new IntersectionObserver(this.handleIntersection.bind(this));
   }
 
-  observe(target: Element) {
+  public observe(target: T) {
     this.observer.observe(target);
   }
 
-  throttle(target: Element, throttleTime: number) {
+  public unobserve(target: T) {
     this.observer.unobserve(target);
+  }
+
+  private throttle(target: T, throttleTime: number) {
+    this.unobserve(target);
     this.timeout = window.setTimeout(() => this.observer.observe(target), throttleTime);
   }
 
-  handleIntersection(entries: Iterable<IntersectionObserverEntry>) {
+  private handleIntersection(entries: Iterable<IntersectionObserverEntry>) {
     for (const entry of entries) {
       if (entry.isIntersecting) {
-        this.callback(entry.target);
+        this.callback(entry.target as T);
       }
     }
   }
 
-  dispose() {
+  public dispose() {
     if (this.timeout) clearTimeout(this.timeout);
     this.observer.disconnect();
   }
 
-  static observeWhile(
-    target: Element,
+  public static observeWhile<T extends Element = HTMLElement>(
+    target: T,
     callback: () => Promise<boolean> | boolean,
     throttleTime: number,
   ) {
-    const observer = new Observer(async (target: Element) => {
+    const observer = new Observer(async (target: T) => {
       const condition = await callback();
       if (condition) {
         observer.throttle(target, throttleTime);

package/src/utils/observers/lazy-image-loader.ts

@@ -1,27 +1,29 @@
-import { Observer } from ".";
+import { Observer } from '.';
 
-export class LazyImgLoader {
-  public lazyImgObserver: Observer;
-  private attributeName = 'data-lazy-load';
+export class LazyImgLoader<T extends Element = HTMLElement> {
+  private lazyImgObserver: Observer;
 
-  constructor(shouldDelazify: (target: Element) => boolean) {
+  constructor(
+    shouldDelazify: (target: T) => boolean,
+    private attributeName = 'data-lazy-orangutan',
+  ) {
     this.lazyImgObserver = new Observer((target: Element) => {
-      if (shouldDelazify(target)) {
-        this.delazify(target as HTMLImageElement);
+      if (shouldDelazify(target as T)) {
+        this.unlazify(target as HTMLImageElement);
       }
     });
   }
 
-  lazify(_target: Element, img?: HTMLImageElement, imgSrc?: string) {
+  public lazify(img?: HTMLImageElement, imgSrc?: string) {
     if (!img || !imgSrc) return;
     img.setAttribute(this.attributeName, imgSrc);
     img.src = '';
     this.lazyImgObserver.observe(img);
   }
 
-  delazify = (target: HTMLImageElement) => {
-    this.lazyImgObserver.observer.unobserve(target);
+  private unlazify(target: HTMLImageElement) {
+    this.lazyImgObserver.unobserve(target);
     target.src = target.getAttribute(this.attributeName) as string;
     target.removeAttribute(this.attributeName);
-  };
+  }
 }

package/src/utils/performance/index.ts

@@ -30,15 +30,21 @@ export function runIdleJob<T>(iterator: Iterator<T>, job: (v: T) => void) {
   });
 }
 
-export function containMutation(container: HTMLElement, callback: () => void) {
+export async function containMutation(container: HTMLElement, mutation: () => void) {
+  const originalContain = container.style.contain;
   container.style.contain = 'content';
+
   try {
-    callback();
-  } finally {
-    requestAnimationFrame(() => {
+    mutation();
+
+    await new Promise<void>((resolve) => {
       requestAnimationFrame(() => {
-        container.style.contain = 'none';
+        requestAnimationFrame(() => {
+          resolve();
+        });
       });
     });
+  } finally {
+    container.style.contain = originalContain;
   }
 }