diff --git a/files/assets/images/badges/103.webp b/files/assets/images/badges/103.webp index 5d9362546..86e51a54e 100644 Binary files a/files/assets/images/badges/103.webp and b/files/assets/images/badges/103.webp differ diff --git a/files/assets/images/badges/116.webp b/files/assets/images/badges/116.webp index e3b99c066..a60de48e1 100644 Binary files a/files/assets/images/badges/116.webp and b/files/assets/images/badges/116.webp differ diff --git a/files/assets/images/badges/67.webp b/files/assets/images/badges/67.webp index bc26b5cbf..688a44de5 100644 Binary files a/files/assets/images/badges/67.webp and b/files/assets/images/badges/67.webp differ diff --git a/files/assets/images/badges/68.webp b/files/assets/images/badges/68.webp index d74ea13de..e7e8fa005 100644 Binary files a/files/assets/images/badges/68.webp and b/files/assets/images/badges/68.webp differ diff --git a/files/assets/images/badges/83.webp b/files/assets/images/badges/83.webp index 0c2f4ea99..3ae8c1a7b 100644 Binary files a/files/assets/images/badges/83.webp and b/files/assets/images/badges/83.webp differ diff --git a/files/assets/images/badges/87.webp b/files/assets/images/badges/87.webp index 014835d91..4b2357401 100644 Binary files a/files/assets/images/badges/87.webp and b/files/assets/images/badges/87.webp differ diff --git a/files/assets/images/badges/90.webp b/files/assets/images/badges/90.webp index d62704d61..b01465ab4 100644 Binary files a/files/assets/images/badges/90.webp and b/files/assets/images/badges/90.webp differ diff --git a/files/assets/images/badges/93.webp b/files/assets/images/badges/93.webp index 00310aba5..7e572ca63 100644 Binary files a/files/assets/images/badges/93.webp and b/files/assets/images/badges/93.webp differ diff --git a/files/assets/images/badges/98.webp b/files/assets/images/badges/98.webp index 9b4ba0466..082d83d75 100644 Binary files a/files/assets/images/badges/98.webp and b/files/assets/images/badges/98.webp differ diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js index 6e65c127d..1804454dd 100644 --- a/files/assets/js/submit.js +++ b/files/assets/js/submit.js @@ -10,18 +10,25 @@ function hide_image() { } document.onpaste = function(event) { - f=document.getElementById('file-upload'); files = event.clipboardData.files filename = files[0].name.toLowerCase() + if (filename.endsWith(".jpg") || filename.endsWith(".jpeg") || filename.endsWith(".png") || filename.endsWith(".webp") || filename.endsWith(".gif")) { - f.files = files; - document.getElementById('filename-show').textContent = filename; - document.getElementById('urlblock').classList.add('d-none'); - var fileReader = new FileReader(); - fileReader.readAsDataURL(f.files[0]); - fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); - document.getElementById('file-upload').setAttribute('required', 'false'); + if (document.activeElement.id == 'post-text') { + document.getElementById('file-upload-submit').files = files; + document.getElementById('filename-show-submit').textContent = filename; + } + else { + f=document.getElementById('file-upload'); + f.files = files; + document.getElementById('filename-show').textContent = filename; + document.getElementById('urlblock').classList.add('d-none'); + var fileReader = new FileReader(); + fileReader.readAsDataURL(f.files[0]); + fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); + document.getElementById('file-upload').setAttribute('required', 'false'); + } checkForRequired(); } } diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 499e3c335..e990a9789 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -100,6 +100,8 @@ allowed_styles = ['color', 'background-color', 'font-weight', 'transform', '-web def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False): + if sanitized.count(':') > 100: abort(418) + sanitized = markdown(sanitized) sanitized = sanitized.replace("\ufeff", "").replace("𒐪","").replace(" - + {{badge.name}} {{badge.description}} diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index 12bd571e0..7f3877355 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -60,7 +60,7 @@ - + {{badge.name}} {{badge.description}} diff --git a/files/templates/badges.html b/files/templates/badges.html index 35c57ad25..67be3fed0 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -23,7 +23,7 @@ {{loop.index}} {{badge.name}} - {{badge.name}} + {{badge.name}} {{badge.description}} {% endfor %} diff --git a/files/templates/patrons.html b/files/templates/patrons.html index c955d8ff1..4894efaf3 100644 --- a/files/templates/patrons.html +++ b/files/templates/patrons.html @@ -14,7 +14,7 @@ {{loop.index}} @{{u.username}}'s profile picture{{u.username}} - 2{{u.patron}} + 2{{u.patron}} {% endfor %} diff --git a/files/templates/submit.html b/files/templates/submit.html index e2a5d9a6a..8cb35a0a2 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -258,7 +258,7 @@ - + {% include "emoji_modal.html" %} {% include "gif_modal.html" %}