pervert-monkey 1.0.24 → 1.0.26

package/src/userscripts/scripts/thisvid.ts

@@ -21,7 +21,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'ThisVid.com PervertMonkey',
-  version: '8.0.19',
+  version: '8.0.23',
   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/*'],
@@ -138,8 +138,6 @@ GM_addStyle(`
   .friendProfile { background: radial-gradient(circle, rgb(28, 42, 50) 48%, rgb(0, 0, 0) 100%) !important; }
   `);
 
-//====================================================================================================
-
 function friend(id: string, message = '') {
   return fetch(
     `https://thisvid.com/members/${id}/?action=add_to_friends_complete&function=get_block&block_id=member_profile_view_view_profile&format=json&mode=async&message=${message}`,
@@ -209,7 +207,7 @@ async function friendMemberFriends(orientationFilter?: string) {
             await friend(fid);
           }
         }
-      }, 60),
+      }, 5),
     )
     .forEach(() => {});
 }
@@ -247,8 +245,6 @@ function initFriendship() {
   }
 }
 
-//====================================================================================================
-
 type MemberData = {
   uploadedPublic: number;
   uploadedPrivate: number;
@@ -284,8 +280,6 @@ async function getMemberData(id: string) {
   return data as MemberData;
 }
 
-//====================================================================================================
-
 function requestAccessVideoPage() {
   const holder = document.querySelector('.video-holder > p');
   if (holder) {
@@ -308,6 +302,8 @@ const requestPrivateAccess = (e: PointerEvent, memberid: string) => {
   );
 };
 
+Object.assign(unsafeWindow, { requestPrivateAccess });
+
 async function checkPrivateVideoAccess(url: string) {
   const html = await fetchHtml(url);
   const holder = html.querySelector('.video-holder > p');
@@ -317,6 +313,9 @@ async function checkPrivateVideoAccess(url: string) {
   const uploaderEl = (
     holder ? holder.querySelector('a') : html.querySelector('a.author')
   ) as HTMLAnchorElement;
+
+  if (!uploaderEl) return { access: false, uploaderURL: '' };
+
   const uploaderURL = uploaderEl.href.match(/\d+/)?.at(-1) as string;
   const uploaderName = uploaderEl.innerText;
 
@@ -344,7 +343,7 @@ async function requestAccess() {
     const { access, uploaderURL } = await checkPrivateVideoAccess(url);
 
     thumb.classList.add(access ? 'haveAccess' : 'haveNoAccess');
-    if (access) return;
+    if (access || uploaderURL === '') return;
 
     if (rules.store.state.autoRequestAccess && !uploadersChecked.has(uploaderURL)) {
       acceptFriendship(uploaderURL);
@@ -357,8 +356,6 @@ async function requestAccess() {
   }
 }
 
-//====================================================================================================
-
 const createDownloadButton = () =>
   downloader({
     after: '.share_btn',
@@ -367,8 +364,6 @@ const createDownloadButton = () =>
     doBefore: () => $('.fp-ui').click(),
   });
 
-//====================================================================================================
-
 function animatePreview(_: HTMLElement) {
   const tick = new Tick(750);
   $('img[alt!="Private"]').off();
@@ -402,8 +397,6 @@ function animatePreview(_: HTMLElement) {
   );
 }
 
-//====================================================================================================
-
 async function getMemberVideos(id: string, type = 'private') {
   const { uploadedPrivate, uploadedPublic, name } = await getMemberData(id);
   const videosCount = type === 'private' ? uploadedPrivate : uploadedPublic;
@@ -625,8 +618,6 @@ async function createPrivateFeed() {
   return rulesConfig;
 }
 
-//====================================================================================================
-
 function deleteMsg(id: string) {
   fetch(
     `https://thisvid.com/my_messages/inbox/?mode=async&format=json&action=delete&function=get_block&block_id=list_messages_my_conversation_messages&delete[]=${id}`,
@@ -673,8 +664,6 @@ function highlightMessages() {
   });
 }
 
-//====================================================================================================
-
 if (LOGGED_IN) {
   rules.store.eventSubject.subscribe((x) => {
     if (x.includes('check access')) {
@@ -697,8 +686,6 @@ if (IS_OTHER_MEMBER_PAGE) {
   initFriendship();
 }
 
-Object.assign(unsafeWindow, { requestPrivateAccess });
-
 if (IS_MEMBER_FRIEND) {
   document.querySelector('.profile')?.classList.add('friendProfile');
 }

package/src/userscripts/scripts/xhamster.ts

@@ -14,7 +14,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'Xhamster PervertMonkey',
-  version: '5.0.20',
+  version: '5.0.23',
   description:
     'Infinite scroll [optional], Filter by Title, Duration and Watched/Unwatched. Sort by Duration and Views',
   match: ['https://*.xhamster.com/*', 'https://*.xhamster.*/*'],
@@ -88,7 +88,15 @@ const rules = new Rules({
   paginationStrategyOptions,
   getPaginationData,
   containerSelectorLast: '.thumb-list',
-  thumbs: { selector: '.video-thumb' },
+  thumbs: {
+    selector: '.video-thumb',
+    transform: (thumb: HTMLElement) => {
+      if (thumb.querySelector('[class*=placeholder]')) {
+        console.log('has placeholder', thumb);
+      }
+      return thumb;
+    },
+  },
   thumb: {
     selectors: {
       title: '.video-thumb-info__name,.video-thumb-info>a',
@@ -99,7 +107,7 @@ const rules = new Rules({
   },
   thumbImg: {
     strategy: 'auto',
-    remove: '[loading]',
+    // remove: '[loading]',
   },
   gropeStrategy: 'all-in-all',
   customDataFilterFns: [

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.20',
+  version: '4.1.0',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Duration. Sort by Duration and Views.',
   match: 'https://*.xvideos.com/*',
@@ -36,12 +36,31 @@ const rules = new Rules({
     },
   },
   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' },
+    {
+      qualityFilter: {
+        handle(el, state) {
+          const hasAnyQualitySelected =
+            state.qualityLow ||
+            state.quality360 ||
+            state.quality720 ||
+            state.quality1080 ||
+            state.quality1440 ||
+            state.quality4k;
+
+          if (!hasAnyQualitySelected) return false;
+
+          return !(
+            (state.qualityLow && el.quality === '') ||
+            (state.quality360 && el.quality === '360p') ||
+            (state.quality720 && el.quality === '720p') ||
+            (state.quality1080 && el.quality === '1080p') ||
+            (state.quality1440 && el.quality === '1440p') ||
+            (state.quality4k && el.quality === '4k')
+          );
+        },
+        deps: ['qualityLow', 'quality360', 'quality720', 'quality1080', 'quality1440', 'quality4k'],
+      },
+    },
   ],
   schemeOptions: [
     'Title Filter',

package/src/utils/fetch/index.ts

@@ -31,7 +31,9 @@ export async function fetchWith<T extends JSON | string | HTMLElement>(
 
 export const fetchJson = (input: RequestInfo | URL) =>
   fetchWith<JSON>(input, { type: 'json' });
+
 export const fetchHtml = (input: RequestInfo | URL) =>
   fetchWith<HTMLElement>(input, { type: 'html' });
+
 export const fetchText = (input: RequestInfo | URL) =>
   fetchWith<string>(input, { type: 'text' });

package/src/utils/objects/memoize.ts

@@ -10,15 +10,7 @@ export function memoize<T extends AnyFunction>(fn: T): MemoizedFunction<T> {
 
   const memoizedFunction = ((...args: Parameters<T>): ReturnType<T> => {
     const key = JSON.stringify(args);
-
-    if (cache.has(key)) {
-      return cache.get(key) as ReturnType<T>;
-    }
-
-    const result = fn(...args);
-    cache.set(key, result);
-
-    return result;
+    return cache.getOrInsertComputed(key, () => fn(...args));
   }) as MemoizedFunction<T>;
 
   return memoizedFunction;