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

2 folders instead of prefixes

master
Aevann1 2022-09-10 13:07:58 +02:00
parent 4d7a53d6ea
commit 48e1c653db
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
files/routes/asset_submissions.py
View File

@ -7,11 +7,10 @@ from files.helpers.media import *
from files.helpers.wrappers import * from files.helpers.wrappers import *
from files.routes.static import marsey_list from files.routes.static import marsey_list
@app.get('/asset_submissions/<image>') @app.get('/asset_submissions/<path:path>')
@limiter.exempt @limiter.exempt
def asset_submissions(image): def asset_submissions(path):
if not image.endswith('.webp'): abort(404) resp = make_response(send_from_directory('/asset_submissions', path))
resp = make_response(send_from_directory('/asset_submissions', image))
resp.headers.remove("Cache-Control") resp.headers.remove("Cache-Control")
resp.headers.add("Cache-Control", "public, max-age=3153600") resp.headers.add("Cache-Control", "public, max-age=3153600")
resp.headers.remove("Content-Type") resp.headers.remove("Content-Type")
@ -67,10 +66,10 @@ def submit_marsey(v):
author = request.values.get('author').strip() author = request.values.get('author').strip()
author = get_user(author) author = get_user(author)
highquality = f'/asset_submissions/m_{name}.png' highquality = f'/asset_submissions/marseys/{name}.png'
file.save(highquality) file.save(highquality)
filename = f'/asset_submissions/m_{name}.webp' filename = f'/asset_submissions/marseys/{name}.webp'
copyfile(highquality, filename) copyfile(highquality, filename)
process_image(filename, 200) process_image(filename, 200)
@ -118,7 +117,7 @@ def approve_marsey(v, name):
marsey.tags = tags marsey.tags = tags
g.db.add(marsey) g.db.add(marsey)
move(f"/asset_submissions/m_{name}.webp", f"files/assets/images/emojis/{marsey.name}.webp") move(f"/asset_submissions/marseys/{name}.webp", f"files/assets/images/emojis/{marsey.name}.webp")
author = get_account(marsey.author_id) author = get_account(marsey.author_id)
all_by_author = g.db.query(Marsey).filter_by(author_id=author.id).count() all_by_author = g.db.query(Marsey).filter_by(author_id=author.id).count()
@ -159,7 +158,7 @@ def reject_marsey(v, name):
send_repeatable_notification(marsey.submitter_id, msg) send_repeatable_notification(marsey.submitter_id, msg)
g.db.delete(marsey) g.db.delete(marsey)
os.remove(f"/asset_submissions/m_{marsey.name}.webp") os.remove(f"/asset_submissions/marseys/{marsey.name}.webp")
return {"message": f"'{marsey.name}' rejected!"} return {"message": f"'{marsey.name}' rejected!"}
@ -205,14 +204,14 @@ def submit_hat(v):
author = request.values.get('author').strip() author = request.values.get('author').strip()
author = get_user(author) author = get_user(author)
highquality = f'/asset_submissions/h_{name}.png' highquality = f'/asset_submissions/hats/{name}.png'
file.save(highquality) file.save(highquality)
i = Image.open(highquality) i = Image.open(highquality)
if i.width > 100 or i.height > 130: if i.width > 100 or i.height > 130:
return error("Images must be 100x130") return error("Images must be 100x130")
filename = f'/asset_submissions/h_{name}.webp' filename = f'/asset_submissions/hats/{name}.webp'
copyfile(highquality, filename) copyfile(highquality, filename)
process_image(filename) process_image(filename)
@ -256,7 +255,7 @@ def approve_hat(v, name):
hat.description = description hat.description = description
g.db.add(hat) g.db.add(hat)
move(f"/asset_submissions/h_{name}.webp", f"files/assets/images/hats/{hat.name}.webp") move(f"/asset_submissions/hats/{name}.webp", f"files/assets/images/hats/{hat.name}.webp")
g.db.flush() g.db.flush()
@ -306,6 +305,6 @@ def reject_hat(v, name):
send_repeatable_notification(hat.submitter_id, msg) send_repeatable_notification(hat.submitter_id, msg)
g.db.delete(hat) g.db.delete(hat)
os.remove(f"/asset_submissions/h_{hat.name}.webp") os.remove(f"/asset_submissions/hats/{hat.name}.webp")
return {"message": f"'{hat.name}' rejected!"} return {"message": f"'{hat.name}' rejected!"}

2
files/templates/submit_hats.html
View File

@ -136,7 +136,7 @@
<input type="hidden" name="formkey" value="{{v.formkey}}"> <input type="hidden" name="formkey" value="{{v.formkey}}">
<div><label class="mt-3">Image</label></div> <div><label class="mt-3">Image</label></div>
<img loading="lazy" src="/asset_submissions/h_{{hat.name}}.webp" style="max-width:50%"> <img loading="lazy" src="/asset_submissions/hats/{{hat.name}}.webp" style="max-width:50%">
<div><label class="mt-3" for="{{hat.name}}-submitter">Submitter</label></div> <div><label class="mt-3" for="{{hat.name}}-submitter">Submitter</label></div>
<input autocomplete="off" type="text" id="{{hat.name}}-submitter" class="form-control" maxlength="30" value="{{hat.submitter.username}}" readonly> <input autocomplete="off" type="text" id="{{hat.name}}-submitter" class="form-control" maxlength="30" value="{{hat.submitter.username}}" readonly>

2
files/templates/submit_marseys.html
View File

@ -141,7 +141,7 @@
<input type="hidden" name="formkey" value="{{v.formkey}}"> <input type="hidden" name="formkey" value="{{v.formkey}}">
<div><label class="mt-3">Image</label></div> <div><label class="mt-3">Image</label></div>
<img loading="lazy" src="/asset_submissions/m_{{marsey.name}}.webp" style="max-width:50%"> <img loading="lazy" src="/asset_submissions/marseys/{{marsey.name}}.webp" style="max-width:50%">
<div><label class="mt-3" for="{{marsey.name}}-submitter">Submitter</label></div> <div><label class="mt-3" for="{{marsey.name}}-submitter">Submitter</label></div>
<input autocomplete="off" type="text" id="{{marsey.name}}-submitter" class="form-control" maxlength="30" value="{{marsey.submitter}}" readonly> <input autocomplete="off" type="text" id="{{marsey.name}}-submitter" class="form-control" maxlength="30" value="{{marsey.submitter}}" readonly>