From d1c36afca70ad544b81b44a5ee19f14eba361f5e Mon Sep 17 00:00:00 2001 From: McMistrzYT <56406996+McMistrzYT@users.noreply.github.com> Date: Sun, 4 Feb 2024 23:56:27 +0100 Subject: [PATCH] fixed all bugs real 100% --- Server/Source/Routes/Downloads.ts | 5 ++--- Server/Source/Routes/Ratings.ts | 2 ++ package.json | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Server/Source/Routes/Downloads.ts b/Server/Source/Routes/Downloads.ts index 6f61f72..84e974f 100644 --- a/Server/Source/Routes/Downloads.ts +++ b/Server/Source/Routes/Downloads.ts @@ -8,7 +8,7 @@ import { UserPermissions } from "../Schemas/User"; const App = Router(); -App.get("/api/download/partypacker", (_, res) => res.redirect("https://cdn.discordapp.com/attachments/1202728144935583804/1203083689840607252/Partypacker_OT2.zip")) +App.get("/api/download/partypacker", (_, res) => res.redirect(`${FULL_SERVER_ROOT}/assets/Partypack-Launcher.zip`)) App.get("/song/download/:InternalID/:File", RequireAuthentication(), @@ -73,13 +73,12 @@ async (req, res) => { }); App.get("/:InternalID", -RequireAuthentication(), async (req, res, next) => { const SongData = await Song.findOne({ where: { ID: req.params.InternalID }, relations: { Author: true } }); if (!SongData) return next(); // trust me bro - if (SongData.IsDraft && (req.user!.PermissionLevel! < UserPermissions.VerifiedUser && SongData.Author.ID !== req.user!.ID)) + if (SongData.IsDraft && ((req.user ? req.user.PermissionLevel < UserPermissions.VerifiedUser : true) && SongData.Author.ID !== req.user!.ID)) return res.status(403).send("You cannot use this track, because it's a draft."); const BaseURL = `${FULL_SERVER_ROOT}/song/download/${SongData.ID}/`; diff --git a/Server/Source/Routes/Ratings.ts b/Server/Source/Routes/Ratings.ts index 8fe47ba..7ce7135 100644 --- a/Server/Source/Routes/Ratings.ts +++ b/Server/Source/Routes/Ratings.ts @@ -6,6 +6,8 @@ import j from "joi"; const App = Router(); +App.use((_, res) => res.send("disabled atm (sowwy)")); + App.get("/:InternalID", async (req, res) => { const SongData = await Song.findOne({ where: { ID: req.params.InternalID }, relations: { Ratings: true } }); if (!SongData) diff --git a/package.json b/package.json index cd33836..5819e58 100644 --- a/package.json +++ b/package.json @@ -8,15 +8,15 @@ "build:prod": "vite build", "build:stage": "vite build --mode staging", "win:create:prod": "mkdir \"./Out\" ; vite build ; move \"./dist\" \"./Out/dist\" ; cd \"Server\" ; tsc ; cd .. ; copy \"./Server/.env.prod\" \"./Out/.env\" ; copy \"./Server/package.json\" \"./Out/package.json\" ; copy \"./Server/package-lock.json\" \"./Out/package-lock.json\"", - "win:publish:prod": "npm run win:create:prod ; ssh partypack \"cd /home/PartypackProd && rm -rf ./Out\" ; scp -r \"./Out\" partypack:/home/PartypackProd ; ssh partypack \"cd /home/PartypackProd/Out && npm i && pm2 restart PartypackProd --update-env\" ; rmdir \"./Out\"", + "win:publish:prod": "mkdir \"./Out\" ; vite build ; move \"./dist\" \"./Out/dist\" ; cd \"Server\" ; tsc ; cd .. ; copy \"./Server/.env.prod\" \"./Out/.env\" ; copy \"./Server/package.json\" \"./Out/package.json\" ; copy \"./Server/package-lock.json\" \"./Out/package-lock.json\" ; ssh partypack \"cd /home/PartypackProd && rm -rf ./Out\" ; scp -r \"./Out\" partypack:/home/PartypackProd ; ssh partypack \"cd /home/PartypackProd/Out && npm i && pm2 restart PartypackProd --update-env\" ; rmdir \"./Out\"", "win:create:stage": "mkdir \"./Out\" ; vite build --mode staging ; move \"./dist\" \"./Out/dist\" ; cd \"Server\" ; tsc ; cd .. ; copy \"./Server/.env.staging\" \"./Out/.env\" ; copy \"./Server/package.json\" \"./Out/package.json\" ; copy \"./Server/package-lock.json\" \"./Out/package-lock.json\"", "win:publish:stage": "mkdir \"./Out\" ; vite build --mode staging ; move \"./dist\" \"./Out/dist\" ; cd \"Server\" ; tsc ; cd .. ; copy \"./Server/.env.staging\" \"./Out/.env\" ; copy \"./Server/package.json\" \"./Out/package.json\" ; copy \"./Server/package-lock.json\" \"./Out/package-lock.json\" ; ssh partypack \"cd /home/PartypackStage && rm -rf ./Out\" ; scp -r \"./Out\" partypack:/home/PartypackStage ; ssh partypack \"cd /home/PartypackStage/Out && npm i && pm2 restart PartypackStage --update-env\" ; rmdir \"./Out\"", "create:prod": "mkdir ./Out && npm run build:prod && mv ./dist ./Out/dist && cd Server && tsc && cd .. && cp ./Server/.env.prod ./Out/.env && cp ./Server/package.json ./Out && cp ./Server/package-lock.json ./Out", "publish:prod": "npm run create:prod && ssh partypack \"cd /home/PartypackProd; rm -rf ./Out\" && scp -r ./Out partypack:/home/PartypackProd && ssh partypack \"cd /home/PartypackProd/Out && npm i && pm2 restart PartypackProd --update-env\" && rm -rf ./Out", "create:stage": "mkdir ./Out && npm run build:stage && mv ./dist ./Out/dist && cd Server && tsc && cd .. && cp ./Server/.env.staging ./Out/.env && cp ./Server/package.json ./Out && cp ./Server/package-lock.json ./Out", "publish:stage": "npm run create:stage && ssh partypack \"cd /home/PartypackStage; rm -rf ./Out\" && scp -r ./Out partypack:/home/PartypackStage && ssh partypack \"cd /home/PartypackStage/Out && npm i && pm2 restart PartypackStage --update-env\" && rm -rf ./Out", - "backup:prod": "scp -r partypack:/home/PartypackProd/Out/Saved ./Backup/Prod/ && scp partypack:/home/PartypackProd/Out/Partypack-prod.db* ./Backup/Prod/", - "backup:stage": "scp -r partypack:/home/PartypackStage/Out/Saved ./Backup/Stage/ && scp partypack:/home/PartypackStage/Out/Partypack-stage.db* ./Backup/Stage/", + "backup:prod": "scp -r partypack:/home/PartypackProd/Saved ./Backup/Prod/ ; scp partypack:/home/PartypackProd/Saved/Partypack.db* ./Backup/Prod/", + "backup:stage": "scp -r partypack:/home/PartypackStage/Saved ./Backup/Stage/ ; scp partypack:/home/PartypackStage/Saved/Partypack-stage.db* ./Backup/Stage/", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "dev:all": "start cmd.exe /k \"cd ./Server && npm run dev:watch\" && vite"