carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fart

master
Aevann1 2022-04-10 02:37:45 +02:00
parent a334aa815e
commit e6c0044d35
15 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/helpers/const.py
View File

@ -389,7 +389,15 @@ AWARDS = {
"icon": "fas fa-dice-six", "icon": "fas fa-dice-six",
"color": "text-black", "color": "text-black",
"price": 777 "price": 777
}, },
"beano": {
"kind": "beano",
"title": "Beano",
"description": "Stops you from embarrassing yourself with your flatulence",
"icon": "fas fa-gas-pump-slash",
"color": "text-green",
"price": 1000
},
"progressivestack": { "progressivestack": {
"kind": "progressivestack", "kind": "progressivestack",
"title": "Progressive Stack", "title": "Progressive Stack",

12
files/routes/awards.py
View File

@ -340,6 +340,12 @@ def award_post(pid, v):
elif kind == "deflector": elif kind == "deflector":
if author.deflector: author.deflector += 36000 if author.deflector: author.deflector += 36000
else: author.deflector = int(time.time()) + 36000 else: author.deflector = int(time.time()) + 36000
elif kind == "beano":
if not author.has_badge(128):
badge = Badge(user_id=author.id, badge_id=128)
g.db.add(badge)
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 author.received_award_count: author.received_award_count += 1 if author.received_award_count: author.received_award_count += 1
else: author.received_award_count = 1 else: author.received_award_count = 1
@ -572,6 +578,12 @@ def award_comment(cid, v):
elif kind == "deflector": elif kind == "deflector":
if author.deflector: author.deflector += 36000 if author.deflector: author.deflector += 36000
else: author.deflector = int(time.time()) + 36000 else: author.deflector = int(time.time()) + 36000
elif kind == "beano":
if not author.has_badge(128):
badge = Badge(user_id=author.id, badge_id=128)
g.db.add(badge)
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 author.received_award_count: author.received_award_count += 1 if author.received_award_count: author.received_award_count += 1
else: author.received_award_count = 1 else: author.received_award_count = 1

4
files/templates/authforms.html
View File

@ -15,7 +15,7 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=218"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -39,7 +39,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=217"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
</head> </head>

5
files/templates/award_modal.html
View File

@ -19,11 +19,6 @@
<div class="text-muted"><span id="{{award.kind}}-owned">{{award.owned}}</span> owned</div> <div class="text-muted"><span id="{{award.kind}}-owned">{{award.owned}}</span> owned</div>
</a> </a>
{% endfor %} {% endfor %}
<a class="card disabled d-md-none" style="border:none">
<i class="fas fa-volume-mute" style="opacity:0"></i>
<div class="pt-2" style="font-weight: bold; font-size: 14px; color:#E1E1E1">&nbsp;</div>
<div class="text-muted">&nbsp;</div>
</a>
</div> </div>
<label id="notelabel" for="note" class="pt-4">Note (optional):</label> <label id="notelabel" for="note" class="pt-4">Note (optional):</label>
<input autocomplete="off" id="kind" name="kind" value="" hidden> <input autocomplete="off" id="kind" name="kind" value="" hidden>

2
files/templates/chat.html
View File

@ -14,7 +14,7 @@
<title>Chat</title> <title>Chat</title>
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"> <link rel="stylesheet" href="/assets/css/main.css?v=221">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.css %} {% if v.css %}
<link rel="stylesheet" href="/@{{v.username}}/css"> <link rel="stylesheet" href="/@{{v.username}}/css">

4
files/templates/default.html
View File

@ -7,7 +7,7 @@
<script src="/assets/js/bootstrap.js?v=245"></script> <script src="/assets/js/bootstrap.js?v=245"></script>
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"> <link rel="stylesheet" href="/assets/css/main.css?v=221">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
@ -32,7 +32,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"> <link rel="stylesheet" href="/assets/css/main.css?v=221">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}

4
files/templates/log.html
View File

@ -6,7 +6,7 @@
{% block content %} {% block content %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -30,7 +30,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
<div class="row justify-content-around"> <div class="row justify-content-around">

2
files/templates/login.html
View File

@ -18,7 +18,7 @@
{% endblock %} {% endblock %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"> <link rel="stylesheet" href="/assets/css/main.css?v=221">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

2
files/templates/login_2fa.html
View File

@ -14,7 +14,7 @@
<title>2-Step Login - {{SITE_NAME}}</title> <title>2-Step Login - {{SITE_NAME}}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

2
files/templates/settings.html
View File

@ -34,7 +34,7 @@
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=190"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {

4
files/templates/settings2.html
View File

@ -39,10 +39,10 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
</head> </head>

2
files/templates/sign_up.html
View File

@ -31,7 +31,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

2
files/templates/sign_up_failed_ref.html
View File

@ -32,7 +32,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
</head> </head>

12
files/templates/submission.html
View File

@ -41,6 +41,18 @@
</script> </script>
{% endif %} {% endif %}
{% if SITE_NAME == 'rDrama' and not (v and v.has_badge(128)) %}
<script>
fart = Math.floor(Math.random() * 4) + 1
let audio = new Audio(`/assets/farts/${fart}.mp3`);
audio.play();
window.addEventListener('click', () => {
if (audio.paused) audio.play();
}, {once : true});
</script>
{% endif %}
{% if g.inferior_browser %} {% if g.inferior_browser %}
{% if p.award_count("wholesome") %} {% if p.award_count("wholesome") %}
<style> <style>

4
files/templates/submit.html
View File

@ -26,7 +26,7 @@
{% block stylesheets %} {% block stylesheets %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41"> <link rel="stylesheet" href="/assets/css/main.css?v=221"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=41">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -50,7 +50,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=220"> <link rel="stylesheet" href="/assets/css/main.css?v=221">
<link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41"> <link rel="stylesheet" href="/assets/css/{{config('DEFAULT_THEME')}}.css?v=41">
{% endif %} {% endif %}
{% endblock %} {% endblock %}