Compare commits

..

No commits in common. "f9a57722af6411846710f58a234eee5ea4e437a2" and "035a7a838e3e4ed195ba2f16e4e12f8d39e4c974" have entirely different histories.

8 changed files with 22 additions and 107 deletions

Binary file not shown.

Binary file not shown.

View file

@ -161,22 +161,9 @@
"color": "rgb(255, 100, 100)", "color": "rgb(255, 100, 100)",
"caseInsensitive": true "caseInsensitive": true
}, },
"Teto Territory": {
"color": "rgb(255, 100, 100)",
"caseInsensitive": true
},
"Teto": { "Teto": {
"color": "rgb(255, 100, 100)", "color": "rgb(255, 100, 100)",
"caseInsensitive": true "caseInsensitive": true
},
"Kasane": {
"color": "rgb(255, 100, 100)",
"caseInsensitive": true
},
"Ryouiki Tenkai": {
"bold": true,
"italicized": true,
"caseInsensitive": true
} }
} }
} }

View file

@ -47,6 +47,8 @@ function converter(html) {
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 statusText = ""
var bnchName = "Beta" var bnchName = "Beta"
var bnchSub = "beta." var bnchSub = "beta."
@ -96,44 +98,13 @@ function converter(html) {
}, },
"SPINCOUNT": globalSpins, "SPINCOUNT": globalSpins,
"UPTIME": timeFormatter((Date.now() - uptime) / 1000), "UPTIME": timeFormatter((Date.now() - uptime) / 1000),
"LAST_LANYARD": timeFormatter((Date.now() - lastLanyardUpdate) / 1000),
"WEATHER_MODIFIER": randomThemer.returnTheme(), "WEATHER_MODIFIER": randomThemer.returnTheme(),
"WEATHER_TEXT": "", "WEATHER_TEXT": "",
"ANNOUNCEMENT": fs.readFileSync(path.join(__dirname, "config/announcement.html")), "ANNOUNCEMENT": fs.readFileSync(path.join(__dirname, "config/announcement.html")),
"ACTIVITIES": activityToHTML.activitiesToHTML(lanyardData), "CACHED_IMAGES": fs.readdirSync(path.join(__dirname, "cached")).length.toString(),
"SOCIALS": () => { "ACTIVITIES": activityToHTML.activitiesToHTML(lanyardData)
var socials = lanyardData.socials
var html = ""
if (socials) {
var socialsTable = Object.keys(socials)
for (var i = 0; i < socialsTable.length; i++) {
var category = socialsTable[i]
var sites = socials[category]
var sitesTable = Object.keys(sites)
html += `<div class="grid-child"><div><h3>${category}</h3>`
for (var x = 0; x < sitesTable.length; x++) {
var siteName = sitesTable[x]
var siteData = sites[siteName]
if (siteData.url) {
html += `<a class="chip" href="${siteData.url}">${siteName}: ${siteData.name}</a>`
}
}
html += "</div></div>"
}
}
return html
}
} }
// <div class="grid-child">
// <div>
// <h3>Chat</h3>
// <a class="chip" href="https://matrix.to/#/@bingus_violet:matrix.violets-purgatory.dev">Matrix: @bingus_violet:&ZeroWidthSpace;matrix.violets-purgatory.dev</a>
// <a class="chip">Discord: bingus_violet</a>
// <a class="chip">Revolt: Bingus{Violet}#5573</a>
// </div>
// </div>
replacers.ALL_KEYWORDS = "{" + Object.keys(replacers).join("}{") + "} " replacers.ALL_KEYWORDS = "{" + Object.keys(replacers).join("}{") + "} "
while (html.includes("{PATH_")) { while (html.includes("{PATH_")) {
@ -200,33 +171,10 @@ function converter(html) {
var endContent = element.content.substring(termIndex + termKey.length, spanEnd) var endContent = element.content.substring(termIndex + termKey.length, spanEnd)
var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1 var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ")
var startContent = element.content.substring(spanStart - 1, termIndex) var startContent = element.content.substring(spanStart, termIndex)
var style = termProps.style || "" var replacement = `<span style="color: ${termProps.color}">${startContent + highTable[index] + endContent}</span>`
var classes = termProps.classes || ""
if (termProps.color) {
style += `color: ${termProps.color};`
}
if (termProps.italicized) {
style += "font-style: italic;"
}
if (termProps.bold) {
classes += "bold"
}
if (style.length > 2) {
style = `style="${style}"`
}
if (classes.length > 2) {
classes = `class="${classes}"`
}
var replacement = `<span ${style} ${classes}>${startContent + highTable[index] + endContent}</span>`
element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd) element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
} }
@ -307,7 +255,7 @@ async function updateCommits() {
var commits = siteResponse.substring(0, siteResponse.indexOf("Commits")) var commits = siteResponse.substring(0, siteResponse.indexOf("Commits"))
commits = commits.substring(commits.lastIndexOf("<b>") + 3, commits.lastIndexOf("</b>")) commits = commits.substring(commits.lastIndexOf("<b>") + 3, commits.lastIndexOf("</b>"))
// ^ this works for Forgejo (basically everything i use that isnt Github, E.G. Codeberg) // ^ this works for Forgejo (basically everything i use that isnt Github E.G. Codeberg)
// commits = commits.substring(commits.lastIndexOf(">") + 1) // commits = commits.substring(commits.lastIndexOf(">") + 1)
// ^ This works for Github (fuck you Github) // ^ This works for Github (fuck you Github)

View file

@ -18,27 +18,15 @@ const discStatuses = {
} }
const spinSpeed = 30 const spinSpeed = 30
var spinFactor = 3
var date = new Date()
var teto = false
if (date.getDay() == 2) {
teto = true
}
var pfp var pfp
var music var music = new Audio("/snds/Lotus Waters.ogg")
music.preservesPitch = false
if (teto) {
music = new Audio("/snds/Triple Baka.ogg")
} else {
music = new Audio("/snds/Lotus Waters.ogg")
}
music.loop = true music.loop = true
music.playbackRate = 0
// var whipLash = new Audio("/snds/johnny-test-whip-crack.mp3")
// whipLash.volume = 0.25
var sock var sock
@ -66,17 +54,12 @@ function spinLoop() {
spinWaiting = false spinWaiting = false
if (spinning) { if (spinning) {
music.volume = 0.5 music.volume = 0.5
if (music.currentTime > 6.5 && teto) { music.playbackRate = lerp(music.playbackRate, 1, 1/spinSpeed)
spinFactor = 0.25
} else {
spinFactor = 3
}
// music.playbackRate = lerp(music.playbackRate, 1, 1/spinSpeed)
if (spins > 1) { if (spins > 1) {
document.querySelector(".spinnyCount").style.display = "block" document.querySelector(".spinnyCount").style.display = "block"
document.querySelector(".localSpins").innerHTML = Math.ceil(spins - 1); document.querySelector(".localSpins").innerHTML = Math.ceil(spins - 1);
} }
spins += 1/spinSpeed / spinFactor spins += 1/spinSpeed / 3
if (Math.floor(spins) != lastSent && sock && sock.OPEN) { if (Math.floor(spins) != lastSent && sock && sock.OPEN) {
document.querySelector(".globalSpins").innerHTML = globalSpins + 1 document.querySelector(".globalSpins").innerHTML = globalSpins + 1
lastSent = Math.floor(spins) lastSent = Math.floor(spins)
@ -85,9 +68,8 @@ function spinLoop() {
console.log("Spin Sent!") console.log("Spin Sent!")
} }
} else { } else {
// music.playbackRate = lerp(music.playbackRate, 0.5, 1/spinSpeed) music.playbackRate = lerp(music.playbackRate, 0.5, 1/spinSpeed)
music.pause() music.volume = lerp(music.volume, 0, 1/spinSpeed * 4)
music.currentTime = 1.5
spins = lerp(spins, Math.round(spins), 1 / spinSpeed * 3) spins = lerp(spins, Math.round(spins), 1 / spinSpeed * 3)
} }
document.querySelector(".pfp").style.rotate = (spins * 360) + "deg" document.querySelector(".pfp").style.rotate = (spins * 360) + "deg"

View file

@ -31,13 +31,12 @@
<main> <main>
<p>Here's most of the sites you can find me on-<br>if you needed that for some reason?</p> <p>Here's most of the sites you can find me on-<br>if you needed that for some reason?</p>
<div class="grid-container"> <div class="grid-container">
{SOCIALS} <div class="grid-child">
<!-- <div class="grid-child">
<div> <div>
<h3>Social Media</h3> <h3>Social Media</h3>
<a class="chip" href="https://floofy.city/@bingus_violet" rel="me">Fedi: bingus_violet&ZeroWidthSpace;@floofy.city</a> <a class="chip" href="https://floofy.city/@bingus_violet" rel="me">Fedi: bingus_violet&ZeroWidthSpace;@floofy.city</a>
<a class="chip" href="https://www.youtube.com/channel/UChcrBJNJLZucy3TPyGyAY2g">Youtube: {Violet}'s Fiasco</a> <a class="chip" href="https://www.youtube.com/channel/UChcrBJNJLZucy3TPyGyAY2g">Youtube: {Violet}'s Fiasco</a>
<a class="chip" href="https://ko-fi.com/bingus_violet">Ko-fi: Bingus_{Violet}</a> <!-- <a class="chip" href="https://ko-fi.com/bingus_violet">Ko-fi: Bingus_{Violet}</a> -->
<a class="chip" href="https://en.liberapay.com/bingus_violet/">Liberapay: bingus_violet</a> <a class="chip" href="https://en.liberapay.com/bingus_violet/">Liberapay: bingus_violet</a>
</div> </div>
</div> </div>
@ -64,7 +63,7 @@
<a class="chip" href="https://steamcommunity.com/id/violet-The-Thigh-high-obtainer/">Steam: {Violet}</a> <a class="chip" href="https://steamcommunity.com/id/violet-The-Thigh-high-obtainer/">Steam: {Violet}</a>
<a class="chip" href="https://www.roblox.com/users/28347789/profile">Roblox: @bingus_violet</a> <a class="chip" href="https://www.roblox.com/users/28347789/profile">Roblox: @bingus_violet</a>
</div> </div>
</div> --> </div>
</div> </div>
<br> <br>
</main> </main>

View file

@ -37,7 +37,6 @@
<ul> <ul>
<li>Page generation time: {LOAD_TIME}</li> <li>Page generation time: {LOAD_TIME}</li>
<li>Uptime: {UPTIME}</li> <li>Uptime: {UPTIME}</li>
<li>Last Lanyard update: {LAST_LANYARD}</li>
</ul> </ul>
</main> </main>
</div> </div>

View file

@ -328,7 +328,7 @@ em, b, s {
color: inherit; color: inherit;
} }
b, b > *, .activityTitle, .activityTitle > *, .bold { b, b > *, .activityTitle, .activityTitle > * {
font-family: "RubikBold", Verdana, Geneva, Tahoma, sans-serif; font-family: "RubikBold", Verdana, Geneva, Tahoma, sans-serif;
} }