bvcvb

files/classes/comment.py

@@ -43,7 +43,7 @@ class Comment(Base):
 	body = Column(String)
 	body_html = Column(String)
 	ban_reason = Column(String)
-	slots_result = Column(String, default="")
+	slots_result = Column(String)
 
 	post = relationship("Submission", viewonly=True)
 	author = relationship("User", primaryjoin="User.id==Comment.author_id")

files/classes/slots.py

@@ -44,8 +44,7 @@ class Slots:
                             result = self.pull_the_arm(from_user, wagerValue, from_comment)
                             return { 'pulled': True, 'result': result }
 
-                    except ValueError:
-                        break
+                    except exception as e: break
         return { 'pulled': False, 'result': '' }
 
     # Ensure user is capable of the wager
@@ -133,13 +132,9 @@ class Slots:
     # Credit the user's account
     def credit_user(self, from_user, amount):
         from_user.coins += amount
-
         self.db.add(from_user)
-        self.db.commit()
 
     # Charge the user's account
     def charge_user(self, from_user, amount):
         from_user.coins -= amount
-
-        self.db.add(from_user)
-        self.db.commit()
+        self.db.add(from_user)

files/routes/comments.py

@@ -558,17 +558,14 @@ def api_comment(v):
 		c.upvotes += 1
 		g.db.add(c)
 
-	g.db.commit()
-
-	# Slots
 	slots = Slots(g)
 	slots_check = slots.check_for_slots_command(body, v, c)
 
 	if (slots_check['pulled'] == True):
 		c.slots_result = slots_check['result']
 		g.db.add(c)
-		g.db.commit()
 
+	g.db.commit()
 	if request.headers.get("Authorization"): return c.json
 	return render_template("comments.html", v=v, comments=[c])
 

files/templates/comments.html

@@ -231,7 +231,7 @@
 				{% endif %}
 
 				{% if c.slots_result %}
-				<span style="position: relative; top: 2px; margin-left: 0.5rem">{{c.slots_result}}</span>
+					<span style="position: relative; top: 2px; margin-left: 0.5rem">{{c.slots_result}}</span>
 				{% endif %}
 			</div>
 			{% if c.active_flags %}