From fcab07246bdb0e7cd8260b33bcb035e86b08826b Mon Sep 17 00:00:00 2001
From: b3yond <b3yond@riseup.net>
Date: Sat, 15 Sep 2018 19:01:58 +0200
Subject: [PATCH] blacklist -> blocklist #31 to honor zuckerimtank@twitter.com

---
 frontend.py           | 4 ++--
 template/settings.tpl | 9 ++++-----
 user.py               | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frontend.py b/frontend.py
index 980fae1..8f70a3d 100755
--- a/frontend.py
+++ b/frontend.py
@@ -136,10 +136,10 @@ def update_trigger_patterns(user):
     return user.state()
 
 
-@post('/settings/blacklist')
+@post('/settings/blocklist')
 @view('template/settings.tpl')
 def update_badwords(user):
-    user.set_badwords(request.forms['blacklist'])
+    user.set_badwords(request.forms['blocklist'])
     return user.state()
 
 
diff --git a/template/settings.tpl b/template/settings.tpl
index 371d66e..d4ca953 100644
--- a/template/settings.tpl
+++ b/template/settings.tpl
@@ -113,15 +113,14 @@
 </div>
 
 <div>
-    <h2>Edit the blacklist</h2>
+    <h2>Edit the blocklist</h2>
     <p>
         These words are not allowed in reports.
         If you encounter spam, you can add more here - the bot will ignore reports which use such words.
-        <!-- There are words which you can't exclude from the blacklist, e.g. certain racist, sexist, or antisemitic slurs. (to be implemented) -->
+        There are words which you can't exclude from the blocklist, e.g. certain racist, sexist, or antisemitic slurs.
     </p>
-    <form action="/settings/blacklist" method="post">
-        <!-- find a way to display current blacklist. js which reads from a cookie? template? -->
-        <textarea id="blacklist" rows="8" cols="70" name="blacklist" wrap="physical">{{badwords}}</textarea>
+    <form action="/settings/blocklist" method="post">
+        <textarea id="blocklist" rows="8" cols="70" name="blocklist" wrap="physical">{{badwords}}</textarea>
         <input name='confirm' value='Submit' type='submit'/>
     </form>
 </div>
diff --git a/user.py b/user.py
index 232a754..7a92dfc 100644
--- a/user.py
+++ b/user.py
@@ -181,7 +181,7 @@ schlitz
         # - city
         # - markdown
         # - goodlist
-        # - blacklist
+        # - blocklist
         # - logged in with twitter?
         # - logged in with mastodon?
         # - enabled?