From 628fcb4f95fd8e0c2ab021407083d81753f5c7ef Mon Sep 17 00:00:00 2001
From: b3yond <b3yond@riseup.net>
Date: Fri, 25 May 2018 16:15:44 +0200
Subject: [PATCH] small markdown fixes

---
 README.md             | 2 +-
 db.py                 | 2 +-
 template/city.tpl     | 2 +-
 template/settings.tpl | 4 ++--
 user.py               | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2bdc8d7..28d553b 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ virtualenv -p python3 .
 Install the dependencies:
 
 ```shell
-pip install tweepy pytoml Mastodon.py bottle pyjwt pylibscrypt Markdown
+pip install tweepy pytoml Mastodon.py bottle pyjwt pylibscrypt markdown2
 ```
 
 Configure the bot:
diff --git a/db.py b/db.py
index 0259a85..942cbf5 100644
--- a/db.py
+++ b/db.py
@@ -168,7 +168,7 @@ u\d\d?
             self.execute("""INSERT INTO triggerpatterns (user_id, patterns)
                                 VALUES(?, ?); """, (uid, default_triggerpatterns))
             self.execute("INSERT INTO badwords (user_id, words) VALUES(?, ?);",
-                         (uid, ""))
+                         (uid, "bastard"))
         else:
             uid = json['uid']
         self.execute("INSERT INTO email (user_id, email) VALUES(?, ?);",
diff --git a/template/city.tpl b/template/city.tpl
index dddac8d..4661485 100644
--- a/template/city.tpl
+++ b/template/city.tpl
@@ -1,7 +1,7 @@
 % rebase('template/wrapper.tpl')
 
 <%
-import markdown as md
+import markdown2 as md
 
 html = md.markdown(markdown)
 %>
diff --git a/template/settings.tpl b/template/settings.tpl
index ea9c35d..ddaa161 100644
--- a/template/settings.tpl
+++ b/template/settings.tpl
@@ -70,8 +70,8 @@
 <div style="float: left; padding: 1.5em;">
     <h2>Edit your city page</h2>
     <p>
-        With your bot, we generated you a page, which you can use for promotion: <a href="city/$city"
-        target="_blank">Ticketfrei $city</a> You can change what your users will read there, and adjust it to your
+        With your bot, we generated you a page, which you can use for promotion: <a href="/city/{{city}}"
+        target="_blank">Ticketfrei {{city}}</a> You can change what your users will read there, and adjust it to your
         needs. <b>You should definitely adjust the Social Media profile links.</b> This is just the default text we
         suggest:
     </p>
diff --git a/user.py b/user.py
index 96d88b8..40dadeb 100644
--- a/user.py
+++ b/user.py
@@ -67,7 +67,6 @@ class User(object):
             # no pattern matched
             return False
         default_badwords = """
-bastard
 bitch
 whore
 hitler