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 @@
- With your bot, we generated you a page, which you can use for promotion: Ticketfrei $city 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: Ticketfrei {{city}} You can change what your users will read there, and adjust it to your needs. You should definitely adjust the Social Media profile links. This is just the default text we suggest:
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