Merge branch 'master' into mistletoe

files/routes/users.py

@@ -346,6 +346,8 @@ def message2(v, username):
 
 	message = request.values.get("message", "").strip()[:1000].strip()
 
+	if 'linkedin.com' in message: return {"error": "this domain 'linkedin.com' is banned"}
+
 	message = re.sub('!\[\]\((.*?)\)', r'\1', message)
 
 	text_html = Renderer().render(mistletoe.Document(message))
@@ -402,6 +404,8 @@ def messagereply(v):
 
 	message = request.values.get("body", "").strip()[:1000].strip()
 
+	if 'linkedin.com' in message: return {"error": "this domain 'linkedin.com' is banned"}
+
 	message = re.sub('!\[\]\((.*?)\)', r'\1', message)
 
 	id = int(request.values.get("parent_id"))

files/templates/emoji_modal.html

@@ -84,7 +84,7 @@
 	</div>
 </div>
 
-<script defer src="/assets/js/emoji_modal.js?v=126"></script>
+<script defer src="/assets/js/emoji_modal.js?v=128"></script>
 
 <style>
 	a.emojitab {