fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/routes/chat.py

@@ -62,6 +62,11 @@ def speak(data, v):
 	
 	if v.shadowbanned:
 		emit('speak', data)
+	elif blackjack and any(i in text.lower() for i in blackjack.split()):
+		emit('speak', data)
+		v.shadowbanned = 'AutoJanny'
+		g.db.add(v)
+		g.db.commit()
 	else:
 		emit('speak', data, broadcast=True)
 		messages.append(data)

files/routes/posts.py

@@ -1367,7 +1367,7 @@ def submit_post(v, sub=None):
 			if body.startswith('!slots'):
 				check_for_slots_command(body, snappy, c)
 
-			if body.startswith(':#marseypin'):
+			if body.startswith(':#marseypin:') or body.startswith(':#marseypin2:'):
 				post.stickied = "Snappy"
 				post.stickied_utc = int(time.time()) + 3600