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

use _ instead of - in URLs

master
Aevann 2023-11-18 19:20:03 +02:00
parent 64df6a4036
commit e68567c3a5
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/assets/js/casino/blackjack_screen.js
View File

@ -36,8 +36,8 @@ function handleBlackjackResponse(xhr) {
deal: "Unable to deal a new hand. Is one in progress?", deal: "Unable to deal a new hand. Is one in progress?",
hit: "Unable to hit.", hit: "Unable to hit.",
stay: "Unable to stay.", stay: "Unable to stay.",
"double-down": "Unable to double down.", "double_down": "Unable to double down.",
"buy-insurance": "Unable to buy insurance.", "buy_insurance": "Unable to buy insurance.",
"split": "Unable to split" "split": "Unable to split"
}; };
result = results[xhr.blackjackAction]; result = results[xhr.blackjackAction];
@ -237,7 +237,7 @@ function staySplit() {
} }
function doubleDown() { function doubleDown() {
const request = makeBlackjackRequest('double-down'); const request = makeBlackjackRequest('double_down');
const form = new FormData(); const form = new FormData();
form.append("formkey", formkey()); form.append("formkey", formkey());
request.send(form); request.send(form);
@ -246,7 +246,7 @@ function doubleDown() {
} }
function buyInsurance() { function buyInsurance() {
const request = makeBlackjackRequest('buy-insurance'); const request = makeBlackjackRequest('buy_insurance');
const form = new FormData(); const form = new FormData();
form.append("formkey", formkey()); form.append("formkey", formkey());
request.send(form); request.send(form);

2
files/assets/js/casino/roulette_screen.js
View File

@ -317,7 +317,7 @@ function placeChip(bet, which) {
if (confirmed) { if (confirmed) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open("post", "/casino/roulette/place-bet"); xhr.open("post", "/casino/roulette/place_bet");
xhr.setRequestHeader('xhr', 'xhr'); xhr.setRequestHeader('xhr', 'xhr');
xhr.onload = handleRouletteResponse.bind(null, xhr); xhr.onload = handleRouletteResponse.bind(null, xhr);

2
files/routes/awards.py
View File

@ -634,7 +634,7 @@ def award_thing(v, thing_type, id):
return {"message": f"{award_title} award given to {thing_type} successfully!"} return {"message": f"{award_title} award given to {thing_type} successfully!"}
@app.post("/trick-or-treat") @app.post("/trick_or_treat")
@limiter.limit("1/hour", key_func=lambda:f'{SITE}-{session.get("lo_user")}') @limiter.limit("1/hour", key_func=lambda:f'{SITE}-{session.get("lo_user")}')
@auth_required @auth_required
def trick_or_treat(v): def trick_or_treat(v):

6
files/routes/casino.py
View File

@ -173,7 +173,7 @@ def blackjack_player_stay(v):
abort(400, "Unable to stay!") abort(400, "Unable to stay!")
@app.post("/casino/twentyone/double-down") @app.post("/casino/twentyone/double_down")
@limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath)
@limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit('1/second', scope=rpath, key_func=get_ID)
@limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400)
@ -191,7 +191,7 @@ def blackjack_player_doubled_down(v):
abort(400, "Unable to double down!") abort(400, "Unable to double down!")
@app.post("/casino/twentyone/buy-insurance") @app.post("/casino/twentyone/buy_insurance")
@limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath)
@limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit('1/second', scope=rpath, key_func=get_ID)
@limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400)
@ -239,7 +239,7 @@ def roulette_get_bets(v):
return {"success": True, "bets": bets, "gambler": {"coins": v.coins, "marseybux": v.marseybux}} return {"success": True, "bets": bets, "gambler": {"coins": v.coins, "marseybux": v.marseybux}}
@app.post("/casino/roulette/place-bet") @app.post("/casino/roulette/place_bet")
@limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath)
@limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit('1/second', scope=rpath, key_func=get_ID)
@limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(CASINO_RATELIMIT, deduct_when=lambda response: response.status_code < 400)

2
files/templates/shop.html
View File

@ -41,7 +41,7 @@
{% if IS_HOMOWEEN() %} {% if IS_HOMOWEEN() %}
<script defer src="{{'events/homoween/js/trickortreat.js' | asset}}"></script> <script defer src="{{'events/homoween/js/trickortreat.js' | asset}}"></script>
<div class ="mb-2" style="text-align:center"> <div class ="mb-2" style="text-align:center">
<a id="trick-or-treat" class="btn btn-success triggerClass" role="button" data-nonce="{{g.nonce}}" data-onclick="postToastTrickOrTreat(this, '/trick-or-treat')"> twink or treat</a> <a id="trick-or-treat" class="btn btn-success triggerClass" role="button" data-nonce="{{g.nonce}}" data-onclick="postToastTrickOrTreat(this, '/trick_or_treat')"> twink or treat</a>
</div> </div>
{% endif %} {% endif %}