add setting to make all spoilers visible

SmCTwelve · Jul 6, 2019 · 0fb1032 · 0fb1032
1 parent a7e0a59
commit 0fb1032
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
@@ -89,7 +89,8 @@ const settingsdefault = new Map([
     ['hidensfw', false],
     ['animateforever', true],
     ['formatter-green', true],
-    ['formatter-emote', true]
+    ['formatter-emote', true],
+    ['showspoilers', false]
 ]);
 const commandsinfo = new Map([
     ['help', {desc: 'Helpful information.'}],

diff --git a/assets/chat/js/formatters.js b/assets/chat/js/formatters.js
@@ -1,5 +1,6 @@
 import UserFeatures from './features';
 import {GENERIFY_OPTIONS, HALLOWEEN_RANDOM_EFFECTS, HALLOWEEN_RANDOM_DELAYS, HALLOWEEN_BLACKLIST, HAT_BLACKLIST, HAT_SPECIAL_BLACKLIST} from './const'
+//import Chat from './chat';
 
 
 /** @var Array tlds */
@@ -256,7 +257,8 @@ class CodeFormatter {
     }
 }
 
-function stringSpoilerParser(str) {
+function stringSpoilerParser(str, visible) {
+    var classes = visible ? 'spoiler visible' : 'spoiler';
     var indexOne = str.indexOf('||');
     if (indexOne !== -1) {
         var afterTag = str.substring(indexOne + 2);
@@ -265,16 +267,16 @@ function stringSpoilerParser(str) {
             var betweenTags = afterTag.substring(0, indexTwo);
             var subString = RegExp('^\\s*$').test(betweenTags)
                 ? str.substring(0, indexOne) + '||||'
-                : str.substring(0, indexOne) + `<span class="spoiler">${betweenTags.trim()}</span>`;
-            str = subString + stringSpoilerParser(afterTag.substring(indexTwo + 2));
+                : str.substring(0, indexOne) + `<span class="${classes}">${betweenTags.trim()}</span>`;
+            str = subString + stringSpoilerParser(afterTag.substring(indexTwo + 2), visible);
         }
     }
     return str;
 }
 
 class SpoilerFormatter {
     format(chat, str, message = null) {
-        return stringSpoilerParser(str);
+        return stringSpoilerParser(str, chat.settings.get('showspoilers'));
     }
 }
 

diff --git a/assets/index.html b/assets/index.html
@@ -85,6 +85,11 @@ <h4>Messages</h4>
                                     <input name="animateforever" type="checkbox" /> Loop animated emotes forever
                                 </label>
                             </div>
+                            <div class="form-group checkbox">
+                                <label title="Always show spoilers">
+                                    <input name="showspoilers" type="checkbox" /> Always show spoilers
+                                </label>
+                            </div>
                             <div class="form-group">
                                 <label for="showremoved">Banned messages</label>
                                 <select class="form-control" id="showremoved" name="showremoved">