diff --git a/src/web/alerts/www/public/eddiescream.ogg b/src/web/alerts/www/assets/eddiescream.ogg similarity index 100% rename from src/web/alerts/www/public/eddiescream.ogg rename to src/web/alerts/www/assets/eddiescream.ogg diff --git a/src/web/alerts/www/public/explosions/factorioexplosion1.ogg b/src/web/alerts/www/assets/explosions/factorioexplosion1.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorioexplosion1.ogg rename to src/web/alerts/www/assets/explosions/factorioexplosion1.ogg diff --git a/src/web/alerts/www/public/explosions/factorioexplosion2.ogg b/src/web/alerts/www/assets/explosions/factorioexplosion2.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorioexplosion2.ogg rename to src/web/alerts/www/assets/explosions/factorioexplosion2.ogg diff --git a/src/web/alerts/www/public/explosions/factorioexplosion3.ogg b/src/web/alerts/www/assets/explosions/factorioexplosion3.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorioexplosion3.ogg rename to src/web/alerts/www/assets/explosions/factorioexplosion3.ogg diff --git a/src/web/alerts/www/public/explosions/factorioexplosion4.ogg b/src/web/alerts/www/assets/explosions/factorioexplosion4.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorioexplosion4.ogg rename to src/web/alerts/www/assets/explosions/factorioexplosion4.ogg diff --git a/src/web/alerts/www/public/explosions/factorioexplosion5.ogg b/src/web/alerts/www/assets/explosions/factorioexplosion5.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorioexplosion5.ogg rename to src/web/alerts/www/assets/explosions/factorioexplosion5.ogg diff --git a/src/web/alerts/www/public/explosions/factoriolargeexplosion1.ogg b/src/web/alerts/www/assets/explosions/factoriolargeexplosion1.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factoriolargeexplosion1.ogg rename to src/web/alerts/www/assets/explosions/factoriolargeexplosion1.ogg diff --git a/src/web/alerts/www/public/explosions/factoriolargeexplosion2.ogg b/src/web/alerts/www/assets/explosions/factoriolargeexplosion2.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factoriolargeexplosion2.ogg rename to src/web/alerts/www/assets/explosions/factoriolargeexplosion2.ogg diff --git a/src/web/alerts/www/public/explosions/factorionuke.ogg b/src/web/alerts/www/assets/explosions/factorionuke.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/factorionuke.ogg rename to src/web/alerts/www/assets/explosions/factorionuke.ogg diff --git a/src/web/alerts/www/public/explosions/halflifeexplosion1.ogg b/src/web/alerts/www/assets/explosions/halflifeexplosion1.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/halflifeexplosion1.ogg rename to src/web/alerts/www/assets/explosions/halflifeexplosion1.ogg diff --git a/src/web/alerts/www/public/explosions/halflifeexplosion2.ogg b/src/web/alerts/www/assets/explosions/halflifeexplosion2.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/halflifeexplosion2.ogg rename to src/web/alerts/www/assets/explosions/halflifeexplosion2.ogg diff --git a/src/web/alerts/www/public/explosions/halflifeexplosion3.ogg b/src/web/alerts/www/assets/explosions/halflifeexplosion3.ogg similarity index 100% rename from src/web/alerts/www/public/explosions/halflifeexplosion3.ogg rename to src/web/alerts/www/assets/explosions/halflifeexplosion3.ogg diff --git a/src/web/alerts/www/public/factorioalert.ogg b/src/web/alerts/www/assets/factorioalert.ogg similarity index 100% rename from src/web/alerts/www/public/factorioalert.ogg rename to src/web/alerts/www/assets/factorioalert.ogg diff --git a/src/web/alerts/www/public/getrekt.jpg b/src/web/alerts/www/assets/getrekt.jpg similarity index 100% rename from src/web/alerts/www/public/getrekt.jpg rename to src/web/alerts/www/assets/getrekt.jpg diff --git a/src/web/alerts/www/public/mariokartbox.ogg b/src/web/alerts/www/assets/mariokartbox.ogg similarity index 100% rename from src/web/alerts/www/public/mariokartbox.ogg rename to src/web/alerts/www/assets/mariokartbox.ogg diff --git a/src/web/alerts/www/public/mrockmadhouse.ogg b/src/web/alerts/www/assets/mrockmadhouse.ogg similarity index 100% rename from src/web/alerts/www/public/mrockmadhouse.ogg rename to src/web/alerts/www/assets/mrockmadhouse.ogg diff --git a/src/web/alerts/www/public/ripbozo.ogg b/src/web/alerts/www/assets/ripbozo.ogg similarity index 100% rename from src/web/alerts/www/public/ripbozo.ogg rename to src/web/alerts/www/assets/ripbozo.ogg diff --git a/src/web/alerts/www/public/tnt.mp4 b/src/web/alerts/www/assets/tnt.mp4 similarity index 100% rename from src/web/alerts/www/public/tnt.mp4 rename to src/web/alerts/www/assets/tnt.mp4 diff --git a/src/web/alerts/www/src/alerts/blastinRoulette.ts b/src/web/alerts/www/src/alerts/blastinRoulette.ts index e410749..7a6a55b 100644 --- a/src/web/alerts/www/src/alerts/blastinRoulette.ts +++ b/src/web/alerts/www/src/alerts/blastinRoulette.ts @@ -5,7 +5,7 @@ function easeOutQuad(t: number) { } export default async function execute(alert: blastinRoulette) { - const audio = new Audio("/alerts/public/mariokartbox.ogg"); + const audio = new Audio("/alerts/assets/mariokartbox.ogg"); audio.play(); const div = document.createElement("div"); div.classList.add("blastin-roulette"); diff --git a/src/web/alerts/www/src/alerts/grenadeExplosion.ts b/src/web/alerts/www/src/alerts/grenadeExplosion.ts index e2fa5ac..131bb5a 100644 --- a/src/web/alerts/www/src/alerts/grenadeExplosion.ts +++ b/src/web/alerts/www/src/alerts/grenadeExplosion.ts @@ -7,14 +7,14 @@ const volume = 1; export default async function execute( alert: grenadeExplosionAlert, ): Promise { - const audioPath = `/alerts/public/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; + const audioPath = `/alerts/assets/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; const audio = new Audio(audioPath); audio.volume = volume; const parentDiv = document.createElement("div"); parentDiv.className = "grenadeExplosionAlert"; parentDiv.innerHTML = ` - + ${alert.user} diff --git a/src/web/alerts/www/src/alerts/sound.ts b/src/web/alerts/www/src/alerts/sound.ts index cfb0ef6..9203007 100644 --- a/src/web/alerts/www/src/alerts/sound.ts +++ b/src/web/alerts/www/src/alerts/sound.ts @@ -2,7 +2,7 @@ import type { soundAlert } from "web/alerts/types"; import type { AlertRunner } from "./index"; export default async function execute(alert: soundAlert): Promise { - const audio = new Audio(`/alerts/public/${alert.sound}.ogg`); + const audio = new Audio(`/alerts/assets/${alert.sound}.ogg`); audio.play(); return { blocking: false, diff --git a/src/web/alerts/www/src/alerts/tntExplosion.ts b/src/web/alerts/www/src/alerts/tntExplosion.ts index 7d2da0d..26def61 100644 --- a/src/web/alerts/www/src/alerts/tntExplosion.ts +++ b/src/web/alerts/www/src/alerts/tntExplosion.ts @@ -24,7 +24,7 @@ export default async function execute( const video = document.createElement("video"); video.volume = volume; - video.src = "/alerts/public/tnt.mp4"; + video.src = "/alerts/assets/tnt.mp4"; video.autoplay = true; video.height = 800; video.width = 450; diff --git a/src/web/alerts/www/src/alerts/userBlast.ts b/src/web/alerts/www/src/alerts/userBlast.ts index 925008a..bd336c9 100644 --- a/src/web/alerts/www/src/alerts/userBlast.ts +++ b/src/web/alerts/www/src/alerts/userBlast.ts @@ -7,14 +7,14 @@ const volume = 1; export default async function execute( alert: userBlastAlert, ): Promise { - const audioPath = `/alerts/public/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; + const audioPath = `/alerts/assets/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; const audio = new Audio(audioPath); audio.volume = volume; const parentDiv = document.createElement("div"); parentDiv.className = "userBlastAlert"; parentDiv.innerHTML = ` - + ${alert.user} diff --git a/src/web/alerts/www/src/alerts/userExecution.ts b/src/web/alerts/www/src/alerts/userExecution.ts index 86cba9e..7edd86b 100644 --- a/src/web/alerts/www/src/alerts/userExecution.ts +++ b/src/web/alerts/www/src/alerts/userExecution.ts @@ -10,7 +10,7 @@ export default async function execute( const parentDiv = document.createElement("div"); parentDiv.className = "userExecutionAlert"; parentDiv.innerHTML = ` - + ${alert.user} @@ -57,12 +57,12 @@ export default async function execute( const randomY = Math.floor(Math.random() * (window.innerHeight - 800)); const audio1 = new Audio( - "/alerts/public/explosions/factoriolargeexplosion1.ogg", + "/alerts/assets/explosions/factoriolargeexplosion1.ogg", ); const audio2 = new Audio( - "/alerts/public/explosions/factoriolargeexplosion1.ogg", + "/alerts/assets/explosions/factoriolargeexplosion1.ogg", ); - const audio3 = new Audio("/alerts/public/explosions/factorionuke.ogg"); + const audio3 = new Audio("/alerts/assets/explosions/factorionuke.ogg"); audio1.volume = volume; audio2.volume = volume; diff --git a/src/web/index.ts b/src/web/index.ts index 63513ac..0cd2472 100644 --- a/src/web/index.ts +++ b/src/web/index.ts @@ -26,10 +26,10 @@ export default Bun.serve({ "/chat/getEmotes": getExternalEmotes, "/alerts": alerts, - "/alerts/public/*": async (req) => { + "/alerts/assets/*": async (req) => { const url = new URL(req.url); - const path = url.pathname.slice("/alerts/public/".length); - const file = Bun.file(`${import.meta.dir}/alerts/www/public/${path}`); + const path = url.pathname.slice("/alerts/assets/".length); + const file = Bun.file(`${import.meta.dir}/alerts/www/assets/${path}`); if (!(await file.exists())) return new Response(`404: ${url.pathname} not found`, { status: 404,