Merge pull request #540 from Thesourtimes/master

General work on API

1 files changed, 5 insertions, 2 deletions

diff --git a/api/src/middlewares/TestClient.ts b/api/src/middlewares/TestClient.ts

index 6167d9fd..5c0b081b 100644
--- a/api/src/middlewares/TestClient.ts
+++ b/api/src/middlewares/TestClient.ts
@@ -84,12 +84,15 @@ export default function TestClient(app: Application) {
 		return res.send(buffer);
 	});
 	app.get("*", (req: Request, res: Response) => {
+		const { useTestClient } = Config.get().client;
 		res.set("Cache-Control", "public, max-age=" + 60 * 60 * 24);
 		res.set("content-type", "text/html");
 
-    if(req.url.startsWith("/api")) return;
-		if (req.url.startsWith("/invite")) return res.send(html.replace("9b2b7f0632acd0c5e781", "9f24f709a3de09b67c49"));
+		if(req.url.startsWith("/api") || req.url.startsWith("/__development")) return;
 
+		if(!useTestClient) return res.send("Test client is disabled on this instance. Use a stand-alone client to connect this instance.")
+		if (req.url.startsWith("/invite")) return res.send(html.replace("9b2b7f0632acd0c5e781", "9f24f709a3de09b67c49"));
+		
 		res.send(html);
 	});
 }
\ No newline at end of file