Check for bans and partially working num replies

.gitignore

@@ -2,4 +2,7 @@ node_modules/
 .idea/
 *.log.*
 uploads/
-package-lock.json
+dist/
+package-lock.json
+*~
+.DS_Store

middleware/checkBan.js

@@ -0,0 +1,15 @@
+const Ban = require(_base + 'models/ban');
+
+module.exports = function(req, res, next) {
+	Ban.findOne({ ip: req.connection.remoteAddress }, function(err, result) {
+	    if (err) {
+		next(err);
+	    }
+
+	    if (result) {
+		next(new Error('User is banned!'));
+	    }
+
+	    next();
+	});
+}

routes/create/reply.js

@@ -5,11 +5,12 @@ const path = 'uploads/';
 const multer = require('multer');
 const upload = multer({dest: './uploads/'});
 const striptags = require('striptags');
+const checkBan = require(_base + 'middleware/checkBan');
 
 module.exports = {
     '/create/reply': {
         methods: ['post'],
-        middleware: [upload.single("attachment")],
+        middleware: [upload.single("attachment"), checkBan],
         fn: function (req, res, next) {
             let allowedExt = ['png', 'jpg', 'jpeg', 'webm'];
             let threadId = req.body.threadId,

routes/create/thread.js

@@ -4,11 +4,12 @@ const path = 'uploads/';
 const multer = require('multer');
 const upload = multer({dest: './uploads/'});
 const striptags = require('striptags');
+const checkBan = require(_base + 'middleware/checkBan');
 
 module.exports = {
     '/create/thread': {
         methods: ['post'],
-        middleware: [upload.single("attachment")],
+        middleware: [upload.single("attachment"), checkBan],
         fn: function (req, res, next) {
             let allowedExt = ['png', 'jpg', 'jpeg', 'webm'];
             let name = req.body.name,

routes/delete/ban.js

@@ -1,15 +1,17 @@
-const Ban = require(_base + 'models/ban');
+const Ban = require(_base + 'models/ban'),
+      ensureAuthenticity = require(_base + 'middleware/ensureAuthenticity');
 
 module.exports = {
     '/delete/ban': {
         methods: ['delete'],
+	middleware: [ensureAuthenticity],
         fn: function(req, res, next) {
-            let _id = req.body._id;
-            Ban.findByIdAndRemove(_id, function(err, ban) {
+            let ip = req.body.ip;
+            Ban.findOneAndRemove({ ip: ip }, function(err, ban) {
               if(err) {
                 return next(err);
               }
-              res.json({result: ban});
+              res.json({ result: ban });
             });
         }
     }

routes/read/numReplies.js

@@ -0,0 +1,20 @@
+const Replies = require(_base + "models/reply");
+
+module.exports = {
+    '/read/numReplies': {
+	methods: ['get'],
+	fn: function(req, res, next) {
+	    let _id = req.query._id, //For thread
+		numReplies = 0;
+	    Replies.find({ threadId: _id }, function(err, threadResults) {
+		if(err) {
+		    return next(err);
+		} else {
+		    numReplies = threadResults.length;
+		    console.log(numReplies);
+		    res.json( { result: { numReplies: numReplies } } );
+		}
+	    });
+	}
+    }
+}

routes/read/thread.js

@@ -4,16 +4,15 @@ module.exports = {
 	'/read/thread': {
 		methods: ['get'],
 		fn: function(req, res, next) {
-			let _id = req.query._id;
-			//post id, name, content, pinned, time
-			console.log(_id);
-			Threads.findById(_id, function(err, result) {
-				if(err) {
-					return next(err);
-				} else {
-					res.json({ result: result });
-				}
-			});
+		    let _id = req.query._id;
+		    //post id, name, content, pinned, time
+		    Threads.findById(_id, function(err, result) {
+			if(err) {
+			    return next(err);
+			} else {
+			    res.json({ result: result });
+			}
+		    });
 		}
 	}
-};
+};

routes/read/threads.js

@@ -1,17 +1,32 @@
-const Threads = require(_base + 'models/thread');
+const Threads = require(_base + 'models/thread'),
+      Replies = require(_base + "models/reply");
 
 module.exports = {
-	'/read/threads': {
-		methods: ['get'],
-		fn: function(req, res, next) {
-			let letter = req.query.letter;
-			Threads.find({ boardId: letter }, function(err, results) {
-				if(err) {
-					return next(err);
-				} else {
-					res.json({ result: results });
-				}
+    '/read/threads': {
+	methods: ['get'],
+	fn: function(req, res, next) {
+	    let letter = req.query.letter,
+		numReplies = 0;
+	    Threads.find({ boardId: letter }, function(err, results) {
+		if(err) {
+		    return next(err);
+		} else {
+		    for(let i=0; i<results.length; i++) {
+			numReplies = 0;
+			Replies.find({ threadId: results[i]._id }, function(err, threadResults) {
+			    if(err) {
+				return next(err);
+			    } else {
+				numReplies = threadResults.length;
+				console.log(numReplies);
+			    }
 			});
+			console.log(numReplies);
+			results[i].numReplies = numReplies;
+		    }
+		    res.json({ result: results });
 		}
+	    });
 	}
-};
+    }
+};

src/assets/js/api.js

@@ -15,7 +15,8 @@ axios.defaults.withCredentials = true;
         bansUrl: 'read/bans',
         isAuthUrl: 'read/isAuth',
         banUrl: 'create/ban',
-        deleteReplyUrl: 'delete/reply'
+        deleteReplyUrl: 'delete/reply',
+	numRepliesUrl: 'read/numReplies'
     };
     function url(api) {
         return root + urls[api];
@@ -96,4 +97,8 @@ axios.defaults.withCredentials = true;
     _api.deleteReply = function (id, fn) {
         post(url('deleteReplyUrl'), { _id: id }, fn);
     };
+
+    _api.numReplies = function (id, fn) {
+	get(url('numRepliesUrl'), { _id: _id }, fn);
+    }
 })();

src/components/Catalog.vue

@@ -31,7 +31,7 @@
 		   </video>
 		</a>
                 <div class="meta">
-                    R: <b>?</b>
+                    R: <b>{{ thread.numReplies }}</b>
                 </div>
                 <div class="teaser">
                     <a :href="'/' + $route.params.board + '/thread/' + thread._id"><b>{{ thread.title }}</b></a> <div v-html="thread.content">{{ thread.content }}</div>
@@ -163,12 +163,14 @@
             vm.updateThreads(vm.$route.params.board);
             vm.getBoardInfo(vm.$route.params.board);
             vm.compileBoardList();
+	    vm.getThreadsNumReplies();
         },
         beforeRouteUpdate (to, from, next) {
             let vm = this;
             vm.updateThreads(to.params.board);
             vm.getBoardInfo(to.params.board);
             vm.compileBoardList();
+	    vm.getThreadsNumReplies();
             next();
         },
         methods: {
@@ -213,7 +215,20 @@
                         console.log(vm.boardList);
                     }
                 });
-            }
+            },
+	    getThreadsNumReplies() {
+	        let vm = this;
+		for(let i=0; i<vm.threads.length; i++) {
+		    _api.numReplies(vm.threads[i]._id, function (err, res) {
+		        if (err) {
+		            console.log(err);
+		        }
+		        else if(res.result) {
+			     vm.threads[i].numReplies = res.result.numReplies;
+		        }
+		    });
+		}
+	    }
         }
     }
 </script>