Merge remote-tracking branch 'origin/bot-editing'

Author: Toni Isotalo

.gitignore

@@ -2,4 +2,5 @@ node_modules/
 cypress.env.json
 */cypress/videos/
 */cypress/downloads/
-*/cypress/screenshots/
+*/cypress/screenshots/
+data/bot_pictures/

app.js

@@ -4,6 +4,7 @@ const http = require("http");
 const express = require("express")
 const app = express()
 const dataLimit = "50mb"
+const constants = require("./modules/constants")
 app.use(express.json({limit: dataLimit}))
 app.use(express.urlencoded({limit: dataLimit}))
 
@@ -19,6 +20,9 @@ app.get("/favicon.ico", function(req, res) {
 })
 app.use("", indexRouters);
 
+app.get(constants.botPictureAccessPath + "/:img", (req, res) => {
+    res.sendFile(constants.botPicturesPath + "/" + req.params["img"])
+})
 app.get("/static/*", (req, res) => {
     res.sendFile(__dirname + "/src/" + req.originalUrl)
 })

modules/api.js

@@ -1,5 +1,6 @@
 const db = require("./db")
 const constants = require("./constants");
+const fs = require("fs")
 let getBot = (id, callback, error) => {
     db.query("SELECT * FROM bots WHERE id='" + id + "'", (result) => {
         callback(result[0])
@@ -27,17 +28,50 @@ let saveBot = (owner, name, data, callback, error) => {
 function buildUpdateParams(dict) {
     let sql = "";
     for(key in dict) {
+        if(key == "public" && dict[key] == "true") {
+            dict[key] = 1
+        }
+        if(key == "public" && dict[key] == "false") {
+            dict[key] = 0
+        }
         sql += key + "='" + dict[key] + "',";
     }
     return sql.substring(0, sql.length - 1);;
 }
 
 let updateBot = (id, data, callback, error=() => {}) => {
-    const sql = buildUpdateParams(data);
-    db.query("UPDATE bots SET " + sql + " WHERE id=" + id, (result) => {
+    function insertSql() {
+        const sql = buildUpdateParams(data);
+        db.query("UPDATE bots SET " + sql + " WHERE id=" + id, (result) => {
+            callback(result);
+        }, (err) => {
+            error(err);
+        })
+    }
+
+    if("picture" in data && typeof data["picture"] == "object" && typeof data["picture"]["data"] == "object") {
+        //Image
+        let imageType = data["picture"]["mimetype"].split("/")[1];
+        const imagePath = constants.botPicturesPath + "/" + id + "." + imageType
+        fs.writeFile(imagePath, data["picture"]["data"], "binary", (err) => {
+            if(err) {
+                error(err);
+                return
+            } else {
+                data["picture"] = constants.botPictureAccessPath + "/" + id + "." + imageType;
+                insertSql();
+            }
+        });
+    } else {
+        insertSql();
+    }
+}
+
+let deleteBot = (id, callback, error=()=>{}) => {
+    db.query("DELETE FROM bots WHERE id=" + id, (result) => {
         callback(result);
     }, (err) => {
-        error(err);
+        error(err)
     })
 }
 
@@ -61,4 +95,5 @@ exports.getMethods = getMethods
 exports.getBot = getBot;
 exports.saveBot = saveBot;
 exports.updateBot = updateBot;
+exports.deleteBot = deleteBot;
 exports.getBotsByUserId = getBotsByUserId

modules/constants.js

@@ -1 +1,4 @@
-module.exports.defaultAvatar = "/static/images/avatar.jpg"
+
+module.exports.defaultAvatar = "/static/images/avatar.jpg"
+module.exports.botPicturesPath = require("./parentUrl") + "/data/bot_pictures"
+module.exports.botPictureAccessPath = "/static/images/bots"

modules/routers/apiRouter.js

@@ -6,7 +6,8 @@ const api = require("../api");
 const responses = require("../responses");
 const auth = require("../auth");
 const common = require("../common");
-
+const fileUpload = require('express-fileupload')
+const constants = require("../constants");
 router.get("/bot/:id", (req, res) => {
     //Get bot by id
     const id = req.params.id;
@@ -85,8 +86,12 @@ router.post("/bot", function(req, res) {
         responses.internal_server_error(res);
     })
 })
-
+router.use(fileUpload());
 router.put("/bot/:id", function(req, res) {
+    for(key in req.files) {
+        //Add files to the body for easier processing
+        req.body[key] = req.files[key];
+    }
     const id = req.params.id;
     db.getCols("bots", (result) => {
         for(key in req.body) {
@@ -106,13 +111,20 @@ router.put("/bot/:id", function(req, res) {
                 return;
             }
             api.updateBot(id, req.body, (re) => {
-                responses.ok(res);
+                responses.ok(res, req.body);
                 return;
             }, (err) => {
                 responses.internal_server_error(res);
             })
         })
     })
 })
+router.delete("/bot/:id", function(req, res) {
+    api.deleteBot(req.params.id, function(result) {
+        responses.ok(res)
+    }, (err) => {
+        responses.internal_server_error(res);
+    })
+})
 
 module.exports = router