From 51808c326f829ed82517bb94f18c3d3a973d51a2 Mon Sep 17 00:00:00 2001
From: Corban-Lee <corbz.jones@gmail.com>
Date: Tue, 27 May 2025 12:16:54 +0100
Subject: [PATCH] fix: irrelevant middleware being used on api endpoints

---
 src/app.ts                         |  6 ++----
 src/server/routers/guild.router.ts | 11 +++++++----
 src/server/routers/home.router.ts  |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app.ts b/src/app.ts
index e7414b6..5a394ea 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -9,8 +9,6 @@ import "@bot/bot";
 import prisma from "@server/prisma";
 import homeRouter from "@server/routers/home.router";
 import guildRouter from "@server/routers/guild.router";
-import { attachGuilds } from "@server/middleware/attachGuilds";
-import { guildTabHelper } from "@server/middleware/guildTabHelper";
 import { getLogger } from "./log";
 
 const logger = getLogger(__filename);
@@ -25,8 +23,8 @@ app.use(express.json());
 
 app.use("/public", express.static(path.resolve(__dirname, "client/public")));
 
-app.use("/guild", attachGuilds, guildTabHelper, guildRouter);
-app.use("/", attachGuilds, homeRouter);
+app.use("/guild", guildRouter);
+app.use("/", homeRouter);
 
 const HOST = process.env.HOST || "localhost";
 const PORT = process.env.PORT || 3000;
diff --git a/src/server/routers/guild.router.ts b/src/server/routers/guild.router.ts
index f5fe5b5..65ffe17 100644
--- a/src/server/routers/guild.router.ts
+++ b/src/server/routers/guild.router.ts
@@ -1,5 +1,8 @@
 import { Request, Response, Router } from "express";
 
+import { attachGuilds } from "@server/middleware/attachGuilds";
+import { guildTabHelper } from "@server/middleware/guildTabHelper";
+
 import feedController from "@server/controllers/guild/feed.controller";
 import filterController from "@server/controllers/guild/filter.controller";
 import styleController from "@server/controllers/guild/style.controller";
@@ -19,10 +22,10 @@ router.get("/:guildId", (request: Request, response: Response) => {
 
 // Web routes
 
-router.get("/:guildId/feeds", feedController.get);
-router.get("/:guildId/filters", filterController.get);
-router.get("/:guildId/styles", styleController.get);
-router.get("/:guildId/content", contentController.get);
+router.get("/:guildId/feeds", attachGuilds, guildTabHelper, feedController.get);
+router.get("/:guildId/filters", attachGuilds, guildTabHelper, filterController.get);
+router.get("/:guildId/styles", attachGuilds, guildTabHelper, styleController.get);
+router.get("/:guildId/content", attachGuilds, guildTabHelper, contentController.get);
 
 // API routes
 
diff --git a/src/server/routers/home.router.ts b/src/server/routers/home.router.ts
index b5a8304..99cc2e0 100644
--- a/src/server/routers/home.router.ts
+++ b/src/server/routers/home.router.ts
@@ -1,8 +1,9 @@
 import { Router } from "express";
+import { attachGuilds } from "@server/middleware/attachGuilds";
 import controller from "@server/controllers/home.controller";
 
 const router = Router();
 
-router.get("/", controller.get);
+router.get("/", attachGuilds, controller.get);
 
 export default router;
\ No newline at end of file