Fix imports

.gitignore

@@ -6,3 +6,12 @@ uploads/
 **~
 **/.*.swp
 **/__pycache__/
+venv
+.env
+.venv
+env
+data/
+conf/
+config/
+\#*\#
+.\#*

app/filters.py

@@ -2,7 +2,7 @@
 Filter functions used in the website templates.
 '''
 
-from flask import Markup
+from markupsafe import Markup
 import html, datetime, re, time
 from .utils import tokenize, inline_svg as _inline_svg
 from . import app

app/utils.py

@@ -5,7 +5,8 @@ A list of utilities used across modules.
 import datetime, re, base64, hashlib, string, sys, json
 from .models import User, Message, Notification, MSGPRV_PUBLIC, MSGPRV_UNLISTED, \
     MSGPRV_FRIENDS, MSGPRV_ONLYME
-from flask import Markup, abort, render_template, request, session
+from flask import abort, render_template, request, session
+from markupsafe import Markup
 
 _forbidden_extensions = 'com net org txt'.split()
 _username_characters = frozenset(string.ascii_letters + string.digits + '_')