Merge pull request #106 from blobs-io/clans

y21 · web-flow · commit 81be0c953bf9 · 2020-01-16T19:20:36.000+01:00
feat(backend): clans
diff --git a/backend/api/APIController.ts b/backend/api/APIController.ts
@@ -9,8 +9,9 @@ import Jimp = require("jimp");
 import Captcha, {CAPTCHA_LIMIT} from "../structures/Captcha";
 import * as DateFormatter from "../utils/DateFormatter";
 import EliminationRoom from "../structures/EliminationRoom";
-import { Role } from "../structures/Player";
+import Player, { Role } from "../structures/Player";
 import ClanController from "../clans/ClanController";
+import Clan, {ClanData} from "../structures/Clan";
 
 // Used for listening to requests that are related to the API
 export default class APIController {
@@ -39,9 +40,9 @@ export default class APIController {
             "SELECT members, cr, name, joinable, tag FROM clans ORDER BY cr DESC LIMIT 10"
             : "SELECT members, cr, leader, joinable, tag FROM clans WHERE name = ?"
             this.base.db[req.params.name !== "list" ? "get" : "all"](query, req.params.name !== "list" ? req.params.name : undefined)
-                .then((v: Array<any> | any) => {
+                .then((v: Array<ClanData> | ClanData) => {
                     if (Array.isArray(v)) {
-                        res.json(v.map((r: any) => ({
+                        res.json(v.map((r: ClanData) => ({
                             ...r,
                             members: JSON.parse(r.members)
                         })));
@@ -72,6 +73,7 @@ export default class APIController {
         // Joins a specific clan by its name
         // Returns the joined clan
         this.app.post("/api/clans/:name/join", async (req: express.Request, res: express.Response) => {
+            // todo: this fails if :name doesn't exist
             const { session } = req.headers;
             if (!session) return res.status(400).json({
                 message: "No session header provided"
@@ -82,26 +84,15 @@ export default class APIController {
                 message: "Invalid session ID provided"
             });
 
-            const clan: any = await this.base.db.get("SELECT members, cr, leader, joinable FROM clans WHERE name = ?", req.params.name);
+            const clan: ClanData | undefined = await this.base.db.get("SELECT name, members, cr, leader, joinable FROM clans WHERE name = ?", req.params.name);
             if (!clan) return res.status(404).json({
                 message: "Clan not found"
             });
-            if (!clan.joinable) return res.status(403).json({
-                message: "This clan is not joinable"
-            });
-
-            const members: Array<any> = JSON.parse(clan.members);
-            if (members.includes(requester.username)) return res.status(400).json({
-                message: "Requested user is already in this clan"
-            });
-            if (members.length >= ClanController.MemberLimit) return res.status(403).json({
-                message: `Clan already has ${ClanController.MemberLimit} members`
-            });
-
-            members.push(requester.username);
-            await this.base.db.run("UPDATE accounts SET clan = ? WHERE username = ?", req.params.name, requester.username);
-            await this.base.db.run("UPDATE clans SET members = ? WHERE name = ?", JSON.stringify(members), req.params.name);
-            res.json(clan);
+            Player.joinClan(clan, requester.username, this.base)
+                .then(v => res.json(v))
+                .catch(e => res.status(500).json({
+                    message: e.message
+                }));
         });
 
         // POST Endpoint: /api/clans/:name/leave
@@ -118,31 +109,90 @@ export default class APIController {
                 message: "Invalid session ID provided"
             });
 
-            const clan: any = await this.base.db.get("SELECT members FROM clans WHERE name = ?", req.params.name);
+            const clan: ClanData | undefined = await this.base.db.get("SELECT name, members FROM clans WHERE name = ?", req.params.name);
             if (!clan) return res.status(404).json({
                 message: "Clan not found"
             });
 
-            const members: Array<any> = JSON.parse(clan.members);
+            const members: Array<string> = JSON.parse(clan.members);
             if (!members.includes(requester.username)) return res.status(400).json({
                 message: "Requested user is not a member of this clan"
             });
-            members.splice(members.indexOf(requester.username), 1);
-            await this.base.db.run("UPDATE accounts SET clan = ? WHERE username = ?", null, requester.username);
-            await this.base.db.run("UPDATE clans SET members = ? WHERE name = ?", JSON.stringify(members), req.params.name);
-            res.json({ members });
+
+            Player.leaveClan(clan, requester.username, this.base).then(v => res.json(v));
         });
 
-        // (TODO) DELETE Endpoint: /api/clans/:name
+        // DELETE Endpoint: /api/clans/:name
         // Deletes a clan by its name (a clan can only be deleted by its leader)
-        this.app.delete("/api/clans/:name", (req: express.Request, res: express.Response) => {
+        this.app.delete("/api/clans/:name", async (req: express.Request, res: express.Response) => {
+            const { session } = req.headers;
+            if (!session) return res.status(400).json({
+                message: "No session header provided"
+            });
+
+            const requester: Socket | undefined = this.base.sockets.find((v: Socket) => v.sessionid === session);
+            if (!requester) return res.status(400).json({
+                message: "Invalid session ID provided"
+            });
+
+            const clan: ClanData | undefined = await this.base.db.get("SELECT name, leader FROM clans WHERE name = ?", req.params.name);
+            if (!clan) return res.status(404).json({
+                message: "Clan not found"
+            });
+            if (clan.leader !== requester.username && requester.role !== Role.ADMIN) return res.status(403).json({
+                message: "Only clean leader and administrators can delete this clan"
+            });
 
+            
+            await Clan.delete(clan, this.base);
+            res.json(clan);
         });
 
-        // (TODO) POST Endpoint: /api/clans/:name
+        // POST Endpoint: /api/clans/:name
         // Creates a new clan
-        this.app.post("/api/clans/:name", (req: express.Request, res: express.Response) => {
+        this.app.post("/api/clans/:name", async (req: express.Request, res: express.Response) => {
+            const { session, description } = req.headers;
+            if (!session) return res.status(400).json({
+                message: "No session header provided"
+            });
+            if (!description || typeof description !== "string" || description.length >= 1024) return res.status(400).json({
+                message: "Invalid description length"
+            });
+
+            const requester: Socket | undefined = this.base.sockets.find((v: Socket) => v.sessionid === session);
+            if (!requester) return res.status(400).json({
+                message: "Invalid session ID provided"
+            });
 
+            const clan: ClanData | undefined = await this.base.db.get("SELECT 1 FROM clans WHERE name = ?", req.params.name);
+            if (clan) return res.status(400).json({
+                message: "Clan already exists"
+            });
+
+            const { clan: userClan } = await this.base.db.get("SELECT clan FROM accounts WHERE username = ?", requester.username);
+            if (userClan) return res.status(400).json({
+                message: "Requested user is already in a clan"
+            });
+
+            const newClan: Clan = new Clan({
+                cr: 0,
+                description,
+                joinable: 1,
+                leader: requester.username,
+                members: JSON.stringify([requester.username]),
+                name: req.params.name,
+                tag: req.params.name.substr(0, 4)
+            });
+            
+            await this.base.db.run("INSERT INTO clans VALUES (?, ?, 0, ?, ?, 1, ?)",
+                newClan.name, // clan name
+                newClan.leader, // clan leader
+                JSON.stringify(newClan.members), // members
+                newClan.description, // clan description
+                newClan.tag // clan tag
+            );
+            await this.base.db.run("UPDATE accounts SET clan = ? WHERE username = ?", newClan.name, requester.username);
+            res.json(newClan);
         });
         
         // GET Endpoint: /api/executeSQL/:method
diff --git a/backend/clans/ClanController.ts b/backend/clans/ClanController.ts
@@ -1,7 +1,7 @@
 // Imports
 import * as express from "express";
 import { readFileSync } from "fs";
-import Clan from "../structures/Clan";
+import { ClanData } from "../structures/Clan";
 
 // Used for listening to requests that are related to clans
 export default class ClanController {
@@ -25,25 +25,23 @@ export default class ClanController {
         // Returns the clans page (a list of some existing clans)
         this.app.get("/clans/", (req: express.Request, res: express.Response) => {
             res.send(
-                readFileSync(__dirname + "/index_anon_templ.html", "utf8")
+                readFileSync("./public/clans/index.html", "utf8")
             );
         });
 
         // GET /clans/view/:clan
         // Retrieve information about a specific clan
         this.app.get("/clans/view/:clan", async (req: express.Request, res: express.Response) => {
             if (Array.isArray(req.params)) return;
-            if (!req.params.clan) return res.send("Please specify a clan");
-            const clan: Clan | undefined = await this.db.get("SELECT * FROM clans WHERE name=?", req.params.clan);
-            if (!clan) return res.send("Clan was not found");
+            if (!req.params.clan) return res.send(
+                readFileSync("./public/errors/404.html", "utf8")
+            );
+            const clan: ClanData | undefined = await this.db.get("SELECT * FROM clans WHERE name=?", req.params.clan);
+            if (!clan) return res.send(
+                readFileSync("./public/errors/404.html", "utf8")
+            );
             res.send(
-                readFileSync(__dirname + "/clan_view_anon_templ.html", "utf8")
-                    .replace(/{leader}/g, clan.leader)
-                    .replace(/{cr}/g, clan.cr.toString())
-                    .replace(/{members}/g, clan.members.split(",").join(", ").slice(1, -1))
-                    .replace(/{description}/g, (clan.description || "-")
-                        .replace(/</g, "&lt;")
-                        .replace(/>/g, "&gt;"))
+                readFileSync("./public/clans/clan.html", "utf8")
             );
         });
     }
diff --git a/backend/structures/Base.ts b/backend/structures/Base.ts
@@ -197,6 +197,7 @@ export default class Base {
         const { app } = this.server;
         // For accessing POST body
         app.use(bodyParser.urlencoded({ extended: true }));
+        app.use(bodyParser.json());
 
         // Assets / JS / CSS
         app.use("/assets", express.static("./public/assets"));
diff --git a/backend/structures/Clan.ts b/backend/structures/Clan.ts
@@ -1,19 +1,48 @@
+import Base from "./Base";
+
+// Clan structure in database
+export interface ClanData {
+    name: string;
+    leader: string;
+    cr: number;
+    members: string;
+    description: string;
+    joinable: number;
+    tag: string;
+}
+
 // Used to represent a clan
 export default class Clan {
+    // The name of this clan
+    public name: string;
     // The leader of this clan
     public leader: string;
     // The rating of this clan (signed)
     public cr: number;
     // Raw string of all members (split by , to get an array)
-    public members: string;
+    public members: Array<string>;
     // The clan description
     public description: string;
+    // Whether this clan is joinable or not
+    public joinable: boolean;
+    // The tag of this clan (1-4 characteres)
+    public tag: string;
+
+    constructor(data: ClanData) {
+        this.cr = data.cr;
+        this.description = data.description;
+        this.joinable = typeof data.joinable === "number" ? Boolean(data.joinable) : data.joinable;
+        this.leader = data.leader;
+        this.members = JSON.parse(data.members);
+        this.name = data.name;
+        this.tag = data.tag;
+    }
 
-    constructor(leader: string, cr: number, members: string, description: string) {
-        // Store local variables
-        this.leader = leader;
-        this.cr = cr;
-        this.members = members;
-        this.description = description;
+    public static delete(data: ClanData | string, base: Base): Promise<Array<any>> {
+        const target: string = typeof data !== "string" ? data.name : data;
+        return Promise.all([
+            base.db.run("DELETE FROM clans WHERE name = ?", target),
+            base.db.run("UPDATE accounts SET clan = ? WHERE clan = ?", null, target)
+        ]);
     }
 }
diff --git a/backend/structures/Player.ts b/backend/structures/Player.ts
@@ -5,6 +5,8 @@ import AntiCheat from "./AntiCheat";
 import { wsSocket } from "./Socket";
 import * as EliminationRoom from "./EliminationRoom";
 import LevelSystem from "../utils/LevelSystem";
+import Clan, { ClanData } from "./Clan";
+import ClanController from "../clans/ClanController";
 
 export enum Role {
     GUEST = -1,
@@ -181,4 +183,33 @@ export default class Player {
                 this.base.db.run(query, coins, xp, this.owner);
         }
     }
+
+    public static async joinClan(clan: ClanData, player: Player | String, base: Base): Promise<ClanData> {
+        const targetPlayer = player instanceof Player ? player.owner : player,
+              parsedMembers = JSON.parse(clan.members);
+
+        if (!clan.joinable) throw new Error("This clan is not joinable");
+        if (parsedMembers.includes(targetPlayer)) throw new Error("Requested user is already in this clan");
+        if (parsedMembers.length >= ClanController.MemberLimit) throw new Error("Clan is full");
+        if (await base.db.get("SELECT clan FROM accounts WHERE clan = ?", clan.name)) throw new Error("Requested user is already in another clan");
+
+        parsedMembers.push(targetPlayer);
+        await base.db.run("UPDATE accounts SET clan = ? WHERE username = ?", clan.name, targetPlayer);
+        await base.db.run("UPDATE clans SET members = ? WHERE name = ?", JSON.stringify(parsedMembers), clan.name);
+        return clan;
+    }
+
+    public static async leaveClan(clan: ClanData, player: Player | string, base: Base): Promise<ClanData> {
+        const targetPlayer = player instanceof Player ? player.owner : player,
+              parsedMembers = JSON.parse(clan.members);
+
+        parsedMembers.splice(parsedMembers.indexOf(targetPlayer), 1);
+        await base.db.run("UPDATE accounts SET clan = ? WHERE username = ?", null, targetPlayer);
+        if (parsedMembers.length === 0) {
+            await base.db.run("DELETE FROM clans WHERE name = ?", clan.name);
+        } else {
+            await base.db.run("UPDATE clans SET members = ? WHERE name = ?", JSON.stringify(parsedMembers), clan.name);
+        }
+        return clan;
+    }
 }
diff --git a/public/clans/clan.html b/public/clans/clan.html
@@ -96,18 +96,16 @@
 			<div id="warning">
 				This clan is private and you may only join by using an invite code. Please ask the clan leader for a code if you want to join.
 			</div>
-			<h2>Clan Overview - sadcats</h2>
-			Leader: {leader}<br/>
-			Rating: {cr} CR<br />
-			Members: {members}
+			<h2>Clan Overview - </h2>
+			Leader: <br/>
+			Rating: 0 CR<br />
+			Members: 
 			<div class="horizontal-line"></div>
-			<u>Description:</u> {description}
+			<u>Description:</u>
 		</div>
 		</div>
 		<footer>
 			<span class="copyright-note">&copy; 2018-2019 blobs</span>
 		</footer>
     </body>
-    <script src="http://instantclick.io/v3.1.0/instantclick.min.js" data-no-instant></script>
-	<script data-no-instant>InstantClick.init();</script>
 </html>
diff --git a/public/clans/index.html b/public/clans/index.html
@@ -93,32 +93,10 @@
             <a href="/clans/" style="text-decoration: none; color: white;"><img src="https://cdn.discordapp.com/emojis/458326620076507136.png?v=1" align="center" width="50" height="50"/>&nbsp;&nbsp;&nbsp;<h2 class="heading">Clans</h2></a>
         </header>
 		<div id="top-clans">
-		<h2 class="heading-blue">🥇 Top Clans</h2>
+        <h2 class="heading-blue">This page is under construction</h2>
 		</div>
 		<footer>
 			<span class="copyright-note">&copy; 2018-2019 blobs-game</span>
 		</footer>
-	<script>
-	(() => {
-		const xhr = new XMLHttpRequest();
-		xhr.open("GET", "/api/clans/list", true);
-		xhr.onload = () => {
-			if (xhr.readyState === 4) {
-				if (xhr.status === 200) {
-					const clans = JSON.parse(xhr.responseText);
-					for(let i=0; i < clans.length; ++i) {
-						const clanDiv = document.createElement("div");
-						clanDiv.className = "clan-entry";
-						clanDiv.innerHTML = `<span class="clan-name">${clans[i].name.replace(/</g, "&lt;")}</span><br/><span class="clan-rating">${clans[i].members.length} members, ${clans[i].cr} cr</span><a href="clans/view/${clans[i].name}" class="view-clan">View</a>`;
-						document.getElementById("top-clans").appendChild(clanDiv);
-					}
-				}
-			}
-		};
-		xhr.send(null);
-	})();
-	</script>
     </body>
-    <script src="http://instantclick.io/v3.1.0/instantclick.min.js" data-no-instant></script>
-	<script data-no-instant>InstantClick.init();</script>
 </html>
