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

master
Aevann1 2022-05-21 14:36:24 +02:00
commit cad9952f2b
6 changed files with 10 additions and 6 deletions

View File

@ -93,10 +93,14 @@ def player_hit(from_comment, did_double_down=False):
if player_value == -1:
status = 'bust'
apply_game_result(from_comment, wager, status, kind)
elif len(player_hand) >= 5:
status = 'won'
apply_game_result(from_comment, wager, status, kind)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, wager, kind, int(is_insured))
if (did_double_down or player_value == 21): player_stayed(from_comment)
if (did_double_down or player_value == 21) and status == 'active':
player_stayed(from_comment)
def player_stayed(from_comment):
player_hand, dealer_hand, deck, status, wager, kind, is_insured = from_comment.blackjack_result.split("_")

View File

@ -824,7 +824,7 @@ emoji_regex3 = re.compile(f"(?<!\"):([!@{valid_username_chars}]{{1,31}}?):", fla
snappy_url_regex = re.compile('<a href=\"(https?:\/\/[a-z]{1,20}\.[\w:~,()\-.#&\/=?@%;+]{5,250})\" rel=\"nofollow noopener noreferrer\" target=\"_blank\">([\w:~,()\-.#&\/=?@%;+]{5,250})<\/a>', flags=re.A)
email_regex = re.compile('[^@]+@[^@]+\.[^@]+', flags=re.A)
email_regex = re.compile('[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}', flags=re.A|re.I)
utm_regex = re.compile('utm_[a-z]+=[a-z0-9_]+&', flags=re.A)
utm_regex2 = re.compile('[?&]utm_[a-z]+=[a-z0-9_]+', flags=re.A)

View File

@ -845,7 +845,7 @@
{% endif %}
{% if v %}
<script src="/assets/js/marked.js?v=254"></script>
<script src="/assets/js/marked.js?v=255"></script>
<script src="/assets/js/comments_v.js?v=270"></script>
{% endif %}

View File

@ -224,7 +224,7 @@
</script>
{% endif %}
<script src="/assets/js/marked.js?v=254"></script>
<script src="/assets/js/marked.js?v=255"></script>
<script src="/assets/js/formatting.js?v=240"></script>
<script src="/assets/js/submit.js?v=255"></script>
{% include "emoji_modal.html" %}

View File

@ -769,7 +769,7 @@
</nav>
{% endif %}
<script src="/assets/js/marked.js?v=254"></script>
<script src="/assets/js/marked.js?v=255"></script>
{% if v and v.id != u.id and '/comments' not in request.path %}

View File

@ -2,7 +2,7 @@
-- PostgreSQL database dump
--
-- Dumped from database version 13.6
-- Dumped from database version 13.7
-- Dumped by pg_dump version 14.2 (Ubuntu 14.2-1.pgdg20.04+1)
SET statement_timeout = 0;