notherbase-fs 1.4.1 → 1.4.3

package/controllers/explorer.js

@@ -9,27 +9,9 @@ const explorer = async function explorer(worldPath, voidPath) {
         try {
             let currentAreaRoute = `${req.params.region}/${req.params.area}/${req.params.poi}`;
             let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
-
-            if (await db.poi.exists({ route: currentRoute, type: "global" }) === false) {
-                await db.poi.create({
-                    route: currentRoute,
-                    name: req.params.detail,
-                    type: "global",
-                    data: {}
-                });
-            }
-
-            if (await db.poi.exists({ route: currentRoute, user: req.session.currentUser }) === false) {
-                await db.poi.create({
-                    route: currentRoute,
-                    name: req.params.detail,
-                    type: "user",
-                    user: req.session.currentUser,
-                    data: {}
-                });
-            }
+            const foundUser = await db.user.findById(req.session.currentUser);
     
-            let scriptResult = await require(`${worldPath}/${currentAreaRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, req.session.currentUser, req.body);
+            let scriptResult = await require(`${worldPath}/${currentAreaRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, foundUser, req.body);
             res.send({ scriptResult: scriptResult });
         }
         catch(err) {
@@ -84,7 +66,6 @@ const explorer = async function explorer(worldPath, voidPath) {
 
     router.post(`/commit`, async function(req, res) {
         try {
-            console.log(req.body);
             await db.detail.updateOne({ 
                 route: req.body.route,
                 service: req.body.service,
@@ -137,7 +118,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                     user: null,
                     inventory: null,
                     main: `${voidPath}/index`,
-                    route: `/void/index`
+                    route: `/void`
                 });
             }
         }
@@ -163,7 +144,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                     inventory: foundInventory,
                     query: req.query,
                     dir: worldPath,
-                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}/index`
+                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}`
                 }
         
                 await res.render(`explorer`, context);
@@ -175,7 +156,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                     user: null,
                     inventory: null,
                     main: `${voidPath}/index`,
-                    route: `/void/index`
+                    route: `/void`
                 });
             }
         }
@@ -198,7 +179,7 @@ const explorer = async function explorer(worldPath, voidPath) {
             user: null,
             inventory: null,
             main: `${voidPath}/index`,
-            route: `/void/index`
+            route: `/void`
         });
     });
     

package/controllers/pages.js

@@ -10,7 +10,9 @@ module.exports = function name(path)
 
     router.post(`/serve/:script`, async function(req, res) {
         try {
-            let scriptResult = await require(`${path}/scripts/${req.params.script}.js`)(db, req.session.currentUser, req.body);
+            const foundUser = await db.user.findById(req.session.currentUser);
+
+            let scriptResult = await require(`${path}/scripts/${req.params.script}.js`)(db, foundUser, req.body);
             res.send(scriptResult);
         }
         catch(err) {

package/controllers/the-front.js

@@ -5,21 +5,8 @@ const front = async function front(dir) {
     let router = require("express").Router();
     
     router.post(`/serve/:script`, async function(req, res) {
-        try {
-            let currentRoute = `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
-
-            let foundPoi = await db.poi.findOne({ route: currentRoute, type: "global" });
-
-            if (foundPoi === null) {
-                db.poi.create({
-                    route: currentRoute,
-                    name: req.params.detail,
-                    type: "global",
-                    global: {}
-                });
-            }
-    
-            let scriptResult = await require(`${worldPath}/${currentRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, req.session.currentUser, req.body);
+        try {  
+            let scriptResult = await require(`${worldPath}/${currentRoute}/server-scripts/${req.params.script}.js`)(db, "/the-front", req.session.currentUser, req.body);
             res.send(scriptResult);
         }
         catch(err) {
@@ -39,7 +26,6 @@ const front = async function front(dir) {
                 siteTitle: `NotherBase - ${req.params.detail}`,
                 user: foundUser,
                 main: main,
-                pov: req.query.pov,
                 inventory: foundInventory,
                 query: req.query,
                 dir: dir,
@@ -65,11 +51,10 @@ const front = async function front(dir) {
                 siteTitle: `NotherBase - The Front`,
                 user: foundUser,
                 main: main,
-                pov: req.query.pov,
                 inventory: foundInventory,
                 query: req.query,
                 dir: dir,
-                route: `/the-front/${req.params.detail}`
+                route: `/the-front`
             }
     
             await res.render(`explorer`, context);

package/models/item.js

@@ -4,7 +4,10 @@ const mongoose = require("mongoose");
 const item = new mongoose.Schema({
 	name: String,
 	shortDescription: String,
-	fullDescription: String
+	fullDescription: String,
+	icon: String,
+	tags: [ String ],
+	image: String
 });
 
 // This tells Mongoose to use the exampleSchema to access the examples collection

package/models/send-mail.js

@@ -21,6 +21,28 @@ const passwordReset = async (toEmail, resetToken) => {
     });
 };
 
+const send = async (toEmail, subject, html) => {
+    var transporter = nodemailer.createTransport({
+        service: 'gmail',
+        auth: {
+          user: process.env.NOREPLY,
+          pass: process.env.NOREPLYPW
+        }
+    });
+      
+    var mailOptions = {
+        from: process.env.NOREPLY,
+        to: toEmail,
+        subject: subject,
+        html: html
+    };
+    
+    return await transporter.sendMail(mailOptions, function(error, info){
+        if (error) console.log(error);
+    });
+}
+
 module.exports = {
-    passwordReset: passwordReset
+    passwordReset: passwordReset,
+    send: send
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "notherbase-fs.js",
   "scripts": {

package/test/coast/tall-beach/nono-cove/server-scripts/emailTime.js

@@ -0,0 +1,9 @@
+module.exports = async function addToTimer(db, route, user, params) {
+    try {
+        return await db.sendMail.send(params.toEmail, params.subject, params.html);
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/coast/tall-beach/nono-cove/views/index.ejs

@@ -21,6 +21,7 @@
 
 <button onclick="setTime()">Add</button>
 <p id="timer">0:00</p>
+<button onclick="emailTime()">email</button>
 
 <hr>
 
@@ -134,5 +135,15 @@
         $("#timer").text(Math.floor((Date.now() - time) / 1000));
     }
 
+    let emailTime = async () => {
+        $.post("/coast/tall-beach/nono-cove/index/serve/emailTime", {
+            toEmail: "wyattsushi@gmail.com",
+            subject: "New Time Update!",
+            html: `New Time: ${time}`
+        }, (res) => {
+            console.log(res);
+        })
+    }
+
     setInterval(updateTime, 1000);
 </script>

package/views/more.ejs

@@ -12,7 +12,7 @@
     $("#send").on("click", (e) => {
         $.post("/contact", 
         {
-            location: "Test",
+            location: currentRoute,
             content: $("#content").val(),
         }, 
         function () {

package/test/coast/tall-beach/nono-cove/server-scripts/addToTimer.js

@@ -1,31 +0,0 @@
-module.exports = async function addToTimer(db, route, user, params) {
-    try {
-        let poi = await db.poi.findOne({ route: route, user: user });
-
-        let now = Date.now();
-
-        if (!poi.data) poi.data = {
-            timer: 0,
-            lastTime: now
-        }
-        else {
-            if (!poi.data.lastTime) poi.data.lastTime = now;
-            if (!poi.data.timer) poi.data.timer = 0;
-        }
-
-        let difference = (now - poi.data.lastTime) / 1000;
-        poi.data.timer -= difference;
-        if (poi.data.timer < 0) poi.data.timer = 0;
-
-        poi.data.timer = poi.data.timer + 10;
-        poi.data.lastTime = Date.now();
-
-        poi.markModified("data");
-        await poi.save();
-        return poi.data.timer;
-    } 
-    catch(err) {
-        console.log(err);
-        return false;
-    }
-}