From fdfbc10cb2b90c470291a3b2fe241956d84ba324 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Thu, 28 Dec 2017 02:29:22 -0800
Subject: [PATCH] Fix scroll wheel volume adjustment on /r/ and /wsr/. Also
 read list of boards allowing audio from 4chan's boards.json.

---
 src/General/BoardConfig.coffee | 4 ++++
 src/Images/Volume.coffee       | 4 ++--
 src/Posting/QR.post.coffee     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/General/BoardConfig.coffee b/src/General/BoardConfig.coffee
index c1e1b1e72..2e1a5b9ad 100644
--- a/src/General/BoardConfig.coffee
+++ b/src/General/BoardConfig.coffee
@@ -41,3 +41,7 @@ BoardConfig =
 
   sfwBoards: (sfw) ->
     board for board, data of (@boards or Conf['boardConfig'].boards) when !!data.ws_board is sfw
+
+  noAudio: (boardID) ->
+    boards = @boards or Conf['boardConfig'].boards
+    boards and !boards[boardID].webm_audio
diff --git a/src/Images/Volume.coffee b/src/Images/Volume.coffee
index 621a50de7..9abf46c3d 100644
--- a/src/Images/Volume.coffee
+++ b/src/Images/Volume.coffee
@@ -16,7 +16,7 @@ Volume =
         name: 'Mouse Wheel Volume'
         cb:   @node
 
-    return unless g.BOARD.ID in ['gif', 'wsg', 'r', 'wsr']
+    return if BoardConfig.noAudio(g.BOARD.ID)
 
     if Conf['Mouse Wheel Volume']
       Callbacks.CatalogThread.push
@@ -60,7 +60,7 @@ Volume =
       Volume.inputs.volume.value = volume
 
   node: ->
-    return unless @board.ID in ['gif', 'wsg'] and @file?.isVideo
+    return unless !BoardConfig.noAudio(@board.ID) and @file?.isVideo
     $.on @file.thumb,                                 'wheel', Volume.wheel.bind(Header.hover)
     $.on ($('.file-info', @file.text) or @file.link), 'wheel', Volume.wheel.bind(@file.thumbLink)
 
diff --git a/src/Posting/QR.post.coffee b/src/Posting/QR.post.coffee
index 7053e5b9b..b73a42a86 100644
--- a/src/Posting/QR.post.coffee
+++ b/src/Posting/QR.post.coffee
@@ -265,7 +265,7 @@ QR.post = class
         @fileError 'Video lacks duration metadata (try remuxing)'
       else if duration > QR.max_duration_video
         @fileError "Video too long (video: #{duration}s, max: #{QR.max_duration_video}s)"
-      if g.BOARD.ID not in ['gif', 'wsg', 'r', 'wsr'] and $.hasAudio el
+      if BoardConfig.noAudio(g.BOARD.ID) and $.hasAudio(el)
         @fileError 'Audio not allowed'
 
   setThumbnail: (el) ->