From 0d707be2344bfd042819f0416cea83fefbac730f Mon Sep 17 00:00:00 2001 From: atrc445 Date: Sun, 26 Sep 2021 15:02:38 +0200 Subject: [PATCH 01/20] reomve jquery .data --- files/templates/emoji_modal.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 229489e24..04714a29f 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -30,7 +30,7 @@ function getEmoji(searchTerm, form) { const commentBox = document.getElementById(form); const old = commentBox.value; - const curPos = commentBox.data(TEXTAREA_POS); + const curPos = commentBox.getAttribute('data-' + TEXTAREA_POS); const firstHalf = old.slice(0, curPos) const lastHalf = old.slice(curPos) @@ -48,7 +48,7 @@ const newPos = curPos + emoji.length - commentBox.data(TEXTAREA_POS, newPos) + commentBox.setAttribute('data-' + TEXTAREA_POS, newPos); } function loadEmojis(form) { @@ -92,7 +92,7 @@ container.innerHTML = container.innerHTML.replace(/@form@/g, form) const commentBox = document.getElementById(form); - commentBox.data(TEXTAREA_POS, commentBox.selectionStart) + commentBox.setAttribute('data-' + TEXTAREA_POS, commentBox.selectionStart); for (i=0; i < emojis.length; i++) { From 78887b4531204f9c511bb062ce8e49c8df178f68 Mon Sep 17 00:00:00 2001 From: atrc445 Date: Sun, 26 Sep 2021 17:25:07 +0200 Subject: [PATCH 02/20] fix more js in submit --- files/templates/submit.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/templates/submit.html b/files/templates/submit.html index 7d06489e6..b7d743fd5 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -425,20 +425,20 @@ if (filename.endsWith(".jpg") || filename.endsWith(".jpeg") || filename.endsWith(".png") || filename.endsWith(".webp")) { f.files = files; - document.getElementById('filename-show').text(filename); - document.getElementById('urlblock').addClass('d-none'); + 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').attr('src', this.result);}); - document.getElementById('file-upload').attr('required', false); + document.getElementById('file-upload').setAttribute('required', 'false'); checkForRequired(); } } document.getElementById('file-upload').addEventListener('change', function(e){ f=document.getElementById('file-upload'); - document.getElementById('urlblock').addClass('d-none'); - document.getElementById('filename-show').text(document.getElementById('file-upload')[0].files[0].name); + document.getElementById('urlblock').classList.add('d-none'); + document.getElementById('filename-show').textContent = document.getElementById('file-upload')[0].files[0].name; var fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () {document.getElementById('image-preview').attr('src', this.result);}); From 33274347bd1b4eeeda0a260445c27f39b2a77d08 Mon Sep 17 00:00:00 2001 From: atrc445 Date: Sun, 26 Sep 2021 17:26:27 +0200 Subject: [PATCH 03/20] getElementById returs one element --- files/templates/submit.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/templates/submit.html b/files/templates/submit.html index b7d743fd5..2eec04eff 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -429,7 +429,7 @@ document.getElementById('urlblock').classList.add('d-none'); var fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); - fileReader.addEventListener("load", function () {document.getElementById('image-preview').attr('src', this.result);}); + fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); document.getElementById('file-upload').setAttribute('required', 'false'); checkForRequired(); } @@ -438,10 +438,10 @@ document.getElementById('file-upload').addEventListener('change', function(e){ f=document.getElementById('file-upload'); document.getElementById('urlblock').classList.add('d-none'); - document.getElementById('filename-show').textContent = document.getElementById('file-upload')[0].files[0].name; + document.getElementById('filename-show').textContent = document.getElementById('file-upload').files[0].name; var fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); - fileReader.addEventListener("load", function () {document.getElementById('image-preview').attr('src', this.result);}); + fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); checkForRequired(); }) From 122035db76ec16fadfe3e7012d98667a8c01df39 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:12:40 +0200 Subject: [PATCH 05/20] sex --- files/templates/expanded_image_modal.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 02b26735a..3c6499a54 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -7,7 +7,8 @@ } event.preventDefault(); - var url= this.data('url'); + const source = event.target || event.srcElement; + var url= source.data('url'); expandDesktopImage(url,url); } From 9ac9f054d759acef0c4e993af1117e4116634941 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:14:47 +0200 Subject: [PATCH 06/20] sex --- files/templates/expanded_image_modal.html | 1 + 1 file changed, 1 insertion(+) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 3c6499a54..5b4199ef5 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -8,6 +8,7 @@ event.preventDefault(); const source = event.target || event.srcElement; + console.log(source.nodeName); var url= source.data('url'); expandDesktopImage(url,url); From 6091e4f3f549f01f90efe4e5f3025c8cccfbe043 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:17:03 +0200 Subject: [PATCH 07/20] sex --- files/templates/expanded_image_modal.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 5b4199ef5..6a1aa82ca 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -7,7 +7,8 @@ } event.preventDefault(); - const source = event.target || event.srcElement; + let source = event.target || event.srcElement; + source = source.parentNode(); console.log(source.nodeName); var url= source.data('url'); From 6dcdc33f981df228477a928ec47e22844ab42d2c Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:17:30 +0200 Subject: [PATCH 08/20] sex --- files/templates/expanded_image_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 6a1aa82ca..a800ea47a 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -8,7 +8,7 @@ event.preventDefault(); let source = event.target || event.srcElement; - source = source.parentNode(); + source = source.parentNode; console.log(source.nodeName); var url= source.data('url'); From 3f3cbadf6e17265cf28f22f522b15c3f0fb31782 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:18:37 +0200 Subject: [PATCH 09/20] sex --- files/templates/expanded_image_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index a800ea47a..a111dc0f3 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -10,7 +10,7 @@ let source = event.target || event.srcElement; source = source.parentNode; console.log(source.nodeName); - var url= source.data('url'); + var url= source.dataset.url; expandDesktopImage(url,url); } From becff98dc42e41342fb4e6f62c2f050b026d2496 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:19:51 +0200 Subject: [PATCH 10/20] sex --- files/templates/expanded_image_modal.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index a111dc0f3..eaf1952e5 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -12,13 +12,13 @@ console.log(source.nodeName); var url= source.dataset.url; - expandDesktopImage(url,url); + expandDesktopImage(url); } } // Expand Images on Desktop - function expandDesktopImage(image, link) { + function expandDesktopImage(image) { // Link text From 16eaae090cabd3b92bcc4ec6905a219203332bf3 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:20:30 +0200 Subject: [PATCH 11/20] sex --- files/templates/expanded_image_modal.html | 1 + 1 file changed, 1 insertion(+) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index eaf1952e5..fcc39fb42 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -11,6 +11,7 @@ source = source.parentNode; console.log(source.nodeName); var url= source.dataset.url; + console.log(url); expandDesktopImage(url); } From cfda9a9e85bd45168075e674a60b61bfab741625 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:21:36 +0200 Subject: [PATCH 12/20] sex --- files/templates/expanded_image_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index fcc39fb42..bdc2677e3 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -10,7 +10,7 @@ let source = event.target || event.srcElement; source = source.parentNode; console.log(source.nodeName); - var url= source.dataset.url; + var url= source.dataset['bs-url']; console.log(url); expandDesktopImage(url); From 13dee585916d129a348f219da1936dcc1bc6ddb2 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:22:25 +0200 Subject: [PATCH 13/20] sex --- files/templates/expanded_image_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index bdc2677e3..3502fae38 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -11,7 +11,7 @@ source = source.parentNode; console.log(source.nodeName); var url= source.dataset['bs-url']; - console.log(url); + console.log(source.dataset); expandDesktopImage(url); } From c4816597301bfd37289783eaccb68ba013c78678 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:23:04 +0200 Subject: [PATCH 14/20] sex --- files/templates/expanded_image_modal.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 3502fae38..2348ade58 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -10,8 +10,7 @@ let source = event.target || event.srcElement; source = source.parentNode; console.log(source.nodeName); - var url= source.dataset['bs-url']; - console.log(source.dataset); + var url= source.dataset.bsUrl; expandDesktopImage(url); } From aff9960c84671ff4ac3e10d92db8353bde102fe0 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:23:58 +0200 Subject: [PATCH 15/20] sex --- files/templates/expanded_image_modal.html | 1 - 1 file changed, 1 deletion(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 2348ade58..4e634d82d 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -9,7 +9,6 @@ let source = event.target || event.srcElement; source = source.parentNode; - console.log(source.nodeName); var url= source.dataset.bsUrl; expandDesktopImage(url); From 083f92e783adc5937b6ee2998e01fd9e269c87a3 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 18:33:14 +0200 Subject: [PATCH 16/20] sex --- files/templates/expanded_image_modal.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html index 4e634d82d..078e1db1e 100644 --- a/files/templates/expanded_image_modal.html +++ b/files/templates/expanded_image_modal.html @@ -7,8 +7,7 @@ } event.preventDefault(); - let source = event.target || event.srcElement; - source = source.parentNode; + let source = (event.target || event.srcElement).parentNode; var url= source.dataset.bsUrl; expandDesktopImage(url); From 79b3b0dfc182852138c9e70add35009d1b9d6282 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 19:11:45 +0200 Subject: [PATCH 17/20] sex --- files/routes/users.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/files/routes/users.py b/files/routes/users.py index 38dfbfbdc..227c8f265 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -221,7 +221,10 @@ def message2(v, username): user = get_user(username, v=v) if hasattr(user, 'is_blocking') and user.is_blocking: return {"error": "You're blocking this user."}, 403 - if hasattr(user, 'is_blocked') and user.is_blocked: return {"error": "This user is blocking you."}, 403 + + if v.admin_level <= 1: + if hasattr(user, 'is_blocked') and user.is_blocked: return {"error": "This user is blocking you."}, 403 + message = request.values.get("message", "")[:1000].strip() # check existing From b59e7bcf0f779b87326aada035253752f52c94cd Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Sun, 26 Sep 2021 21:37:28 +0200 Subject: [PATCH 18/20] Fix adding several marseys in place --- files/templates/emoji_modal.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 04714a29f..2c9bdd5b5 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -23,14 +23,14 @@ commentFormID = form; }; - const TEXTAREA_POS = 'curr-pos' + const TEXTAREA_POS_ATTR = 'data-curr-pos' // Insert EMOJI markdown into comment box function function getEmoji(searchTerm, form) { const commentBox = document.getElementById(form); const old = commentBox.value; - const curPos = commentBox.getAttribute('data-' + TEXTAREA_POS); + const curPos = parseInt(commentBox.getAttribute(TEXTAREA_POS_ATTR)); const firstHalf = old.slice(0, curPos) const lastHalf = old.slice(curPos) @@ -48,7 +48,7 @@ const newPos = curPos + emoji.length - commentBox.setAttribute('data-' + TEXTAREA_POS, newPos); + commentBox.setAttribute(TEXTAREA_POS_ATTR, newPos); } function loadEmojis(form) { @@ -92,7 +92,7 @@ container.innerHTML = container.innerHTML.replace(/@form@/g, form) const commentBox = document.getElementById(form); - commentBox.setAttribute('data-' + TEXTAREA_POS, commentBox.selectionStart); + commentBox.setAttribute(TEXTAREA_POS_ATTR, commentBox.selectionStart); for (i=0; i < emojis.length; i++) { From 6e9fdb05dc626746428590c1c1dc676c6e751a33 Mon Sep 17 00:00:00 2001 From: fireworks88 Date: Sun, 26 Sep 2021 22:03:23 +0200 Subject: [PATCH 19/20] sex --- files/templates/sign_up.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index d7403cd81..12c4bf1a3 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -190,7 +190,7 @@ {% endif %} {% if hcaptcha %} -
+
{% endif %} From 380684f192bab35bdabcc15874f477e3a9ecc0c4 Mon Sep 17 00:00:00 2001 From: atrc445 Date: Sun, 26 Sep 2021 23:23:24 +0200 Subject: [PATCH 20/20] fix(?) hcaptcha --- files/templates/sign_up.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 12c4bf1a3..ea885769d 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -190,7 +190,7 @@ {% endif %} {% if hcaptcha %} -
+
{% endif %}