rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "improve the showmore algo" 

This reverts commit 9529cbbd61.
pull/134/head
Aevann 2023-02-24 09:29:46 +02:00
parent 6fcc525772
commit ae26306846
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/assets/js/core.js
View File

@ -260,19 +260,9 @@ function changename(s1,s2) {
} }
function showmore(t) { function showmore(t) {
let div = t const div = t.parentElement.nextElementSibling
while (!(div.id && (div.id.startsWith('comment-text-') || div.id == 'post-text'))){ div.classList.toggle('d-none')
div = div.parentElement if (div.classList.contains('d-none'))
}
let text = div.getElementsByTagName('d')[0]
if (!text) text = div.getElementsByClassName('showmore-text')[0]
if (!text) text = div.getElementsByClassName('d-none')[0]
text.classList.add('showmore-text')
text.classList.toggle('d-none')
if (text.classList.contains('d-none'))
t.innerHTML = 'SHOW MORE' t.innerHTML = 'SHOW MORE'
else else
t.innerHTML = 'SHOW LESS' t.innerHTML = 'SHOW LESS'

2
files/helpers/regex.py
View File

@ -108,7 +108,7 @@ color_regex = re.compile("[a-f0-9]{6}", flags=re.A)
# lazy match on the .*?, only match if there is trailing stuff # lazy match on the .*?, only match if there is trailing stuff
# Specifically match Snappy's way of formatting, this might break some losers' comments. # Specifically match Snappy's way of formatting, this might break some losers' comments.
showmore_regex = re.compile(r"^(.*?<\/[a-z]+>(?:<\/li><\/ul>)?)(\s*<[a-z]+>.*)", flags=re.A|re.DOTALL) showmore_regex = re.compile(r"^(.*?</p>(?:</li></ul>)?)(\s*<p>.*)", flags=re.A|re.DOTALL)
search_token_regex = re.compile('"([^"]*)"|(\S+)', flags=re.A) search_token_regex = re.compile('"([^"]*)"|(\S+)', flags=re.A)

4
files/helpers/sanitize.py
View File

@ -543,14 +543,14 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=True, count_marseys
CHARLIMIT = 3000 CHARLIMIT = 3000
pos = 0 pos = 0
for _ in range(20): for _ in range(20):
pos = sanitized.find('>', pos + 4) pos = sanitized.find('</p>', pos + 4)
if pos < 0: if pos < 0:
break break
if (pos < 0 and len(sanitized) > CHARLIMIT) or pos > CHARLIMIT: if (pos < 0 and len(sanitized) > CHARLIMIT) or pos > CHARLIMIT:
pos = CHARLIMIT - 500 pos = CHARLIMIT - 500
if pos >= 0: if pos >= 0:
sanitized = (sanitized[:pos] + sanitized = (sanitized[:pos] +
showmore_regex.sub(r'\1<p><button class="showmore">SHOW MORE</button></p></ul><d class="d-none">\2</d>', showmore_regex.sub(r'\1<p><button class="showmore">SHOW MORE</button></p><d class="d-none">\2</d>',
sanitized[pos:], count=1)) sanitized[pos:], count=1))
return sanitized.strip() return sanitized.strip()