pervert-monkey 1.0.25 → 1.0.26

package/src/userscripts/index.ts

@@ -1 +1 @@
-import './scripts/motherless';
+import './scripts/eporner';

package/src/userscripts/meta.json

@@ -6,5 +6,5 @@
   "grant": ["unsafeWindow", "GM_addStyle"],
   "homepageURL": "https://sleazyfork.org/en/users/1253342-smartacephale",
   "supportURL": "https://github.com/smartacephale/sleazy-fork/issues",
-  "source": "https://github.com/smartacephale"
+  "source": "https://github.com/smartacephale/sleazy-fork"
 }

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.19',
+  version: '1.0.20',
   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.18',
+  version: '1.6.19',
   description:
     'Adds model links for CamWhores, webcamrecordings, recu.me, camvideos, privat-zapisi',
   match: ['https://camgirlfinder.net/*'],

package/src/userscripts/scripts/camwhores.ts

@@ -17,10 +17,10 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'CamWhores PervertMonkey',
-  version: '3.0.22',
+  version: '3.0.24',
   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.*/*'],
+  match: ['https://*.camwhores.tv/*', 'https://*.camwhores.*/*'],
   exclude: 'https://*.camwhores.tv/*mode=async*',
 };
 

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.19',
+  version: '1.0.20',
   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.20',
+  version: '3.0.21',
   description:
     'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration, Download button.',
   match: [

package/src/userscripts/scripts/eporner.ts

@@ -5,22 +5,24 @@ import { OnHover } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Eporner PervertMonkey',
-  version: '2.0.21',
+  version: '2.1.3',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader, Duration and HD, Sort by Views and Duration',
   match: ['https://*.eporner.com/*', 'https://*.eporner.*/*'],
+  supportURL: 'https://sleazyfork.org/en/scripts/552559-eporner-pervertmonkey/feedback',
 };
 
-const show_video_prev = (unsafeWindow as any).show_video_prev;
-
 const rules = new Rules({
   paginationStrategyOptions: {
     paginationSelector: '.numlist2',
+    // pathnameSelector: /\/(\d+)\/?$/,
+    // pathnameSelector: /\/(\d+)\/([\w-]+\/)?$/
+    overwritePaginationLast: (n, _) => (n === 9 ? 9999 : n),
   },
   thumbs: { selector: 'div[id^=vf][data-id]' },
   thumb: {
     selectors: {
-      title: 'a',
+      title: 'a[href*=video-]',
       uploader: '[title="Uploader"]',
       duration: '[title="Duration"]',
       views: { selector: '[title="Views"]', type: 'float' },
@@ -33,12 +35,38 @@ const rules = new Rules({
   },
   containerSelectorLast: '#vidresults',
   customDataFilterFns: [
-    { quality360: (el, state) => !!state.quality360 && el.quality !== 360 },
-    { quality480: (el, state) => !!state.quality480 && el.quality !== 480 },
-    { quality720: (el, state) => !!state.quality720 && el.quality !== 720 },
-    { quality1080: (el, state) => !!state.quality1080 && el.quality !== 1080 },
-    { quality2k: (el, state) => !!state.quality2k && el.quality !== 2 },
-    { quality4k: (el, state) => !!state.quality4k && el.quality !== 4 },
+    {
+      qualityFilter: {
+        handle(el, state) {
+          const hasAnyQualitySelected =
+            state.quality360 ||
+            state.quality480 ||
+            state.quality720 ||
+            state.quality1080 ||
+            state.quality2k ||
+            state.quality4k;
+
+          if (!hasAnyQualitySelected) return false;
+
+          return !(
+            (state.quality360 && el.quality === 360) ||
+            (state.quality480 && el.quality === 480) ||
+            (state.quality720 && el.quality === 720) ||
+            (state.quality1080 && el.quality === 1080) ||
+            (state.quality2k && el.quality === 2) ||
+            (state.quality4k && el.quality === 4)
+          );
+        },
+        deps: [
+          'quality360',
+          'quality480',
+          'quality720',
+          'quality1080',
+          'quality2k',
+          'quality4k',
+        ],
+      },
+    },
   ],
   schemeOptions: [
     'Title Filter',
@@ -59,15 +87,13 @@ const rules = new Rules({
     'Badge',
     'Advanced',
   ],
-  gropeStrategy: 'all-in-all',
+  gropeStrategy: 'all-in-one',
   animatePreview,
 });
 
 function animatePreview(doc: HTMLElement) {
   OnHover.create(doc, 'div[id^=vf][data-id]', (e) => {
-    const target = e as HTMLImageElement;
-    const thumb = target.closest('[data-id]');
-    const id = thumb?.getAttribute('data-id');
-    show_video_prev(id);
+    const thumb = e.closest('[data-id]');
+    (unsafeWindow as any).EP.thumbs.preview.start(thumb);
   });
 }

package/src/userscripts/scripts/erome.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Erome PervertMonkey',
-  version: '5.0.20',
+  version: '5.0.21',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Video/Photo albums, Sort by Views. Show/Hide Photos in album. Remove disclaimer. Restore Search Bar',
   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.19',
+  version: '2.0.21',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: ['https://*.eroprofile.com/*'],
 };
@@ -12,17 +12,17 @@ document.querySelector('.videoGrid')?.after(document.querySelector('.clB') as HT
 
 const rules = new Rules({
   paginationStrategyOptions: {
-    paginationSelector: '.boxNav2',
+    paginationSelector: '.page-nav',
     searchParamSelector: 'pnum',
   },
-  thumbs: { selector: '.video' },
+  thumbs: { selector: '.grid-tile-video' },
   thumb: {
     selectors: {
-      title: '[title]',
-      duration: '.videoDur',
+      title: '.title',
+      duration: '.duration',
     },
   },
-  containerSelector: '.videoGrid',
+  containerSelector: 'div:has(>.grid-tile-video)',
   schemeOptions: [
     'Title Filter',
     'Duration Filter',

package/src/userscripts/scripts/javhdporn.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Javhdporn PervertMonkey',
-  version: '3.0.19',
+  version: '3.0.20',
   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.18',
+  version: '3.0.19',
   description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://*.missav123.com/*',

package/src/userscripts/scripts/motherless.ts

@@ -1,14 +1,20 @@
 import type { MonkeyUserScript } from 'vite-plugin-monkey';
 import { GM_addElement, GM_addStyle, unsafeWindow } from '$';
 import { Rules } from '../../core';
-import { fetchWith, OnHover, replaceElementTag, Tick } from '../../utils';
+import {
+  fetchWith,
+  OnHover,
+  replaceElementTag,
+  Tick,
+  waitForElementToAppear,
+} from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Motherless PervertMonkey',
-  version: '5.0.20',
+  version: '5.0.25',
   description:
     'Infinite scroll [optional], Filter by Title, Uploader and Duration, Sort by Duration and Views',
-  match: ['https://motherless.com/*'],
+  match: ['https://motherless.xxx/*'],
   grant: ['GM_addElement', 'GM_addStyle', 'unsafeWindow'],
 };
 
@@ -16,7 +22,7 @@ export const meta: MonkeyUserScript = {
 const $ = (unsafeWindow as any).$;
 
 const rules = new Rules({
-  containerSelectorLast: '.content-inner',
+  containerSelector: '.content-inner',
   thumbs: { selector: '.thumb-container, .mobile-thumb' },
   thumb: {
     selectors: {
@@ -142,25 +148,28 @@ async function desktopAddMobGalleries() {
   const galleries = document.querySelector('.media-related-galleries');
   if (!galleries) return;
 
+  await new Promise((resolve) => {
+    waitForElementToAppear(document, '.thumb-container.gallery-container', resolve);
+  });
+
+  const mobDom = await fetchWith<HTMLElement>(window.location.href, {
+    type: 'html',
+    mobile: true,
+  });
+  const mobGalleries = mobDom.querySelectorAll<HTMLElement>('.ml-gallery-thumb');
+
   const galleriesContainer = galleries.querySelector('.content-inner') as HTMLElement;
-  const galleriesCount = galleries.querySelectorAll('.gallery-container').length;
-  const mobDom = await fetchWith(window.location.href, { type: 'html', mobile: true });
-  const mobGalleries = (mobDom as HTMLElement).querySelectorAll<HTMLElement>(
-    '.ml-gallery-thumb',
-  );
-
-  for (const [i, x] of mobGalleries.entries()) {
-    if (i > galleriesCount - 1) {
-      galleriesContainer.append(mobileGalleryToDesktop(x));
-    }
+
+  for (const x of mobGalleries.values()) {
+    const mobGallery = mobileGalleryToDesktop(x);
+    const mobGalleryId = (mobGallery.querySelector('a') as HTMLAnchorElement).href
+      .split('/')
+      .at(-1);
+    if (galleriesContainer.querySelector(`a[href*=${mobGalleryId}]`)) continue;
+    galleriesContainer.append(mobGallery);
   }
 }
 
-const overwrite1 = (x: string) => `@media only screen and (max-width: 1280px) {
-  #categories-page.inner ${x} }`;
-
-rules.dataManager.dataFilter.createCssFilters(overwrite1);
-
 GM_addStyle(`
 .img-container, .desktop-thumb { min-height: 150px; max-height: 150px; }
 

package/src/userscripts/scripts/namethatporn.ts

@@ -4,7 +4,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'NameThatPorn PervertMonkey',
-  version: '3.0.19',
+  version: '3.0.20',
   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.19',
+  version: '4.0.20',
   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.21',
+  version: '1.0.22',
   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.19',
+  version: '4.0.20',
   description:
     'Infinite scroll [optional]. Filter by Title, Uploader and Duration. Sort by Duration and Views',
   match: ['https://*.pornhub.com/*'],

package/src/userscripts/scripts/simpcity.ts

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Simpcity PervertMonkey',
-  version: '1.0.1',
+  version: '1.0.2',
   description: 'Infinite scroll [optional], Filter by Title',
   match: 'https://simpcity.cr/threads/*',
   'run-at': 'document-end',

package/src/userscripts/scripts/{socialmediagirls copy.ts → socialmediagirls.ts}

@@ -3,7 +3,7 @@ import { Rules } from '../../core';
 
 export const meta: MonkeyUserScript = {
   name: 'Socialmediagirls PervertMonkey',
-  version: '1.0.4',
+  version: '1.0.5',
   description: 'Infinite scroll [optional], Filter by Title',
   match: 'https://forums.socialmediagirls.com/threads/*',
   'run-at': 'document-end',

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.19',
+  version: '4.1.0',
   description:
     'Infinite scroll [optional]. Filter by Title and Duration. Sort by Duration and Views',
   match: ['https://*.spankbang.com/*', 'https://*.spankbang.*/*'],
@@ -27,9 +27,25 @@ const rules = new Rules({
   thumbImg: { strategy: 'auto' },
   gropeStrategy: 'all-in-all',
   customDataFilterFns: [
-    { qualityLow: (e, state) => !!state.qualityLow && e.quality !== '' },
-    { qualityHD: (e, state) => !!state.qualityHD && e.quality !== 'HD' },
-    { quality4k: (e, state) => !!state.quality4k && e.quality !== '4K' },
+    {
+      qualityFilter: {
+        handle(el, state) {
+          const hasAnyQualitySelected =
+            state.qualityLow ||
+            state.qualityHD ||
+            state.quality4k;
+
+          if (!hasAnyQualitySelected) return false;
+
+          return !(
+            (state.qualityLow && el.quality === '') ||
+            (state.qualityHD && el.quality === 'HD') ||
+            (state.quality4k && el.quality === '4K')
+          );
+        },
+        deps: ['qualityLow', 'qualityHD', 'quality4k'],
+      },
+    },
   ],
   schemeOptions: [
     'Title Filter',

package/src/userscripts/scripts/thisvid.ts

@@ -21,7 +21,7 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'ThisVid.com PervertMonkey',
-  version: '8.0.20',
+  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.21',
+  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.21',
+  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;