Merge branch 'main' into changelog

This commit is contained in:
random_guy52 2021-01-11 07:27:30 +01:00
commit 8bfc37fd05
3 changed files with 678 additions and 673 deletions

View File

@ -35,7 +35,7 @@ module.exports = function() {
ups = `${kFormatter(comments.ups)} points`
}
if(comments.edited) {
edited_span = `<span title="this comment is edited">*</span>`
edited_span = `<span title="last edited ${toUTCString(comments.edited)}">*</span>`
}
if(comments.controversiality > 0) {
controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>`
@ -75,7 +75,7 @@ module.exports = function() {
} else {
if(!morechildren_ids) {
let load_comms_href = parent_id
comments_html = `
<div class="load-more-comments">
<a href="${load_comms_href}#c">load more comments (${comments.count})</a>
@ -131,7 +131,7 @@ module.exports = function() {
ups = `${kFormatter(comment.ups)} points`
}
if(comment.edited) {
edited_span = `<span title="this comment is edited">*</span>`
edited_span = `<span title="last edited ${toUTCString(comments.edited)}">*</span>`
}
if(comment.controversiality > 0) {
controversial_span = `<span class="controversial" title="this comment is voted as controversial">†</span>`
@ -180,7 +180,7 @@ module.exports = function() {
</div>
`
} else {
let link = comment.parent_id.split('_')[1]
let link = comment.parent_id.split('_')[1]
comments_html = `
<div class="load-more-comments">
<a href="${link}/#c">continue this thread</a>

File diff suppressed because it is too large Load Diff

View File

@ -150,7 +150,7 @@ html
input(type="checkbox", name="nsfw", id="nsfw", checked="checked")
input(type="submit", value="search")
if subreddit_about
.subscribe
.subscribe.content
-
let subbed_to_this_subreddit = false
let subbed = []