From 54007e91cb0efc358a92de3a451f883271ed21b3 Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Mon, 27 Sep 2021 18:58:29 +0200 Subject: [PATCH 1/6] Add unread comments counter to submission listing and submission --- files/templates/comments.html | 12 ++-- files/templates/default.html | 77 +++++++++++++++++++++++++ files/templates/submission.html | 39 +++++++++---- files/templates/submission_listing.html | 22 ++++--- 4 files changed, 125 insertions(+), 25 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 006372919f..b9570a96d7 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -383,11 +383,6 @@ {% macro single_comment(c, level=1) %} - - {% set ups=c.upvotes %} {% set downs=c.downvotes %} {% set score=ups-downs %} @@ -882,6 +877,13 @@ {% endif %} + + {% endmacro %} {% for comment in comments %} diff --git a/files/templates/default.html b/files/templates/default.html index 55d633b53d..c52d3b78a6 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -207,6 +207,83 @@ } } + + // New comment counts + + // comment counts format: {"123412": {c: 12, t: 23532456263}} + const COMMENT_COUNTS_ID = "comment-counts" + + /** + * Display the number of new comments present since the last time the post was opened + */ + function showNewCommentCounts(postId, lastTotalComs) { + const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} + + const lastCount = comments["" + postId] + if (lastCount) { + const newComments = lastTotalComs - lastCount.p + if (newComments > 0) { + document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => { + elem.textContent = ` (+${newComments})` + elem.classList.remove("d-none") + }) + } + } + } + + /** + * Saves the comment count to the localStorage + * + * @param postId The id of the post associated with the comments + * @param lastTotalComs The new amount, If null it will just increment the previous amount + */ + function saveCommentsCount(postId, lastTotalComs = null) { + const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} + + lastTotalComs = lastTotalComs || (comments["" + postId] || { c: 0 }).c + 1 + + comments["" + postId] = { p: lastTotalComs, t: Date.now() } + + window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments)) + + //TODO: increment count on submit response and new comment + + //TODO: restrict on display unread comments flag + } + + /** + * Cleans the expired entries (5 days). It runs every hour. + */ + function cleanCommentsCache() { + const LAST_CACHE_CLEAN_ID = "last-cache-clean" + const EXPIRE_INTERVAL_MILLIS = 5 * 24 * 60 * 60 * 1000 + const CACHE_CLEAN_INTERVAL = 60 * 60 * 1000 // 1 hour + + function cleanCache() { + const lastCacheClean = JSON.parse(localStorage.getItem(LAST_CACHE_CLEAN_ID)) || Date.now() + const now = Date.now() + + if (now - lastCacheClean > CACHE_CLEAN_INTERVAL) { + const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} + + for (let [key, value] of Object.entries(comments)) { + if (now - value.t > EXPIRE_INTERVAL_MILLIS) { + delete comments[key] + } + } + + window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments)) + } + + window.localStorage.setItem(LAST_CACHE_CLEAN_ID, JSON.stringify(now)) + } + + // So it does not slow the load of the main page with the clean up + setTimeout(cleanCache, 500) + } + + cleanCommentsCache() + {% endif %} diff --git a/files/templates/submission.html b/files/templates/submission.html index da328d96e4..0bfe8d0489 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -76,15 +76,6 @@ {% endif %} - - @@ -450,7 +441,12 @@
+ + {% if p.active_flags %}
Reported by: From 5b65ea121bae23a08e7a4e2e0fee93ac9fbe8ff9 Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Mon, 27 Sep 2021 20:14:22 +0200 Subject: [PATCH 2/6] Correct new comments on listing. On reply and submission increments the count --- files/templates/comments.html | 33 ++++++++++++++----------- files/templates/default.html | 21 ++++++++++------ files/templates/report_post_modal.html | 24 +++++++++--------- files/templates/submission.html | 10 +++++--- files/templates/submission_listing.html | 18 ++++++++++---- 5 files changed, 64 insertions(+), 42 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index b9570a96d7..9a3dbea2f3 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -83,22 +83,25 @@ }; - document.getElementById('reportCommentModal').addEventListener('hidden.bs.modal', function () { + document.addEventListener("DOMContentLoaded", function() { - var button = document.getElementById("reportCommentButton"); + document.getElementById('reportCommentModal').addEventListener('hidden.bs.modal', function () { - var beforeModal = document.getElementById("reportCommentFormBefore"); - var afterModal = document.getElementById("reportCommentFormAfter"); + const button = document.getElementById("reportCommentButton"); - button.innerHTML='Report comment'; - button.disabled= false; - afterModal.classList.add('d-none'); + const beforeModal = document.getElementById("reportCommentFormBefore"); + const afterModal = document.getElementById("reportCommentFormAfter"); - if ( beforeModal.classList.contains('d-none') ) { - beforeModal.classList.remove('d-none'); - } + button.innerHTML = 'Report comment'; + button.disabled = false; + afterModal.classList.add('d-none'); - }); + if (beforeModal.classList.contains('d-none')) { + beforeModal.classList.remove('d-none'); + } + + }); + }); //Commenting form @@ -147,7 +150,7 @@ }; - post_comment=function(fullname){ + post_comment=function(fullname, postId){ var form = new FormData(); @@ -168,6 +171,8 @@ myToast.hide(); var myToast = new bootstrap.Toast(document.getElementById('toast-post-success')); myToast.show(); + + incrementCommentCount(postId) } else { var commentError = document.getElementById("comment-error-text"); @@ -758,10 +763,10 @@ Cancel - Comment + Comment
Cancel - Comment + Comment diff --git a/files/templates/default.html b/files/templates/default.html index c52d3b78a6..6cd578455f 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -219,11 +219,15 @@ function showNewCommentCounts(postId, lastTotalComs) { const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} - const lastCount = comments["" + postId] + console.log(postId) + const lastCount = comments[postId] + console.log(lastCount) if (lastCount) { - const newComments = lastTotalComs - lastCount.p + const newComments = lastTotalComs - lastCount.c + console.log('new:', newComments) if (newComments > 0) { document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => { + console.log(elem) elem.textContent = ` (+${newComments})` elem.classList.remove("d-none") }) @@ -231,6 +235,10 @@ } } + function incrementCommentCount(postId) { + saveCommentsCount(postId) + } + /** * Saves the comment count to the localStorage * @@ -240,14 +248,13 @@ function saveCommentsCount(postId, lastTotalComs = null) { const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} - lastTotalComs = lastTotalComs || (comments["" + postId] || { c: 0 }).c + 1 + const newTotal = lastTotalComs || ((comments[postId] || { c: 0 }).c + 1) - comments["" + postId] = { p: lastTotalComs, t: Date.now() } + console.log(newTotal) + comments[postId] = { c: newTotal, t: Date.now() } window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments)) - //TODO: increment count on submit response and new comment - //TODO: restrict on display unread comments flag } @@ -271,10 +278,8 @@ delete comments[key] } } - window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments)) } - window.localStorage.setItem(LAST_CACHE_CLEAN_ID, JSON.stringify(now)) } diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html index 6cba89fbff..7ddd4c6587 100644 --- a/files/templates/report_post_modal.html +++ b/files/templates/report_post_modal.html @@ -31,23 +31,25 @@ } }; - document.getElementById('reportPostModal').addEventListener('hidden.bs.modal', function () { + document.addEventListener("DOMContentLoaded", function() { + document.getElementById('reportPostModal').addEventListener('hidden.bs.modal', function () { - var button = document.getElementById("reportPostButton"); + const button = document.getElementById("reportPostButton"); - var beforeModal = document.getElementById("reportPostFormBefore"); - var afterModal = document.getElementById("reportPostFormAfter"); + const beforeModal = document.getElementById("reportPostFormBefore"); + const afterModal = document.getElementById("reportPostFormAfter"); - button.innerHTML='Report post'; - button.disabled= false; + button.innerHTML = 'Report post'; + button.disabled = false; - afterModal.classList.add('d-none'); + afterModal.classList.add('d-none'); - if ( beforeModal.classList.contains('d-none') ) { - beforeModal.classList.remove('d-none'); - } + if (beforeModal.classList.contains('d-none')) { + beforeModal.classList.remove('d-none'); + } - }); + }); + }) diff --git a/files/templates/submission.html b/files/templates/submission.html index 0bfe8d0489..010cc61585 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -37,7 +37,7 @@ {% if v %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index c7fdcbe690..c17027d7d4 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -141,8 +141,12 @@ {% if p.realbody(v) %}
    • {% endif %} -
  • {{p.comment_count}}
    • - +
  • + + {{p.comment_count}} + + +
  • Votes
    • {% if v and v.id!=p.author_id %} @@ -229,8 +233,12 @@
      -
    • {{p.comment_count}}
      • - +
    • + + {{p.comment_count}} + + +
    • Copy link
      • {% if p.realbody(v) and request.path != "/changelog"%} @@ -400,7 +408,7 @@ document.getElementById('edited_timestamp-{{p.id}}').title = dateEdited.toString(); {% endif %} - showNewCommentCounts({{p.id}}, {{p.comment_count}}) + showNewCommentCounts('{{p.id}}', {{p.comment_count}}) })() From faab316e37677891aba1a3c058f62a2d325e26df Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Mon, 27 Sep 2021 20:40:13 +0200 Subject: [PATCH 3/6] Only show the new comments if the highlight new comments flag is active Other small fixes --- files/templates/default.html | 14 +++----------- files/templates/submission.html | 4 +++- files/templates/submission_listing.html | 4 +++- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/files/templates/default.html b/files/templates/default.html index 6cd578455f..9ceccaa0db 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -210,24 +210,20 @@ // New comment counts - // comment counts format: {"123412": {c: 12, t: 23532456263}} + // comment counts format: {"": {c: , t: }} const COMMENT_COUNTS_ID = "comment-counts" /** * Display the number of new comments present since the last time the post was opened */ - function showNewCommentCounts(postId, lastTotalComs) { + function showNewCommentCounts(postId, newTotal) { const comments = JSON.parse(localStorage.getItem(COMMENT_COUNTS_ID)) || {} - console.log(postId) const lastCount = comments[postId] - console.log(lastCount) if (lastCount) { - const newComments = lastTotalComs - lastCount.c - console.log('new:', newComments) + const newComments = newTotal - lastCount.c if (newComments > 0) { document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => { - console.log(elem) elem.textContent = ` (+${newComments})` elem.classList.remove("d-none") }) @@ -250,12 +246,9 @@ const newTotal = lastTotalComs || ((comments[postId] || { c: 0 }).c + 1) - console.log(newTotal) comments[postId] = { c: newTotal, t: Date.now() } window.localStorage.setItem(COMMENT_COUNTS_ID, JSON.stringify(comments)) - - //TODO: restrict on display unread comments flag } /** @@ -286,7 +279,6 @@ // So it does not slow the load of the main page with the clean up setTimeout(cleanCache, 500) } - cleanCommentsCache() diff --git a/files/templates/submission.html b/files/templates/submission.html index 010cc61585..4325c6245d 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -747,7 +747,9 @@ document.getElementById('edited_timestamp').title = dateEdited.toString(); {% endif %} - showNewCommentCounts('{{p.id}}', {{p.comment_count}}) + {% if (not v or v.highlightcomments) %} + showNewCommentCounts('{{p.id}}', {{p.comment_count}}) + {% endif %} saveCommentsCount('{{p.id}}', {{p.comment_count}}) })() diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index c17027d7d4..76b6c66203 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -408,7 +408,9 @@ document.getElementById('edited_timestamp-{{p.id}}').title = dateEdited.toString(); {% endif %} - showNewCommentCounts('{{p.id}}', {{p.comment_count}}) + {% if (not v or v.highlightcomments) %} + showNewCommentCounts('{{p.id}}', {{p.comment_count}}) + {% endif %} })() From a365bd9a7b6ceebbdefe30951b0d31c904d0ddd8 Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Mon, 27 Sep 2021 23:20:26 +0200 Subject: [PATCH 4/6] Fix .js on removed comments. Removed duplicate post_comment --- files/templates/comments.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 33dc973fab..3875c0c21d 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -64,9 +64,9 @@
      @@ -518,15 +518,15 @@
      -{% endif %} - +{% endif %} + {% endmacro %} {% for comment in comments %} From 530de5ee08fbedc40a70982e56095d27e649c9e1 Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Mon, 27 Sep 2021 23:56:08 +0200 Subject: [PATCH 5/6] Inline new comments code. Other small fixes --- files/templates/default.html | 44 +++++++++++++++++++++++++++++++ files/templates/submission.html | 46 ++++++++++++++------------------- 2 files changed, 63 insertions(+), 27 deletions(-) diff --git a/files/templates/default.html b/files/templates/default.html index c9a47a38dd..e529de311c 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -68,6 +68,50 @@ {% if v %} + {% endif %} diff --git a/files/templates/submission.html b/files/templates/submission.html index c6263aa0e3..e639c5d6f4 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -33,15 +33,6 @@ {% endif %} - - {% if p.award_count("shit") %} {% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %} @@ -587,6 +578,25 @@
    + + +
    @@ -692,24 +702,6 @@
    - - {% if v and v.id==p.author_id %} {% include "delete_post_modal.html" %} {% endif %} From 1b33d099958c697574018821fc83d882c5924773 Mon Sep 17 00:00:00 2001 From: Yo Mama Date: Tue, 28 Sep 2021 01:21:53 +0200 Subject: [PATCH 6/6] Make the new comments counts more locally included instead of being included on all the pages --- files/templates/comments.html | 2 + files/templates/default.html | 44 ---------- .../templates/embeds/new_comments_count.html | 80 +++++++++++++++++++ files/templates/submission.html | 2 + files/templates/submission_listing.html | 2 + 5 files changed, 86 insertions(+), 44 deletions(-) create mode 100644 files/templates/embeds/new_comments_count.html diff --git a/files/templates/comments.html b/files/templates/comments.html index 3875c0c21d..357e7e6e6a 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -9,6 +9,8 @@ {% endif %} +{% include 'embeds/new_comments_count.html' %} + - {% endif %} diff --git a/files/templates/embeds/new_comments_count.html b/files/templates/embeds/new_comments_count.html new file mode 100644 index 0000000000..c2adf6acb1 --- /dev/null +++ b/files/templates/embeds/new_comments_count.html @@ -0,0 +1,80 @@ + diff --git a/files/templates/submission.html b/files/templates/submission.html index e639c5d6f4..3585c3535d 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -64,6 +64,8 @@ {% endif %} +{% include 'embeds/new_comments_count.html' %} + diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 365d203a2e..209f341af5 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -15,6 +15,8 @@ }); +{% include 'embeds/new_comments_count.html' %} + {% for p in listing %} {% set ups=p.upvotes %}