diff --git a/files/assets/css/main.css b/files/assets/css/main.css index ff304a0ba..57eff001c 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -7035,9 +7035,6 @@ div.markdown { max-width: 500px; margin-top: 5px; } -.btn:not(.format) { - overflow: hidden; -} .giphy { overflow: hidden; diff --git a/files/assets/js/submit_emojis.js b/files/assets/js/submit_emojis.js index 3b648af40..4123fc9d3 100644 --- a/files/assets/js/submit_emojis.js +++ b/files/assets/js/submit_emojis.js @@ -15,6 +15,7 @@ function approve_emoji(t, name) { function remove_emoji(t, name) { postToast(t, `/remove/emoji/${name}`, { + "reason": document.getElementById(`${name}-reason`).value, }, () => { document.getElementById(`${name}-emoji`).remove() diff --git a/files/assets/js/submit_hats.js b/files/assets/js/submit_hats.js index fa561cf10..0e989910e 100644 --- a/files/assets/js/submit_hats.js +++ b/files/assets/js/submit_hats.js @@ -16,6 +16,7 @@ function remove_hat(t) { const name = t.dataset.name postToast(t, `/remove/hat/${name}`, { + "reason": document.getElementById(`${name}-reason`).value, }, () => { document.getElementById(`${name}-hat`).remove() diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 76a073a96..8cc193681 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -245,7 +245,10 @@ def remove_asset(cls, type_name, v, name): name = asset.name if v.id != asset.submitter_id: + reason = request.values.get("reason") msg = f"@{v.username} has rejected a {type_name} you submitted: `'{name}'`" + if reason: + msg += f"\nReason: `{reason}`" send_repeatable_notification(asset.submitter_id, msg) ma = ModAction( diff --git a/files/templates/submit_emojis.html b/files/templates/submit_emojis.html index b348d3efa..c2549440a 100644 --- a/files/templates/submit_emojis.html +++ b/files/templates/submit_emojis.html @@ -109,9 +109,11 @@ {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_ASSETS'] or v.id == emoji.submitter_id %}
+ + {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_ASSETS'] %} - + {% endif %}
{% endif %} diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html index 29a749600..deb0ddbe8 100644 --- a/files/templates/submit_hats.html +++ b/files/templates/submit_hats.html @@ -82,9 +82,11 @@ {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_ASSETS'] or v.id == hat.submitter_id %}
+ + {% if v.admin_level >= PERMS['MODERATE_PENDING_SUBMITTED_ASSETS'] %} - + {% endif %}
{% endif %}