fix: disable april fools setting automatically

Author: feildmaster

changelog.md

@@ -1,5 +1,8 @@
 # UnderScript Changelog
 
+## Version 0.62.2 (2025-04-09)
+1. Fixed April Fools setting being too aggressive
+
 ## Version 0.62.1 (2025-04-04)
 1. Fixed plugins breaking when providing custom settings
 

src/base/underscript/updates.js

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import luxon from 'luxon';
 import * as settings from '../../utils/settings/index.js';
 import style from '../../utils/style.js';
@@ -10,7 +9,7 @@ import * as menu from '../../utils/menu.js';
 import semver from '../../utils/version.js';
 import { buttonCSS, scriptVersion } from '../../utils/1.variables.js';
 import css from '../../utils/css.js';
-import { captureError } from '../../utils/sentry.js';
+import { createParser } from '../../utils/updater/index.js';
 
 // Check for script updates
 wrap(() => {
@@ -30,21 +29,19 @@ wrap(() => {
       font-size: 17px;
     }
   `);
-  const baseURL = 'https://unpkg.com/';
+  const checker = window.checker = createParser({ updateURL: 'UCProjects/UnderScript' });
   const MINUTE = 60 * 1000;
   const HOUR = 60 * MINUTE;
   const CHECKING = 'underscript.update.checking';
   const LAST = 'underscript.update.last';
   const DEBUG = 'underscript.debug.update';
   const LATEST = 'underscript.update.latest';
-  const base = axios.create({ baseURL });
   const latest = { // TODO: can I get away with storing this in sessionStorage?
-    set({ version, unpkg }) {
-      if (!version || !unpkg) return;
+    set({ version, ...data }) {
+      if (!version) return;
       localStorage.setItem(LATEST, JSON.stringify({
+        ...data,
         version,
-        unpkg,
-        time: Date.now(),
       }));
     },
     del() {
@@ -61,21 +58,22 @@ wrap(() => {
   let toast;
   let updateToast;
   let autoTimeout;
-  function check() {
-    if (sessionStorage.getItem(CHECKING)) return Promise.resolve();
+  async function check() {
+    if (sessionStorage.getItem(CHECKING)) return undefined;
     sessionStorage.setItem(CHECKING, true);
-    return base.get(`underscript@latest/package.json`).then((response) => {
-      sessionStorage.removeItem(CHECKING);
-      localStorage.setItem(LAST, Date.now());
-      return response;
-    }).catch((error) => {
-      captureError(error);
-      sessionStorage.removeItem(CHECKING);
+    try {
+      const data = checker.getUpdateData();
+      return {
+        version: await checker.getVersion(data),
+        url: await checker.getDownload(data),
+      };
+    } catch (error) {
       debugToast(error);
-      if (toast) {
-        toast.setText('Failed to connect to server.');
-      }
-    });
+      toast?.setText('Failed to retrieve update.');
+      return undefined;
+    } finally {
+      sessionStorage.setItem(CHECKING, false);
+    }
   }
   function noUpdateFound() {
     const ref = toast;
@@ -87,7 +85,6 @@ wrap(() => {
   function isNewer(data) {
     const version = scriptVersion;
     if (version === 'L' && !localStorage.getItem(DEBUG)) return false;
-    if (data.time && data.time < GM_info.script.lastModified) return false; // Check if stored version is newer than script date
     if (version.includes('-')) return semver(data.version, version); // Allow test scripts to update to release
     return data.version !== version; // Always assume that the marked version is better
   }
@@ -98,36 +95,18 @@ wrap(() => {
     }
     latest.set(data);
     if (updateToast) updateToast.close('stale');
-    const path = `underscript@${data.version}/${data.unpkg}`;
     updateToast = BasicToast({
       title: '[UnderScript] Update Available!',
       text: `Version ${data.version}.`,
       className: 'dismissable',
       buttons: [{
-        text: 'Update (github)',
-        className: 'dismiss',
-        css: buttonCSS,
-      }, {
-        text: 'Update (unpkg)',
-        className: 'dismiss',
-        css: buttonCSS,
-        onclick(e) {
-          location.href = `${baseURL}/${path}`;
-          updateToast.close('update');
-        },
-      }, {
-        text: 'Update (jsdelivr)',
+        text: 'Update',
         className: 'dismiss',
         css: buttonCSS,
-        onclick: (e) => {
-          location.href = `https://cdn.jsdelivr.net/npm/${path}`;
-          updateToast.close('update');
+        onclick() {
+          location.href = data.url || `https://github.com/UCProjects/UnderScript/releases/download/${data.version}/undercards.user.js`;
         },
       }],
-      onClose(reason) {
-        if (reason !== 'dismissed') return;
-        location.href = `https://github.com/UCProjects/UnderScript/releases/download/${data.version}/undercards.user.js`;
-      },
     });
     return true;
   }

src/base/vanilla/aprilFools.js

@@ -2,32 +2,38 @@ import eventManager from '../../utils/eventManager.js';
 import * as settings from '../../utils/settings/index.js';
 import { isApril, IMAGES } from '../../utils/isApril.js';
 
+const year = `${new Date().getFullYear()}`;
 const aprilFools = settings.register({
   name: 'Disable April Fools Jokes',
   key: 'underscript.disable.fishday',
   note: 'Disables *almost* everything.',
-  hidden: () => !isApril(),
+  data: { extraValue: year },
+  hidden: () => !isApril() || isSoftDisabled(),
   onChange() {
     toggleFish($('body'));
   },
 });
+function isSoftDisabled() {
+  return localStorage.getItem(aprilFools.key) === year;
+}
 
 const basePath = 'images';
 
 function toggleFish($el) {
   const disabled = aprilFools.value();
   const search = disabled ? IMAGES : basePath;
-  const replace = disabled ? [IMAGES, basePath] : [basePath, IMAGES];
+  const replace = disabled ? basePath : IMAGES;
 
   $el.find(`img[src*="undercards.net/${search}/"],img[src^="/${search}/"],img[src^="${search}/"]`).each((_, img) => {
-    img.src = img.src.replace(...replace);
-  });
+    img.src = img.src.replace(search, replace);
+  }).on('error', () => aprilFools.set(year));
   $el.find(`[style*="url(\\"${search}/"]`).each((i, img) => {
-    img.style.background = img.style.background.replace(...replace);
-  });
+    img.style.background = img.style.background.replace(search, replace);
+  }).on('error', () => aprilFools.set(year));
 }
 
-if (isApril()) {
+eventManager.on('undercards:season', () => {
+  if (!isApril() || isSoftDisabled()) return;
   eventManager.on(':load', () => {
     toggleFish($('body'));
   });
@@ -44,4 +50,4 @@ if (isApril()) {
   eventManager.on('Home:Refresh', () => {
     toggleFish($('table.spectateTable'));
   });
-}
+});

src/utils/season.js

@@ -22,4 +22,5 @@ eventManager.on('translation:loaded', () => {
 
   season = Number(seasonKey.substring(startsWith.length, seasonKey.indexOf('-', startsWith.length)));
   sessionStorage.setItem('undercards.season', season);
+  eventManager.singleton.emit('undercards:season', season);
 });

src/utils/settings/types/boolean.js

@@ -5,9 +5,9 @@ export default class extends Setting {
     super(name);
   }
 
-  value(val) {
+  value(val, { extraValue } = {}) {
     if (typeof val === 'boolean') return val;
-    return ['1', 'true', 1].includes(val);
+    return ['1', 'true', 1, `${extraValue}`].includes(val);
   }
 
   element(value, update, {