From 5814dadcf772b90faa76ceaed550e0fe543f29d0 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sun, 21 Jul 2019 23:11:49 -0700
Subject: [PATCH] Make list of banners configurable.

---
 src/General/Settings/Advanced.html                | 6 ++++++
 src/Miscellaneous/Banner.coffee                   | 4 +---
 src/config/Config.coffee                          | 2 ++
 src/{Miscellaneous/Banner => config}/banners.json | 0
 src/css/style.css                                 | 3 ++-
 tools/banners.py                                  | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)
 rename src/{Miscellaneous/Banner => config}/banners.json (100%)

diff --git a/src/General/Settings/Advanced.html b/src/General/Settings/Advanced.html
index 25768954b..d0066b3a0 100644
--- a/src/General/Settings/Advanced.html
+++ b/src/General/Settings/Advanced.html
@@ -183,3 +183,9 @@
   </div>
   <textarea hidden name="jsWhitelist" class="field" spellcheck="false"></textarea>
 </fieldset>
+
+<fieldset>
+  <legend>Known Banners</legend>
+  <div>List of known banners, used for click-to-change feature.</div>
+  <textarea hidden name="knownBanners" class="field" spellcheck="false"></textarea>
+</fieldset>
diff --git a/src/Miscellaneous/Banner.coffee b/src/Miscellaneous/Banner.coffee
index 271deaa0d..87705d9bd 100644
--- a/src/Miscellaneous/Banner.coffee
+++ b/src/Miscellaneous/Banner.coffee
@@ -1,6 +1,4 @@
 Banner =
-  banners: `<%= JSON.stringify(readJSON('banners.json')) %>`
-
   init: ->
     if Conf['Custom Board Titles']
       @db = new DataBoard 'customTitles', null, true
@@ -44,7 +42,7 @@ Banner =
   cb:
     toggle: ->
       unless Banner.choices?.length
-        Banner.choices = Banner.banners.slice()
+        Banner.choices = Conf['knownBanners'].split(',').slice()
       i = Math.floor(Banner.choices.length * Math.random())
       banner = Banner.choices.splice i, 1
       $('img', @parentNode).src = "//s.4cdn.org/image/title/#{banner}"
diff --git a/src/config/Config.coffee b/src/config/Config.coffee
index 6c13b63dc..cc0331269 100644
--- a/src/config/Config.coffee
+++ b/src/config/Config.coffee
@@ -1181,3 +1181,5 @@ Config =
   fourchanImageHost: 'i.4cdn.org'
 
   hiddenPSAList: [{}]
+
+  knownBanners: '<%= readJSON('banners.json').join(',') %>'
diff --git a/src/Miscellaneous/Banner/banners.json b/src/config/banners.json
similarity index 100%
rename from src/Miscellaneous/Banner/banners.json
rename to src/config/banners.json
diff --git a/src/css/style.css b/src/css/style.css
index 0ba73a513..8447debbd 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -659,7 +659,8 @@ div[data-checked="false"] > .suboption-list {
   height: 150px;
 }
 .section-advanced textarea[name="archiveLists"],
-.section-advanced textarea[name="externalCatalogURLs"] {
+.section-advanced textarea[name="externalCatalogURLs"],
+.section-advanced textarea[name="knownBanners"] {
   height: 75px;
 }
 .section-advanced .archive-cell {
diff --git a/tools/banners.py b/tools/banners.py
index 192a88479..cfd3bef44 100755
--- a/tools/banners.py
+++ b/tools/banners.py
@@ -15,5 +15,5 @@ for ext in ['jpg', 'png', 'gif']:
     print(banner, status)
     if status == 200:
       banners.append(banner)
-with open('src/Miscellaneous/Banner/banners.json', 'w') as f:
+with open('src/config/banners.json', 'w') as f:
   f.write(json.dumps(banners))