From f7a4ab2cf15a865102a721cea3da2fc2e4665297 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2026 20:16:29 +0300
Subject: [PATCH] cleanup

---
 .../settings_modal/tabs/clutter_tab.js         | 18 ++++++++----------
 .../settings_modal/tabs/filtering_tab.js       | 18 ++++++++----------
 src/services/color_convert/color_convert.js    |  8 ++++----
 src/services/ruffle_service/ruffle_service.js  |  6 +++---
 src/services/sw/sw.js                          |  2 +-
 .../user_highlighter/user_highlighter.js       |  2 +-
 6 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index 85749ab3f..6cec2ce93 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -75,16 +75,14 @@ const ClutterTab = {
       }
       return valid
     },
-    createFilter(
-      filter = {
-        type: 'word',
-        value: '',
-        name: 'New Filter',
-        enabled: true,
-        expires: null,
-        hide: false,
-      },
-    ) {
+    createFilter({
+      type = 'word',
+      value = '',
+      name = 'New Filter',
+      enabled = true,
+      expires = null,
+      hide = false,
+    }) {
       const newId = uuidv4()
 
       filter.order = this.muteFilters.length + 2
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index e0d0f6879..a8c7f3e1b 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -190,16 +190,14 @@ const FilteringTab = {
       }
       return valid
     },
-    createFilter(
-      filter = {
-        type: 'word',
-        value: '',
-        name: 'New Filter',
-        enabled: true,
-        expires: null,
-        hide: false,
-      },
-    ) {
+    createFilter({
+      type = 'word',
+      value = '',
+      name = 'New Filter',
+      enabled = true,
+      expires = null,
+      hide = false,
+    }) {
       const newId = uuidv4()
 
       filter.order = this.muteFilters.length + 2
diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js
index dded73da3..768552b1c 100644
--- a/src/services/color_convert/color_convert.js
+++ b/src/services/color_convert/color_convert.js
@@ -210,16 +210,16 @@ export const rgba2css = function (rgba) {
   }
 
   if (rgba !== null) {
-    if (rgba.r !== undefined && !isNaN(rgba.r)) {
+    if (rgba.r !== undefined && !Number.isNaN(rgba.r)) {
       base.r = rgba.r
     }
-    if (rgba.g !== undefined && !isNaN(rgba.g)) {
+    if (rgba.g !== undefined && !Number.isNaN(rgba.g)) {
       base.g = rgba.g
     }
-    if (rgba.b !== undefined && !isNaN(rgba.b)) {
+    if (rgba.b !== undefined && !Number.isNaN(rgba.b)) {
       base.b = rgba.b
     }
-    if (rgba.a !== undefined && !isNaN(rgba.a)) {
+    if (rgba.a !== undefined && !Number.isNaN(rgba.a)) {
       base.a = rgba.a
     }
   } else {
diff --git a/src/services/ruffle_service/ruffle_service.js b/src/services/ruffle_service/ruffle_service.js
index c029330aa..298f32df3 100644
--- a/src/services/ruffle_service/ruffle_service.js
+++ b/src/services/ruffle_service/ruffle_service.js
@@ -25,13 +25,13 @@ const createRuffleService = () => {
       script.src = '/static/ruffle/ruffle.js'
       script.type = 'text/javascript'
       script.onerror = (e) => {
-        reject(e)
+        reject(new Error('Ruffle script errorred', e))
       }
       script.onabort = (e) => {
-        reject(e)
+        reject(new Error('Ruffle script aborted', e))
       }
       script.oncancel = (e) => {
-        reject(e)
+        reject(new Error('Ruffle script cancelled', e))
       }
       script.onload = () => {
         ruffleInstance = window.RufflePlayer
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index 2b7dabd41..4f044c426 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -3,7 +3,7 @@ function urlBase64ToUint8Array(base64String) {
   const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
   const base64 = (base64String + padding)
     .replaceAll('-', '+')
-    .replace(/_/g, '/')
+    .replaceAll('_', '/')
 
   const rawData = window.atob(base64)
   return Uint8Array.from([...rawData].map((char) => char.codePointAt(0)))
diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js
index e3f94ea1a..abd0d9633 100644
--- a/src/services/user_highlighter/user_highlighter.js
+++ b/src/services/user_highlighter/user_highlighter.js
@@ -47,7 +47,7 @@ const highlightStyle = (prefs) => {
 
 const highlightClass = (user) => {
   return (
-    'USER____' + user.screen_name?.replaceAll('.', '_').replace(/@/g, '_AT_')
+    'USER____' + user.screen_name?.replaceAll('.', '_').replaceAll('@', '_AT_')
   )
 }