From c4243d1f81f55a63af751ac96570577ab4da7799 Mon Sep 17 00:00:00 2001
From: fatchan <tom@69420.me>
Date: Sat, 13 Apr 2019 16:15:48 +0000
Subject: [PATCH] markdown fix and simpler login check/redirect

---
 helpers/isloggedin.js     | 7 +------
 helpers/markdown.js       | 8 ++++----
 models/forms/login.js     | 2 +-
 views/includes/navbar.pug | 6 ++++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/helpers/isloggedin.js b/helpers/isloggedin.js
index a444a9bd..69d540c1 100644
--- a/helpers/isloggedin.js
+++ b/helpers/isloggedin.js
@@ -4,10 +4,5 @@ module.exports = (req, res, next) => {
 	if (req.session.authenticated === true) {
 		return next();
 	}
-	const redirect = req.params.board;
-	if (redirect) {
-		res.redirect(`/login?redirect=${redirect}`);
-	} else {
-		res.redirect('/login');
-	}
+	res.redirect('/login');
 }
diff --git a/helpers/markdown.js b/helpers/markdown.js
index a0e100ce..ad436888 100644
--- a/helpers/markdown.js
+++ b/helpers/markdown.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const Posts = require(__dirname+'/../db-models/posts.js')
-	, quoteRegex = /^>>\d+$/gm
-	, greentextRegex = /^>[^>].+$/gm
-	, redtextRegex = /^<[^<].+$/gm
+	, quoteRegex = /^>>\d+/gm
+	, greentextRegex = /^>[^>].+/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
diff --git a/models/forms/login.js b/models/forms/login.js
index ce055232..fa5940e1 100644
--- a/models/forms/login.js
+++ b/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 || '/');
 
 	}
 
diff --git a/views/includes/navbar.pug b/views/includes/navbar.pug
index 7589d92d..ad2623ca 100644
--- a/views/includes/navbar.pug
+++ b/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