markdown fix and simpler login check/redirect

helpers/isloggedin.js

@@ -4,10 +4,5 @@ module.exports = (req, res, next) => {
 	if (req.session.authenticated === true) {
 		return next();
 	}
-	const redirect = req.params.board;
+	res.redirect('/login');
-	if (redirect) {
-		res.redirect(`/login?redirect=${redirect}`);
-	} else {
-		res.redirect('/login');
-	}
 }

helpers/markdown.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const Posts = require(__dirname+'/../db-models/posts.js')
-	, quoteRegex = /^>>\d+$/gm
+	, quoteRegex = /^>>\d+/gm
-	, greentextRegex = /^>[^>].+$/gm
+	, greentextRegex = /^>[^>].+/gm
-	, redtextRegex = /^<[^<].+$/gm
+	, redtextRegex = /^<[^<].+/gm
 	, boldRegex = /==.+==/gm
 	, italicRegex = /__.+__/gm
 	, linkRegex = /https?\:\/\/[^\s]+/g
@@ -43,7 +43,7 @@ module.exports = (board, thread, text) => {
 	//italic
 	text = text.replace(italicRegex, (match) => {
 		const italic = match.substring(2, match.length-2);
-		return `<italic>${italic}</em>`;
+		return `<em>${italic}</em>`;
 	});
 
 	//spoilers

models/forms/login.js

@@ -45,7 +45,7 @@ module.exports = async (req, res, next) => {
 		req.session.authenticated = true;
 
 		//successful login
-		return res.redirect(redirect ? `/${redirect}/manage` : '/');
+		return res.redirect(redirect || '/');
 
 	}
 

views/includes/navbar.pug

@@ -2,6 +2,8 @@ nav.navbar
 	a.nav-item(href='/') Home
 	if board
 		a.nav-item.right(href=`/${board._id}/manage`) Manage Board
-	a.nav-item.right(href='/logout') Logout
+		a.nav-item.right(href=`/login?redirect=/${board._id}/`) Login
+	else
+		a.nav-item.right(href='/login') Login
 	a.nav-item.right(href='/register') Register
-	a.nav-item.right(href='/login') Login
+	a.nav-item.right(href='/logout') Logout