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

asset_submissions/marseys -> asset_submissions/emojis

pull/142/head
Aevann 2023-03-21 16:16:18 +02:00
parent 95d1b2c9ce
commit 4b352a9625
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -26,9 +26,9 @@ RUN mkdir /temp_songs
RUN mkdir /videos
RUN mkdir /audio
RUN mkdir /asset_submissions
RUN mkdir /asset_submissions/marseys
RUN mkdir /asset_submissions/emojis
RUN mkdir /asset_submissions/hats
RUN mkdir /asset_submissions/marseys/original
RUN mkdir /asset_submissions/emojis/original
RUN mkdir /asset_submissions/hats/original
RUN mkdir /var/log/rdrama

20
files/routes/asset_submissions.py
View File

@ -87,10 +87,10 @@ def submit_emoji(v:User):
if not author:
return error(f"A user with the name '{username}' was not found!")
highquality = f'/asset_submissions/marseys/{name}'
highquality = f'/asset_submissions/emojis/{name}'
file.save(highquality)
filename = f'/asset_submissions/marseys/{name}.webp'
filename = f'/asset_submissions/emojis/{name}.webp'
copyfile(highquality, filename)
process_image(filename, v, resize=200, trim=True)
@ -186,11 +186,11 @@ def approve_emoji(v, name):
purge_files_in_cache(f"https://{SITE}/e/{emoji.name}/webp")
move(f"/asset_submissions/marseys/{name}.webp", f"files/assets/images/emojis/{emoji.name}.webp")
move(f"/asset_submissions/emojis/{name}.webp", f"files/assets/images/emojis/{emoji.name}.webp")
highquality = f"/asset_submissions/marseys/{name}"
highquality = f"/asset_submissions/emojis/{name}"
with Image.open(highquality) as i:
new_path = f'/asset_submissions/marseys/original/{name}.{i.format.lower()}'
new_path = f'/asset_submissions/emojis/original/{name}.{i.format.lower()}'
rename(highquality, new_path)
author.pay_account('coins', 250)
@ -455,20 +455,20 @@ def update_emoji(v):
return error("You need to submit an image!")
for x in IMAGE_FORMATS:
if path.isfile(f'/asset_submissions/marseys/original/{name}.{x}'):
remove_media_using_link(f'/asset_submissions/marseys/original/{name}.{x}')
if path.isfile(f'/asset_submissions/emojis/original/{name}.{x}'):
remove_media_using_link(f'/asset_submissions/emojis/original/{name}.{x}')
highquality = f"/asset_submissions/marseys/{name}"
highquality = f"/asset_submissions/emojis/{name}"
file.save(highquality)
with Image.open(highquality) as i:
format = i.format.lower()
new_path = f'/asset_submissions/marseys/original/{name}.{format}'
new_path = f'/asset_submissions/emojis/original/{name}.{format}'
rename(highquality, new_path)
filename = f"files/assets/images/emojis/{name}.webp"
copyfile(new_path, filename)
process_image(filename, v, resize=200, trim=True)
purge_files_in_cache([f"https://{SITE}/e/{name}.webp", f"https://{SITE}/assets/images/emojis/{name}.webp", f"https://{SITE}/asset_submissions/marseys/original/{name}.{format}"])
purge_files_in_cache([f"https://{SITE}/e/{name}.webp", f"https://{SITE}/assets/images/emojis/{name}.webp", f"https://{SITE}/asset_submissions/emojis/original/{name}.{format}"])
updated = True

2
files/routes/static.py
View File

@ -61,7 +61,7 @@ def marseys(v:User):
marseys = get_marseys(g.db)
authors = get_accounts_dict([m.author_id for m in marseys], v=v, graceful=True)
original = os.listdir("/asset_submissions/marseys/original")
original = os.listdir("/asset_submissions/emojis/original")
for marsey in marseys:
marsey.user = authors.get(marsey.author_id)
for x in IMAGE_FORMATS:

2
files/templates/marseys.html
View File

@ -33,7 +33,7 @@
{% if FEATURES['ASSET_SUBMISSIONS'] %}
<td>
{% if marsey.og %}
<a href="{{SITE_FULL_IMAGES}}/asset_submissions/marseys/original/{{marsey.og}}">{{marsey.og}}</a>
<a href="{{SITE_FULL_IMAGES}}/asset_submissions/emojis/original/{{marsey.og}}">{{marsey.og}}</a>
{% endif %}
</td>
{% endif %}

2
files/templates/submit_emojis.html
View File

@ -69,7 +69,7 @@
<input hidden name="formkey" value="{{v|formkey}}">
<div><label class="mt-3">Image</label></div>
<img loading="lazy" src="{{SITE_FULL_IMAGES}}/asset_submissions/marseys/{{emoji.name}}.webp?s={{range(1, 10000000)|random}}" style="max-width:50%;border:5px white solid">
<img loading="lazy" src="{{SITE_FULL_IMAGES}}/asset_submissions/emojis/{{emoji.name}}.webp?s={{range(1, 10000000)|random}}" style="max-width:50%;border:5px white solid">
<div><label class="mt-3" for="{{emoji.name}}-kind">Kind</label></div>
<div class="input-group mb2">

4
ubuntu_setup.sh
View File

@ -46,9 +46,9 @@ mkdir /temp_songs
mkdir /videos
mkdir /audio
mkdir /asset_submissions
mkdir /asset_submissions/marseys
mkdir /asset_submissions/emojis
mkdir /asset_submissions/hats
mkdir /asset_submissions/marseys/original
mkdir /asset_submissions/emojis/original
mkdir /asset_submissions/hats/original
mkdir /var/log/rdrama