Merge branch 'develop' into 'master'

v0.3.2

See merge request fatchan/jschan!239

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.3.2
+  - Minor bugfix to post moving.
+
 ### 0.3.1
   - Small board list optimisation, no longer try to fetch webring site names if webring not enabled.
   - Make webring blacklisting also apply to endpoints after being fetched, in case the URL is different (alt domain, onions, etc).

models/forms/moveposts.js

@@ -121,13 +121,13 @@ module.exports = async (req, res) => {
 		const remarkupPosts = await Posts.globalGetPosts([...backlinkRebuilds]);
 		await Promise.all(remarkupPosts.map(async post => { //doing these all at once
 			const postUpdate = {};
+			//update post message and/or id
 			if (post.userId) {
 				let userId = createHash('sha256').update(res.locals.destinationThread.salt + post.ip.raw).digest('hex');
 				userId = userId.substring(userId.length-6);
 				postUpdate.userId = userId;
 			}
-			//update post message and/or id
-			if (post.nomarkup && post.nomarkup.length > 0 || post.userId) {
+			if (post.nomarkup && post.nomarkup.length > 0) {
 				let message = markdown(post.nomarkup);
 				let { quotedMessage, threadQuotes, crossQuotes } = await quoteHandler.process(post.board, message, post.thread); // req.body.move_to_thread);
 				message = sanitize(quotedMessage, sanitizeOptions.after);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jschan",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "jschan",
-      "version": "0.3.1",
+      "version": "0.3.2",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@fatchan/express-fileupload": "^1.3.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jschan",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "migrateVersion": "0.2.0",
   "description": "",
   "main": "server.js",