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

files/routes/comments.py

@@ -512,7 +512,7 @@ def api_comment(v):
 
 		if parent.author.id != v.id and PUSHER_ID:
 			if len(c.body) > 500: notifbody = c.body[:500] + '...'
-			else: notifbody = c.body
+			else: notifbody = c.body or ''
 
 			beams_client.publish_to_interests(
 				interests=[f'{request.host}{parent.author.id}'],

files/routes/posts.py

@@ -1025,7 +1025,6 @@ def submit_post(v):
 	elif v.id == LAWLZ_ID:
 		if random.random() < 0.5: body = "wow, this lawlzpost sucks!"
 		else: body = "wow, a good lawlzpost for once!"
-	elif request.host == 'rdrama.net': body = '!slots10000'
 	else: body = random.choice(snappyquotes)
 	body += "\n\n"
 
@@ -1080,7 +1079,7 @@ def submit_post(v):
 			n = Notification(comment_id=c.id, user_id=v.id)
 			g.db.add(n)
 		
-		if request.host == 'rdrama.net':
+		if body == '!slots1000':
 			slots = Slots(g)
 			slots.check_for_slots_command(body, snappy, c)
 

schema.sql

@@ -299,7 +299,7 @@ CREATE TABLE public.comments (
     top_comment_id integer,
     is_pinned_utc integer,
     ghost boolean,
-    slots_result character varying(30),
+    slots_result character varying(30)
 );
 
 
@@ -807,7 +807,8 @@ CREATE TABLE public.users (
     bird integer,
     fish boolean,
     lootboxes_bought integer,
-    progressivestack integer
+    progressivestack integer,
+    winnings integer
 );
 
 

snappy_Drama.txt

@@ -3264,4 +3264,6 @@ THESE are the times that try dramautists' souls. The summer shitposter and the s
 {[para]}
 That I am trapped in this particular irrelevancy is never more apparent to me than when I am banned from meta posts. Paralyzed by the neurotic lassitude engendered by meeting one’s old meta posts at every turn, around every page refresh, inside my browser history, I go aimlessly from thread to thread. I decide to meet it head-on and sort by Old, and I view the contents on the page. A carp poll about Vampires and Furries. A Masterlawlz post, a photo of an asshole. My own posts begging to scam people. There is no final photo of an asshole for me to find. Nor is there any new polls from Carp, begging people for attention. I refresh the frontpage and look into its face, and do and do not see anything new. I close the webpage, and have another cup of coffee with Aevann. We get along very well, veterans of a guerilla war we never understood.
 {[para]}
-https://youtube.com/watch?v=5I884gOUONg
+https://youtube.com/watch?v=5I884gOUONg
+{[para]}
+!slots1000

snappy_PCM.txt

@@ -596,4 +596,6 @@ Want me to make you some new teeth?
 {[para]}
 Ayoo, you’re fat as fuck!
 {[para]}
-AVOCADO NIGGER!
+AVOCADO NIGGER!
+{[para]}
+!slots1000