chore: wrap instead of manual try, catch

Author: feildmaster

changelog.md

@@ -3,8 +3,14 @@
 ## Version 0.46.0 (2021-06-)
 ### New Features
 1. Added modes to "Random fill deck" button
+1. Added "new card" toast
 ### Fixes
-1. Fixed deck storage loading (hopefully?)
+1. Fixed deck storage loading
+1. Fixed chat not showing up with certain settings
+### Plugins
+1. Expose `underscript.utils`
+1. Expose `underscript.lib`
+1. BootstrapDialog events `BootstrapDialog:create|show|shown|hide|hidden`
 
 ## Version 0.45.1 (2021-06-16)
 1. Fixed import bug (what does testing mean?)\

package-lock.json

@@ -39,6 +39,7 @@
     "gulp-insert": "^0.5.0",
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
+    "parcel": "^2.0.0-nightly.750",
     "replace": "^1.2.1",
     "rollup": "^2.35.1",
     "rollup-plugin-cleanup": "^3.2.1"

package.json

@@ -7,7 +7,7 @@ wrap(() => {
 
   eventManager.on('ChatDetected', () => {
     // TODO: check regex (linting errors)
-    const regex = /\b((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
+    const regex = /\b((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()[\]{};:'".,<>?«»“”‘’]))/gi;
     globalSet('linkify', function linkify(text) {
       if (settings.value('underscript.disable.linkify')) {
         return this.super(text);

src/base/chat/newLinkify.js

@@ -3,7 +3,7 @@ wrap(() => {
     const original = args[`on${key}`];
     function wrapper(dialog) {
       if (typeof original === 'function') {
-        original(dialog);
+        wrap(() => original(dialog), `BootstrapDialog:on${key}`);
       }
       eventManager.emit(`BootstrapDialog:${key}`, dialog);
     }

src/hooks/BootstrapDialog.js

@@ -6,10 +6,8 @@ wrap(() => {
     eventManager.on(':loaded', () => {
       function callGameHooks(data, original) {
         const run = !eventManager.cancelable.emit('PreGameEvent', data).canceled;
-        try {
-          if (run) original(data);
-        } catch (e) {
-          console.error(e); // eslint-disable-line no-console
+        if (run) {
+          wrap(() => original(data));
         }
         eventManager.emit('GameEvent', data);
       }

src/hooks/game.js

@@ -17,11 +17,7 @@ onPage('Play', () => {
     globalSet('onMessage', function onMessage(event) {
       const data = JSON.parse(event.data);
       eventManager.emit(`pre:${data.action}`, data);
-      try {
-        this.super(event);
-      } catch (e) {
-        console.error(e); // eslint-disable-line no-console
-      }
+      wrap(() => this.super(event));
       eventManager.emit('Play:Message', data);
       eventManager.emit(data.action, data);
     });

src/hooks/play.js

@@ -5,10 +5,8 @@ onPage('Spectate', () => {
   eventManager.on(':loaded', () => {
     function callGameHooks(data, original) {
       const run = !eventManager.emit('PreGameEvent', data, data.action === 'getResult').canceled;
-      try {
-        if (run) original(data);
-      } catch (e) {
-        console.error(e); // eslint-disable-line no-console
+      if (run) {
+        wrap(() => original(data));
       }
       eventManager.emit('GameEvent', data);
     }

src/hooks/spectate.js

@@ -472,16 +472,14 @@ const settings = wrap(() => {
   }
 
   function importSettings(string) {
-    try {
+    wrap(() => {
       // TODO: Call setting events?
       const parsed = JSON.parse(atob(string));
       fn.each(parsed, (val, key) => {
         console.log(key, val);
         localStorage.setItem(key, val);
       });
-    } catch (e) {
-      console.error(e);
-    }
+    });
   }
 
   // Add our button last
@@ -498,6 +496,7 @@ const settings = wrap(() => {
         if (!this.enabled()) {
           return 'Settings temporarily unavailable';
         }
+        return undefined;
       },
     });
   });