+ ${onlyIfExists(`
`, activity.assets.small_image)}
${activity.name}
${onlyIfExists("${stuff} `
-
- if (link) {
- replacement = `${replacement} `
+ if (spanEnd == -1) {
+ spanEnd = element.content.length
+ }
+
+ var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1
+
+ // if (highTable[index] == "ULTRAKILL") {
+ // console.log(startContent, " ---- ", endContent)
+ // }
+
+ var startContent = element.content.substring(spanStart - 1, termIndex)
+ var endContent = element.content.substring(termIndex + termKey.length, spanEnd)
+
+ if (startContent.includes("(") && !endContent.includes(")")) {
+ spanEnd = element.content.indexOf(")", spanStart) + 1
+ endContent = element.content.substring(termIndex + termKey.length, spanEnd)
+ }
+ else if (endContent.includes(")") && !startContent.includes("(")) {
+ spanStart = element.content.substring(0, spanStart).lastIndexOf("(")
+ startContent = element.content.substring(spanStart - 1, termIndex)
+ }
+
+ var style = termProps.style || ""
+ var classes = termProps.classes || ""
+ 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 :30
+ }
+
+ if (termProps.bold) {
+ classes += "bold"
+ }
+
+ if (style.length > 2) {
+ style = `style="${style}"`
+ }
+
+ if (classes.length > 2) {
+ classes = `class="${classes}"`
+ }
+
+ var stuff = (startContent + dict.words[x] + endContent).trim()
+
+ if (!stuff.includes("span")) {
+ var replacement = `${stuff} `
+
+ if (link) {
+ replacement = `${replacement} `
+ }
+ element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
+ } else {
+ element.content = element.content.replace(termKey, dict.words[x])
}
- element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
- } else {
- element.content = element.content.replace(termKey, highTable[index])
}
}
}
@@ -181,9 +202,16 @@ function highlighter(json, full = true) {
function converter(html, dynamic = true) {
var startTime = Date.now()
var config = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/config.json')))
-
+
var staticReplacers = {
- "ALL_HIGHLIGHTS": Object.keys(highlightedWords).join(", "),
+ "ALL_HIGHLIGHTS": () => {
+ var addedHTML = ""
+ for (var i = 0; i < highlightedWords.length; i++) {
+ addedHTML += highlightedWords[i].words.join(", ")
+ addedHTML += ", "
+ }
+ return addedHTML.substring(0, addedHTML.length - 2)
+ },
"BRANCH_NAME": () => {
if (process.env.BRANCH == "dev") {
return "Stable"
diff --git a/static/asahi/index.html b/static/asahi/index.html
deleted file mode 100644
index 69debc8..0000000
--- a/static/asahi/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Violet's Purgatory
-
-
-
-
-
-
-
-
-
-
- {WEATHER_MODIFIER}
- {TOPBAR}
-
Welcome to myHumble Abode
-
-
- nice seeing you here! while you're at it, why not check out my socials or about me?
-
-
Asahi
-
-
-
-
-
-
-
They/Them
-
Marcy & Violet <3
-
-
-
-
-
-
-
-
-
-
-
-
- This is NOT Asahi's real site! Please find it here instead!
-
-
- “literally anything from the 1995 movie 'Hackers' will absolutely fit here” -tyberry
-
-
-
-
-
-
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index ee2a0c3..ffa41d8 100644
--- a/static/index.html
+++ b/static/index.html
@@ -86,6 +86,7 @@
{PATH_SOCIALS}
+
See the full FAQ here!
{PATH_FAQ}
{SELECTED_VIDEO}
diff --git a/static/main.js b/static/main.js
index 1b48300..5c50bc3 100644
--- a/static/main.js
+++ b/static/main.js
@@ -86,7 +86,7 @@ function timeFormatter(seconds) {
}
}
-function loop() {
+function spinLoop() {
spinWaiting = true
setTimeout(() => {
spinWaiting = false
@@ -125,26 +125,31 @@ function loop() {
spins = lerp(spins, Math.round(spins), 1 / spinSpeed * 3)
}
$(".pfp").css("rotate", (spins * 360) + "deg")
-
- $(".durationBarFormatter").each((_, item) => {
- item = $(item)
- item.text(`${timeFormatter((Date.now() - item.attr("data-start")))}/${timeFormatter((item.attr("data-end") - item.attr("data-start")))}`)
- })
-
- $(".timeEstimate").each((_, item) => {
- item = $(item)
- item.text(gameTimeFormatter(Date.now() - item.attr("data-start")))
- })
-
- $(".endEstimate").each((_, item) => {
- item = $(item)
- item.text(timeFormatter((item.attr("data-end") - Date.now())))
- })
-
- loop()
+ spinLoop()
}, 1/spinSpeed * 1000);
}
+function secondLoop() {
+ $(".durationBarFormatter").each((_, item) => {
+ item = $(item)
+ item.text(`${timeFormatter((Date.now() - item.attr("data-start")))}/${timeFormatter((item.attr("data-end") - item.attr("data-start")))}`)
+ })
+
+ $(".timeEstimate").each((_, item) => {
+ item = $(item)
+ item.text(gameTimeFormatter(Date.now() - item.attr("data-start")))
+ })
+
+ $(".endEstimate").each((_, item) => {
+ item = $(item)
+ item.text(timeFormatter((item.attr("data-end") - Date.now())))
+ })
+
+ setTimeout(() => {
+ secondLoop()
+ }, 1000);
+}
+
window.onbeforeunload = function () {
window.scrollTo(0, 0);
}
@@ -154,7 +159,8 @@ window.onload = function () {
pfp = $(".pfp")
- loop()
+ spinLoop()
+ secondLoop()
pfp.on("mousedown", () => {
// if (!spinWaiting) {
diff --git a/static/themes/magic/style.css b/static/themes/magic/style.css
index 05b8512..1721029 100644
--- a/static/themes/magic/style.css
+++ b/static/themes/magic/style.css
@@ -1,6 +1,6 @@
#card {
- background-color: rgba(20, 5, 90, 0.5);
+ background-color: rgba(25, 0, 70, 1);
/* backdrop-filter: blur(5px); */
}
.magicStuff {
diff --git a/static/themes/rain/style.css b/static/themes/rain/style.css
index 3302382..d10daae 100644
--- a/static/themes/rain/style.css
+++ b/static/themes/rain/style.css
@@ -1,6 +1,6 @@
#card {
- background-color: rgba(50, 0, 90, 0.5);
+ background-color: rgba(25, 0, 70, 1);
/* backdrop-filter: blur(5px); */
}
.rainStuff {
-