rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

f

remotes/1693045480750635534/spooky-22
Aevann1 2022-02-02 02:06:29 +02:00
parent f684533077
commit b70cf702b6
32 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/classes/slots.py
View File

@ -116,5 +116,5 @@ class Slots:
def build_text(self, wager_value, result, user, currency):
if result == 0: return f'Lost {wager_value} {currency}'
elif result == 1: return 'Broke Even'
elif result == 12: return f'Jackpot! Won {wager_value * result} {currency}'
else: return f'Won {wager_value * result} {currency}'
elif result == 12: return f'Jackpot! Won {wager_value * (result-1)} {currency}'
else: return f'Won {wager_value * (result-1)} {currency}'

28
files/routes/awards.py
View File

@ -229,12 +229,12 @@ def award_post(pid, v):
note = request.values.get("note", "").strip()
if v.id != post.author.id:
author = post.author
if v.id != author.id:
msg = f"@{v.username} has given your [post]({post.permalink}) the {AWARDS[kind]['title']} Award!"
if note: msg += f"\n\n> {note}"
send_repeatable_notification(post.author.id, msg)
author = post.author
send_repeatable_notification(author.id, msg)
if kind == "benefactor" and author.id == v.id:
return {"error": "You can't use this award on yourself."}, 400
@ -420,9 +420,9 @@ def award_post(pid, v):
g.db.flush()
send_notification(author.id, f"@AutoJanny has given you the following profile badge:\n\n![]({badge.path})\n\n{badge.name}")
if post.author.received_award_count: post.author.received_award_count += 1
else: post.author.received_award_count = 1
g.db.add(post.author)
if author.received_award_count: author.received_award_count += 1
else: author.received_award_count = 1
g.db.add(author)
g.db.commit()
if request.referrer and len(request.referrer) > 1:
@ -469,12 +469,12 @@ def award_comment(cid, v):
note = request.values.get("note", "").strip()
if v.id != c.author.id:
author = c.author
if v.id != author.id:
msg = f"@{v.username} has given your [comment]({c.permalink}) the {AWARDS[kind]['title']} Award!"
if note: msg += f"\n\n> {note}"
send_repeatable_notification(c.author.id, msg)
author = c.author
send_repeatable_notification(author.id, msg)
if kind == "benefactor" and author.id == v.id:
return {"error": "You can't use this award on yourself."}, 400
@ -654,9 +654,9 @@ def award_comment(cid, v):
g.db.flush()
send_notification(author.id, f"@AutoJanny has given you the following profile badge:\n\n![]({badge.path})\n\n{badge.name}")
if c.author.received_award_count: c.author.received_award_count += 1
else: c.author.received_award_count = 1
g.db.add(c.author)
if author.received_award_count: author.received_award_count += 1
else: author.received_award_count = 1
g.db.add(author)
g.db.commit()
if request.referrer and len(request.referrer) > 1 and request.host in request.referrer:

2
files/templates/admins.html
View File

@ -4,7 +4,7 @@
{% block content %}
<script src="/static/assets/js/sort_table.js?a=220"></script>
<script src="/static/assets/js/sort_table.js?a=240"></script>
<pre class="d-none d-md-inline-block"></pre>
<h5 style="font-weight:bold;">Admins</h5>

2
files/templates/award_modal.html
View File

@ -1,4 +1,4 @@
<script src="/static/assets/js/award_modal.js?a=221"></script>
<script src="/static/assets/js/award_modal.js?a=240"></script>
<div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered awardmodal my-5" role="document">
<div class="modal-content">

2
files/templates/ban_modal.html
View File

@ -1,5 +1,5 @@
<script src="/static/assets/js/ban_modal.js?a=220"></script>
<script src="/static/assets/js/ban_modal.js?a=240"></script>
<div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">

2
files/templates/changelog.html
View File

@ -104,6 +104,6 @@
</nav>
{% endif %}
<script src="/static/assets/js/post_toast2.js?a=220"></script>
<script src="/static/assets/js/post_toast2.js?a=240"></script>
{% endblock %}

16
files/templates/comments.html
View File

@ -266,9 +266,9 @@
{% elif blackjack_status == 'lost' %}
<strong>Lost {{wager}} Coins.</strong>
{% elif blackjack_status == 'won' %}
<strong>Won {{wager|int * 2}} Coins.</strong>
<strong>Won {{wager}} Coins.</strong>
{% elif blackjack_status == 'blackjack' %}
<strong>Blackjack! Won <span id="blackjack-result-{{c.id}}">{{(wager|int * 5/2)|round(0, 'floor')|int}}</span> Coins.</strong>
<strong>Blackjack! Won <span id="blackjack-result-{{c.id}}">{{(wager|int * 3/2)|round(0, 'floor')|int}}</span> Coins.</strong>
{% endif %}
{% endif %}
</div>
@ -903,20 +903,20 @@
</style>
{% if v %}
<script src="/static/assets/js/marked.js?a=220"></script>
<script src="/static/assets/js/comments_v.js?a=239"></script>
<script src="/static/assets/js/marked.js?a=240"></script>
<script src="/static/assets/js/comments_v.js?a=240"></script>
{% endif %}
<script src="/static/assets/js/clipboard.js?a=220"></script>
<script src="/static/assets/js/clipboard.js?a=240"></script>
{% if v and v.admin_level > 1 %}
<script src="/static/assets/js/comments_admin.js?a=220"></script>
<script src="/static/assets/js/comments_admin.js?a=240"></script>
{% endif %}
{% include "expanded_image_modal.html" %}
<script src="/static/assets/js/comments+submission_listing.js?a=223"></script>
<script src="/static/assets/js/comments.js?a=221"></script>
<script src="/static/assets/js/comments+submission_listing.js?a=240"></script>
<script src="/static/assets/js/comments.js?a=240"></script>
<script>
{% if p and (not v or v.highlightcomments) %}

12
files/templates/default.html
View File

@ -4,7 +4,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com; connect-src 'self' tls-use1.fpapi.io api.fpjs.io{% if PUSHER_ID %} {{PUSHER_ID}}.pushnotifications.pusher.com{% endif %}; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=104">
@ -314,15 +314,15 @@
</div>
</div>
<script src="/static/assets/js/lozad.js?a=220"></script>
<script src="/static/assets/js/lozad.js?a=240"></script>
{% if v %}
<script src="/static/assets/js/post_toast2.js?a=220"></script>
<script src="/static/assets/js/formatting.js?a=220"></script>
<script src="/static/assets/js/default.js?a=220"></script>
<script src="/static/assets/js/post_toast2.js?a=240"></script>
<script src="/static/assets/js/formatting.js?a=240"></script>
<script src="/static/assets/js/default.js?a=240"></script>
{% endif %}
<script src="/static/assets/js/lite-youtube.js?a=220"></script>
<script src="/static/assets/js/lite-youtube.js?a=240"></script>
</body>

2
files/templates/delete_post_modal.html
View File

@ -1,4 +1,4 @@
<script src="/static/assets/js/delete_post_modal.js?a=221"></script>
<script src="/static/assets/js/delete_post_modal.js?a=240"></script>
<div class="modal fade" id="deletePostModal" tabindex="-1" role="dialog" aria-labelledby="deletePostModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">

2
files/templates/emoji_modal.html
View File

@ -86,7 +86,7 @@
</div>
</div>
<script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=238"></script>
<script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=240"></script>
<style>
a.emojitab {

2
files/templates/followers.html
View File

@ -1,6 +1,6 @@
{% extends "default.html" %}
{% block content %}
<script src="/static/assets/js/followers.js?a=220"></script>
<script src="/static/assets/js/followers.js?a=240"></script>
<pre>

2
files/templates/following.html
View File

@ -1,6 +1,6 @@
{% extends "default.html" %}
{% block content %}
<script src="/static/assets/js/following.js?a=220"></script>
<script src="/static/assets/js/following.js?a=240"></script>
<pre>

2
files/templates/gif_modal.html
View File

@ -26,4 +26,4 @@
</div>
</div>
<script src="/static/assets/js/gif_modal.js?a=223"></script>
<script src="/static/assets/js/gif_modal.js?a=240"></script>

2
files/templates/header.html
View File

@ -211,7 +211,7 @@
</div>
</nav>
<script src="/static/assets/js/header.js?a=220"></script>
<script src="/static/assets/js/header.js?a=240"></script>
<style>
.notif-count {

4
files/templates/home.html
View File

@ -19,7 +19,7 @@
script.onload = resolve;
script.onerror = reject;
script.async = true;
script.src = "/static/assets/js/fp.js?a=220";
script.src = "/static/assets/js/fp.js?a=240";
document.head.appendChild(script);
})
.then(() => FingerprintJS.load({token: '{{environ.get("FP")}}'}));
@ -174,7 +174,7 @@
{% if PUSHER_ID and v %}
<div class="d-none" id="strid">{{request.host}}{{v.id}}</div>
<div class="d-none" id="pusherid">{{PUSHER_ID}}</div>
<script src="/static/assets/js/pusher.js?a=220"></script>
<script src="/static/assets/js/pusher.js?a=240"></script>
<script>
if (typeof Android !== 'undefined') {
Android.Subscribe('{{request.host}}{{v.id}}');

2
files/templates/log.html
View File

@ -142,6 +142,6 @@
</div>
</div>
<script src="/static/assets/js/clipboard.js?a=220"></script>
<script src="/static/assets/js/clipboard.js?a=240"></script>
{% endblock %}

2
files/templates/login.html
View File

@ -6,7 +6,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

2
files/templates/mobile_navigation_bar.html
View File

@ -68,7 +68,7 @@
</div>
</div>
<script src="/static/assets/js/mobile_navigation_bar.js?a=220"></script>
<script src="/static/assets/js/mobile_navigation_bar.js?a=240"></script>
<style>
.btn-dead:hover, .active.btn-dead:hover, .active.btn-dead {

2
files/templates/report_post_modal.html
View File

@ -32,4 +32,4 @@
</div>
</div>
<script src="/static/assets/js/report_post_modal.js?a=224"></script>
<script src="/static/assets/js/report_post_modal.js?a=240"></script>

4
files/templates/settings.html
View File

@ -5,7 +5,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -258,7 +258,7 @@
{% block onload %}{% endblock %}
<script src="/static/assets/js/clipboard.js?a=220"></script>
<script src="/static/assets/js/clipboard.js?a=240"></script>
<style>
.navsettings {

2
files/templates/settings2.html
View File

@ -6,7 +6,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

2
files/templates/settings_blocks.html
View File

@ -4,7 +4,7 @@
{% block content %}
<script src="/static/assets/js/settings_blocks.js?a=220"></script>
<script src="/static/assets/js/settings_blocks.js?a=240"></script>
<div class="row">

2
files/templates/settings_profile.html
View File

@ -675,7 +675,7 @@
</div>
<script src="/static/assets/js/settings_profile.js?a=220"></script>
<script src="/static/assets/js/settings_profile.js?a=240"></script>
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}

2
files/templates/settings_security.html
View File

@ -4,7 +4,7 @@
{% block content %}
<script src="/static/assets/js/settings_security.js?a=220"></script>
<script src="/static/assets/js/settings_security.js?a=240"></script>
<div class="row">

6
files/templates/sign_up.html
View File

@ -5,7 +5,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -154,10 +154,10 @@
</div>
</div>
<script src="/static/assets/js/signup.js?a=220"></script>
<script src="/static/assets/js/signup.js?a=240"></script>
{% if hcaptcha %}
<script src="/static/assets/js/hcaptcha.js?a=220"></script>
<script src="/static/assets/js/hcaptcha.js?a=240"></script>
{% endif %}
</body>

2
files/templates/sign_up_failed_ref.html
View File

@ -6,7 +6,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

22
files/templates/submission.html
View File

@ -498,9 +498,9 @@
{% if p.domain == "twitter.com" %}
{{p.embed_url | safe}}
{% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %}
<script src="/static/assets/js/twitterlight.js?a=220"></script>
<script src="/static/assets/js/twitterlight.js?a=240"></script>
{% else %}
<script src="/static/assets/js/twitter.js?a=220"></script>
<script src="/static/assets/js/twitter.js?a=240"></script>
{% endif %}
{% elif p.domain in ['youtu.be','youtube.com'] and p.embed_url and p.embed_url.startswith('<lite-youtube') %}
{{p.embed_url | safe}}
@ -875,7 +875,7 @@
</div>
{% if offset %}
<script src="/static/assets/js/viewmore.js?a=223"></script>
<script src="/static/assets/js/viewmore.js?a=240"></script>
{% endif %}
{% elif not p.replies and p.deleted_utc == 0 %}
@ -906,32 +906,32 @@
{% endif %}
{% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
<script src="/static/assets/js/togglePostEdit.js?a=220"></script>
<script src="/static/assets/js/togglePostEdit.js?a=240"></script>
{% endif %}
{% if v %}
<script src="/static/assets/js/submission.js?a=220"></script>
<script src="/static/assets/js/submission.js?a=240"></script>
{% endif %}
{% if not v or v.highlightcomments %}
<script src="/static/assets/js/new_comments_count.js?a=220"></script>
<script src="/static/assets/js/new_comments_count.js?a=240"></script>
{% endif %}
<script src="/static/assets/js/clipboard.js?a=220"></script>
<script src="/static/assets/js/clipboard.js?a=240"></script>
{% if not p.comment_count %}
{% include "comments.html" %}
{% endif %}
{% if p.award_count("shit") %}
<script src="/static/assets/js/critters.js?a=220"></script>
<script src="/static/assets/js/bugs.js?a=220"></script>
<script src="/static/assets/js/critters.js?a=240"></script>
<script src="/static/assets/js/bugs.js?a=240"></script>
{% endif %}
{% if p.award_count("fireflies") %}
<script src="/static/assets/js/critters.js?a=220"></script>
<script src="/static/assets/js/fireflies.js?a=220"></script>
<script src="/static/assets/js/critters.js?a=240"></script>
<script src="/static/assets/js/fireflies.js?a=240"></script>
{% endif %}

8
files/templates/submission_listing.html
View File

@ -9,7 +9,7 @@
{% endif %}
{% if not v or v.highlightcomments %}
<script src="/static/assets/js/new_comments_count.js?a=220"></script>
<script src="/static/assets/js/new_comments_count.js?a=240"></script>
{% endif %}
<div style="display:none" id="popover">
@ -676,6 +676,6 @@
}
</style>
<script src="/static/assets/js/clipboard.js?a=220"></script>
<script src="/static/assets/js/comments+submission_listing.js?a=223"></script>
<script src="/static/assets/js/submission_listing.js?a=221"></script>
<script src="/static/assets/js/clipboard.js?a=240"></script>
<script src="/static/assets/js/comments+submission_listing.js?a=240"></script>
<script src="/static/assets/js/submission_listing.js?a=240"></script>

8
files/templates/submit.html
View File

@ -4,7 +4,7 @@
<meta name="description" content="{{config('DESCRIPTION')}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<script src="/static/assets/js/bootstrap.js?a=220"></script>
<script src="/static/assets/js/bootstrap.js?a=240"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -239,9 +239,9 @@
checkForRequired()
</script>
<script src="/static/assets/js/marked.js?a=220"></script>
<script src="/static/assets/js/formatting.js?a=220"></script>
<script src="/static/assets/js/submit.js?a=220"></script>
<script src="/static/assets/js/marked.js?a=240"></script>
<script src="/static/assets/js/formatting.js?a=240"></script>
<script src="/static/assets/js/submit.js?a=240"></script>
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}

6
files/templates/userpage.html
View File

@ -692,11 +692,11 @@
{% if v %}
<div id='tax' class="d-none">{% if v.patron or u.patron or v.alts_patron or u.alts_patron %}0{% else %}0.03{% endif %}</div>
<script src="/static/assets/js/userpage_v.js?a=222"></script>
<script src="/static/assets/js/userpage_v.js?a=240"></script>
<div id="username" class="d-none">{{u.username}}</div>
{% endif %}
<script src="/static/assets/js/userpage.js?a=222"></script>
<script src="/static/assets/js/userpage.js?a=240"></script>
{% endblock %}
@ -722,7 +722,7 @@
</nav>
{% endif %}
<script src="/static/assets/js/marked.js?a=220"></script>
<script src="/static/assets/js/marked.js?a=240"></script>
<style>
.userbanner {

4
files/templates/userpage_comments.html
View File

@ -114,9 +114,9 @@
{% if v %}
<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
<script src="/static/assets/js/userpage_v.js?a=222"></script>
<script src="/static/assets/js/userpage_v.js?a=240"></script>
<div id="username" class="d-none">{{u.username}}</div>
{% endif %}
<script src="/static/assets/js/userpage.js?a=222"></script>
<script src="/static/assets/js/userpage.js?a=240"></script>
{% endblock %}

4
files/templates/userpage_private.html
View File

@ -48,9 +48,9 @@
{% if v %}
<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
<script src="/static/assets/js/userpage_v.js?a=222"></script>
<script src="/static/assets/js/userpage_v.js?a=240"></script>
<div id="username" class="d-none">{{u.username}}</div>
{% endif %}
<script src="/static/assets/js/userpage.js?a=222"></script>
<script src="/static/assets/js/userpage.js?a=240"></script>
{% endblock %}