Violet/Violets-Purgatory
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert c6b2f65171

Browse source 
revert Highlight rewrite
This commit is contained in:
Violet 2024-09-13 10:42:32 -05:00
parent 05ff2f0fa6
commit 684a45811a
1 changed files with 80 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

209
pageUpdater.js
View file

@ -111,166 +111,117 @@ function highlighter(json, full = true, linkParent = false) {
if (element.tagName == "code") { if (element.tagName == "code") {
valid = false valid = false
} }
if (valid) { if (valid) {
element.children = highlighter(element.children, full, linkParent || element.tagName == "a") element.children = highlighter(element.children, full, linkParent || element.tagName == "a")
} }
} }
} else if (element.type == "text") { } else if (element.type == "text") {
var index = 0
for (let i = 0; i < highlightedWords.length; i++) { for (let i = 0; i < highlightedWords.length; i++) {
var dict = highlightedWords[i] var dict = highlightedWords[i]
for (let x = 0; x < dict.words.length; x++) { for (let x = 0; x < dict.words.length; x++) {
index += 1
var term = dict.words[x]; var term = dict.words[x];
var termWordCount = term.split(" ").length
var termProps = dict var termProps = dict
var reg = new RegExp(`(${term})`, "g") var reg = term
if (termProps.caseInsensitive) { if (termProps.caseInsensitive) {
reg = new RegExp(`(${term})`, "gi") reg = new RegExp(`(${term})`, "gi")
} }
element.content = element.content.replaceAll(`{${term}}`, "TEMPORARY_REPLACE")
var style = termProps.style || "" element.content = element.content.replaceAll(reg, "{TERM" + index + "}")
var classes = termProps.classes || "" element.content = element.content.replaceAll("TEMPORARY_REPLACE", `${term}`)
var link = termProps.link || ""
if (termProps.color) {
style += `color: ${termProps.color};`
}
if (termProps.italicized) {
style += "font-style: italic;"
}
if (termProps.outline) {
var width = 2
// style += `text-shadow: -1px -1px 0 ${termProps.outline}, 1px -1px 0 ${termProps.outline}, -1px 1px 0 ${termProps.outline}, 1px 1px 0 ${termProps.outline};`
style += `-webkit-text-stroke: 1px ${termProps.outline};`
// ^ Not in use because it looks bad :3
}
if (termProps.bold) {
classes += "bold"
}
if (style.length > 2) {
style = `style="${style}"`
}
if (classes.length > 2) {
classes = `class="${classes}"`
}
var splitContent = element.content.split(" ")
for (let y = 0; y < splitContent.length; y++) {
var word = splitContent[y]
if (reg.test(word)) {
if (link && !linkParent) {
splitContent[y] = `<a href="${link}">${splitContent[y]}</a>`
} else {
splitContent[y] = `<span ${style} ${classes}>${splitContent[y]}</span>`
}
}
}
element.content = splitContent.join(" ")
// element.content = element.content.replaceAll(`{${term}}`, "TEMPORARY_REPLACE")
// element.content = element.content.replaceAll(reg, "{TERM" + index + "}")
// element.content = element.content.replaceAll("TEMPORARY_REPLACE", `${term}`)
} }
} }
// if (full) { if (full) {
// var index = 0 var index = 0
// for (let i = 0; i < highlightedWords.length; i++) { for (let i = 0; i < highlightedWords.length; i++) {
// var dict = highlightedWords[i] var dict = highlightedWords[i]
// for (let x = 0; x < dict.words.length; x++) { for (let x = 0; x < dict.words.length; x++) {
// index += 1 index += 1
// var termKey = "{TERM" + index + "}" var termKey = "{TERM" + index + "}"
// var termProps = dict var termProps = dict
// while (element.content.includes(termKey)) { while (element.content.includes(termKey)) {
// var termIndex = element.content.indexOf(termKey) var termIndex = element.content.indexOf(termKey)
// var spanEnd = element.content.indexOf(" ", termIndex) var spanEnd = element.content.indexOf(" ", termIndex)
// if (spanEnd == -1) { if (spanEnd == -1) {
// spanEnd = element.content.length spanEnd = element.content.length
// } }
// var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1 var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1
// // if (highTable[index] == "ULTRAKILL") { // if (highTable[index] == "ULTRAKILL") {
// // console.log(startContent, " ---- ", endContent) // console.log(startContent, " ---- ", endContent)
// // } // }
// var startContent = element.content.substring(spanStart - 1, termIndex) var startContent = element.content.substring(spanStart - 1, termIndex)
// var endContent = element.content.substring(termIndex + termKey.length, spanEnd) var endContent = element.content.substring(termIndex + termKey.length, spanEnd)
// // if (startContent.includes("(") && !endContent.includes(")")) { // if (startContent.includes("(") && !endContent.includes(")")) {
// // spanEnd = element.content.indexOf(")", spanStart) + 1 // spanEnd = element.content.indexOf(")", spanStart) + 1
// // endContent = element.content.substring(termIndex + termKey.length, spanEnd) // endContent = element.content.substring(termIndex + termKey.length, spanEnd)
// // } // }
// // else if (endContent.includes(")") && !startContent.includes("(")) { // else if (endContent.includes(")") && !startContent.includes("(")) {
// // spanStart = element.content.substring(0, spanStart).lastIndexOf("(") // spanStart = element.content.substring(0, spanStart).lastIndexOf("(")
// // startContent = element.content.substring(spanStart - 1, termIndex) // startContent = element.content.substring(spanStart - 1, termIndex)
// // } // }
// var style = termProps.style || "" var style = termProps.style || ""
// var classes = termProps.classes || "" var classes = termProps.classes || ""
// var link = termProps.link || "" var link = termProps.link || ""
// if (termProps.color) { if (termProps.color) {
// style += `color: ${termProps.color};` style += `color: ${termProps.color};`
// } }
// if (termProps.italicized) { if (termProps.italicized) {
// style += "font-style: italic;" style += "font-style: italic;"
// } }
// if (termProps.outline) { if (termProps.outline) {
// var width = 2 var width = 2
// // style += `text-shadow: -1px -1px 0 ${termProps.outline}, 1px -1px 0 ${termProps.outline}, -1px 1px 0 ${termProps.outline}, 1px 1px 0 ${termProps.outline};` // style += `text-shadow: -1px -1px 0 ${termProps.outline}, 1px -1px 0 ${termProps.outline}, -1px 1px 0 ${termProps.outline}, 1px 1px 0 ${termProps.outline};`
// style += `-webkit-text-stroke: 1px ${termProps.outline};` style += `-webkit-text-stroke: 1px ${termProps.outline};`
// // ^ Not in use because it looks bad :30 // ^ Not in use because it looks bad :30
// } }
// if (termProps.bold) { if (termProps.bold) {
// classes += "bold" classes += "bold"
// } }
// if (style.length > 2) { if (style.length > 2) {
// style = `style="${style}"` style = `style="${style}"`
// } }
// if (classes.length > 2) { if (classes.length > 2) {
// classes = `class="${classes}"` classes = `class="${classes}"`
// } }
// var stuff = (startContent + dict.words[x] + endContent).trim() var stuff = (startContent + dict.words[x] + endContent).trim()
// if (!stuff.includes("span")) { if (!stuff.includes("span")) {
// var replacement = `<span ${style} ${classes}>${stuff}</span>` var replacement = `<span ${style} ${classes}>${stuff}</span>`
// if (link && !linkParent) { if (link && !linkParent) {
// replacement = `<a href="${link}">${replacement}</a>` replacement = `<a href="${link}">${replacement}</a>`
// // console.log(replacement) // console.log(replacement)
// } }
// element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd) element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
// } else { } else {
// element.content = element.content.replace(termKey, dict.words[x]) element.content = element.content.replace(termKey, dict.words[x])
// } }
// } }
// } }
// } }
// // element.content = element.content.replaceAll(termKey, replacement) // element.content = element.content.replaceAll(termKey, replacement)
// } }
} }
} }
@ -280,7 +231,7 @@ function highlighter(json, full = true, linkParent = false) {
function converter(html, dynamic = true) { function converter(html, dynamic = true) {
var startTime = Date.now() var startTime = Date.now()
var config = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/config.json'))) var config = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/config.json')))
var staticReplacers = { var staticReplacers = {
"ALL_HIGHLIGHTS": () => { "ALL_HIGHLIGHTS": () => {
var addedHTML = "" var addedHTML = ""
@ -360,7 +311,7 @@ function converter(html, dynamic = true) {
var siteName = sitesTable[x] var siteName = sitesTable[x]
var siteData = sites[siteName] var siteData = sites[siteName]
html += `<a class="chip" ${onlyIfExists(`href="${siteData.url}"`, siteData.url)}>${siteName}: <span class="noHighlight">${siteData.name}</span></a>` html += `<a class="chip" ${onlyIfExists(`href="${siteData.url}"`, siteData.url)}>${siteName}: <span class="noHighlight">${siteData.name}</span></a>`
} }
html += "</div></div>" html += "</div></div>"
} }
@ -372,8 +323,8 @@ function converter(html, dynamic = true) {
for (var i in api.blogPosts) { for (var i in api.blogPosts) {
var post = api.blogPosts[i] var post = api.blogPosts[i]
if (!post.hidden) { if (!post.hidden) {
addedHTML += addedHTML +=
`<div class="post"> `<div class="post">
<a style="text-decoration: none;" href="./${post.folder}"> <a style="text-decoration: none;" href="./${post.folder}">
<h2>${post.title}</h2> <h2>${post.title}</h2>
<p style="color: white; font-size: 1rem;">${post.desc}</p> <p style="color: white; font-size: 1rem;">${post.desc}</p>
@ -487,7 +438,7 @@ module.exports = {
} }
res.send(data) res.send(data)
} }
else { else {
next() next()
} }