basic markdown green/redtext and quotes

5 years ago · 3700769204
parent 86c2841d4e
commit 3700769204
7 changed files with 272 additions and 9 deletions
--- a/controllers/api.js
+++ b/controllers/api.js
@ -12,7 +12,6 @@ const express  = require('express')
 	, getCatalog = require(__dirname+'/../models/api/get-catalog.js')
 	, getBoards = require(__dirname+'/../models/api/get-boards.js');

-/*
 (async () => {
 	await Boards.deleteIncrement('pol');
 	await Boards.deleteIncrement('b');
@ -31,7 +30,7 @@ const express  = require('express')
 		description: 'post anything here',
 	})
 })();
-*/
+

 // make new post
 router.post('/board/:board', Boards.exists, (req, res, next) => {
--- a/helpers/markdown.js
+++ b/helpers/markdown.js
@ -0,0 +1,38 @@
+'use strict';
+
+const Posts = require(__dirname+'/../db-models/posts.js')
+	, quoteRegex = /^>>\d+/g
+	, greentextRegex = /^>[^>].+/g
+	, redtextRegex = /^<[^<].+/g;
+
+module.exports = (board, thread, text) => {
+
+	const lines = text.split('\n')
+
+	for(let j = 0; j < lines.length; j++) {
+		//replace quotes
+		const quote = lines[j].match(quoteRegex);
+		if (quote) {
+			const quotenum = quote[0].substring(2);
+			lines[j] = lines[j].replace(quote[0], `<a class='quote' href='/${board}/thread/${thread}/${quote}#${quote}'>&gt;&gt;${quotenum}</a>`);
+			continue;
+		}
+		//replace greentexts
+		const greentext = lines[j].match(greentextRegex);
+		if (greentext) {
+			const green = greentext[0].substring(1);
+			lines[j] = lines[j].replace(greentext[0], `<span class='greentext'>&gt;${green}</span>`);
+			continue;
+		}
+		//replace redtexts
+		const redtext = lines[j].match(redtextRegex);
+		if (redtext) {
+			const red = redtext[0].substring(1);
+			lines[j] = lines[j].replace(redtext[0], `<span class='redtext'>&lt;${red}</span>`);
+			continue;
+		}
+	}
+
+	return lines.join('\n');
+
+}
--- a/models/api/make-post.js
+++ b/models/api/make-post.js
@ -8,6 +8,15 @@ const uuidv4 = require('uuid/v4')
    , uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
    , Posts = require(__dirname+'/../../db-models/posts.js')
 	, getTripCode = require(__dirname+'/../../helpers/tripcode.js')
+	, simpleMarkdown = require(__dirname+'/../../helpers/markdown.js')
+	, sanitize = require('sanitize-html')
+	, sanitizeOptions = {
+		allowedTags: [ 'span', 'a' ],
+		allowedAttributes: {
+			'a': [ 'href', 'class' ],
+			'span': [ 'class' ]
+		}
+	}
    , fileUpload = require(__dirname+'/../../helpers/files/file-upload.js')
    , fileThumbnail = require(__dirname+'/../../helpers/files/file-thumbnail.js')
    , fileIdentify = require(__dirname+'/../../helpers/files/file-identify.js')
@ -103,14 +112,21 @@ module.exports = async (req, res, numFiles) => {
 		name = `${name}##${tripcode}`;
 	}

+	//simple markdown and sanitize
+	let message = req.body.message;
+	if (message && message.length > 0) {
+		message = sanitize(simpleMarkdown(req.params.board, req.body.thread, message), sanitizeOptions);
+	}
+
 	//add post to DB
 	const data = {
 		'name': name || 'Anonymous',
 		'subject': req.body.subject || '',
 		'date': new Date(),
-		'message': req.body.message || '',
+		'message': message || '',
 		'thread': req.body.thread || null,
 		'password': req.body.password || '',
+		'userId': userId,
 		'files': files,
 		'salt': salt,
 	};
--- a/package-lock.json
+++ b/package-lock.json
@ -82,6 +82,14 @@
        "repeat-string": "^1.5.2"
      }
    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
    "array-flatten": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@ -97,6 +105,11 @@
      "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
      "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8="
    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
    "asap": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@ -210,6 +223,16 @@
        "lazy-cache": "^1.0.3"
      }
    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
    "character-parser": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
@ -236,6 +259,19 @@
        "wordwrap": "0.0.2"
      }
    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
    "connect-mongo": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.3.tgz",
@ -460,6 +496,37 @@
      "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
    },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "requires": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
    "dont-sniff-mimetype": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz",
@ -475,6 +542,11 @@
      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
    "es6-promise": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
@ -485,6 +557,11 @@
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
    "esutils": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
@ -698,6 +775,11 @@
        "function-bind": "^1.1.1"
      }
    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
    "helmet": {
      "version": "3.13.0",
      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz",
@ -749,6 +831,19 @@
      "resolved": "https://registry.npmjs.org/hsts/-/hsts-2.1.0.tgz",
      "integrity": "sha512-zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA=="
    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      }
+    },
    "http-errors": {
      "version": "1.6.3",
      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@ -859,6 +954,31 @@
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+    },
+    "lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha1-ZHYsSGGAglGKw99Mz11YhtriA0c="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
+    },
    "longest": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@ -963,6 +1083,11 @@
      "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz",
      "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA="
    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@ -1015,6 +1140,26 @@
      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz",
      "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q=="
    },
+    "postcss": {
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
    "process": {
      "version": "0.11.10",
      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@ -1182,6 +1327,16 @@
        "unpipe": "1.0.0"
      }
    },
+    "readable-stream": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+      "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
    "referrer-policy": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz",
@ -1242,6 +1397,23 @@
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
+    "sanitize-html": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.20.0.tgz",
+      "integrity": "sha512-BpxXkBoAG+uKCHjoXFmox6kCSYpnulABoGcZ/R3QyY9ndXbIM5S94eOr1IqnzTG8TnbmXaxWoDDzKC5eJv7fEQ==",
+      "requires": {
+        "chalk": "^2.4.1",
+        "htmlparser2": "^3.10.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.mergewith": "^4.6.1",
+        "postcss": "^7.0.5",
+        "srcset": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
    "saslprep": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.2.tgz",
@ -1313,6 +1485,15 @@
        "memory-pager": "^1.0.2"
      }
    },
+    "srcset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz",
+      "integrity": "sha1-pWad4StC87HV6D7QPHEEb8SPQe8=",
+      "requires": {
+        "array-uniq": "^1.0.2",
+        "number-is-nan": "^1.0.0"
+      }
+    },
    "statuses": {
      "version": "1.5.0",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@ -1323,6 +1504,22 @@
      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
    },
+    "string_decoder": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+      "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
    "tmp": {
      "version": "0.0.33",
      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@ -1456,6 +1653,11 @@
      "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.1.0.tgz",
      "integrity": "sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg=="
    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    },
    "yallist": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
--- a/package.json
+++ b/package.json
@ -17,6 +17,7 @@
    "mongodb": "^3.2.2",
    "path": "^0.12.7",
    "pug": "^2.0.3",
+    "sanitize-html": "^1.20.0",
    "uuid": "^3.3.2"
  },
  "devDependencies": {},
--- a/static/css/style.css
+++ b/static/css/style.css
@ -9,6 +9,14 @@ body {
 	margin: 0;
 }

+.redtext {
+	color: maroon;
+}
+
+.greentext {
+	color: green;
+}
+
 blockquote {
 	word-break: break-all;
 	white-space: pre-wrap;
--- a/views/mixins/post.pug
+++ b/views/mixins/post.pug
@ -27,18 +27,17 @@ mixin post(board, post, truncate)
 				-
 					const splitPost = post.message.split('\n');
 					const messageLines = splitPost.length;
-					const postLength = post.message.length;
 					let truncatedMessage = post.mesage;
 					let truncated = false;
-					if (messageLines > 16 || post.message.length > 1000) {
-						truncatedMessage = splitPost.slice(0, 16).join('\n').substring(0, 1000);
+					if (messageLines > 10 || post.message.length > 1000) {
+						truncatedMessage = splitPost.slice(0, 16).join('\n');
 						truncated = true;
 					}
 				if truncated
-					blockquote.post-message #{truncatedMessage}
+					blockquote.post-message !{truncatedMessage}
 					p Message too long. #[a(href=`/${board._id}/thread/${post.thread == null ? post._id : post.thread}#${post._id}`) Click here] to view the full text.
 				else
-					blockquote.post-message #{post.message}
+					blockquote.post-message !{post.message}
 			else 
-				blockquote.post-message #{post.message}
+				blockquote.post-message !{post.message}