WIP: #31 fix: blacklist -> blocklist.

Replace all relevant instances of "blacklist" with blocklist.
Untested due to OS restricitions. Please check before merge.

README.md

@@ -50,16 +50,16 @@ to check if something was retweeted in the last hour or something.
 
 To this date, we have never heard of this happening though.
 
-### blacklisting
+### blockisting
 
-You also need to edit the goodlist and the blacklist. You can do this on the
+You also need to edit the goodlist and the blocklist. You can do this on the
 website, in the settings of your bot.
 
 Just add the words to the goodlist, which you want to require. A report is only
 spread if it contains at least one of them. If you want to RT everything, just
 add a ```*```.
 
-There is also a blacklist, which you can use to automatically sort out
+There is also a blocklist, which you can use to automatically sort out
 malicious messages. Be careful though, our filter can't read the intention with
 which a word was used. Maybe you wanted it there.
 

frontend.py

@@ -153,10 +153,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()
 
 

static/bot.html

@@ -83,16 +83,16 @@
             </form>
         </div>
 
-        <!-- blacklist entry field -->
+        <!-- blocklist entry field -->
         <div style="float:right; padding: 1.5em;">
             <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. (to be implemented) -->
             </p>
-            <form action="/settings/blacklist" method="post">
+            <form action="/settings/blocklist" method="post">
-                <!-- find a way to display current blacklist. js which reads from a cookie? template? -->
+                <!-- find a way to display current blocklist. js which reads from a cookie? template? -->
-                <textarea id="blacklist" rows="8" cols="70" name="blacklist" wrap="physical"></textarea>
+                <textarea id="blocklist" rows="8" cols="70" name="blocklist" wrap="physical"></textarea>
                 <input name='confirm' value='Submit' type='submit'/>
             </form>
         </div>

static/js/functions.js

@@ -36,4 +36,4 @@ document.getElementById("enablebutton").innerHTML = enableButton();
 
 document.getElementById("goodlist").innerHTML = listformat(getCookie("goodlist"));
 
-document.getElementById("blacklist").innerHTML = listformat(getCookie("blacklist"));
+document.getElementById("blocklist").innerHTML = listformat(getCookie("blocklist"));

template/settings.tpl

@@ -140,15 +140,15 @@
 </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.
+        <!-- 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">
+    <form action="/settings/blocklist" method="post">
-        <!-- find a way to display current blacklist. js which reads from a cookie? template? -->
+        <!-- find a way to display current blocklist. js which reads from a cookie? template? -->
-        <textarea id="blacklist" rows="8" cols="70" name="blacklist" wrap="physical">{{badwords}}</textarea>
+        <textarea id="blocklist" rows="8" cols="70" name="blocklist" wrap="physical">{{badwords}}</textarea>
         <input name='confirm' value='Submit' type='submit'/>
     </form>
 </div>

user.py

@@ -253,7 +253,7 @@ schlitz
         # - markdown
         # - mail_md
         # - goodlist
-        # - blacklist
+        # - blocklist
         # - logged in with twitter?
         # - logged in with mastodon?
         # - enabled?