fix: broken flag history on flag update

* feat: store topic title and tags in diffs

allow restoring post diff if tags didn't change

* test: fix tests, fast computer problems

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.19.7",
+    "version": "1.19.10",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -86,7 +86,7 @@
         "@nodebb/bootswatch": "3.4.2",
         "nconf": "0.12.0",
         "nodebb-plugin-2factor": "3.0.7",
-        "nodebb-plugin-composer-default": "7.0.22",
+        "nodebb-plugin-composer-default": "7.0.23",
         "nodebb-plugin-dbsearch": "5.1.3",
         "nodebb-plugin-emoji": "3.5.17",
         "nodebb-plugin-emoji-android": "2.0.5",
@@ -184,4 +184,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/src/admin/settings/api.js

@@ -7,7 +7,7 @@ define('admin/settings/api', ['settings', 'alerts', 'hooks'], function (settings
 		settings.load('core.api', $('.core-api-settings'));
 		$('#save').on('click', saveSettings);
 
-		hooks.on('action:settings.sorted-list.itemLoaded', (ev, { element }) => {
+		hooks.on('action:settings.sorted-list.itemLoaded', ({ element }) => {
 			element.addEventListener('click', (ev) => {
 				if (ev.target.closest('input[readonly]')) {
 					// Select entire input text

public/src/client/flags/detail.js

@@ -26,7 +26,7 @@ define('forum/flags/detail', [
 						return memo;
 					}, {});
 
-					api.put(`/flags/${ajaxify.data.flagId}`, data).then((history) => {
+					api.put(`/flags/${ajaxify.data.flagId}`, data).then(({ history }) => {
 						alerts.success('[[flags:updated]]');
 						Detail.reloadHistory(history);
 					}).catch(alerts.error);

public/src/client/topic/events.js

@@ -158,7 +158,7 @@ define('forum/topic/events', [
 			hooks.fire('action:posts.edited', data);
 		}
 
-		if (data.topic.tags && tagsUpdated(data.topic.tags)) {
+		if (data.topic.tags && data.topic.tagsupdated) {
 			Benchpress.render('partials/topic/tags', { tags: data.topic.tags }).then(function (html) {
 				const tags = $('.tags');
 
@@ -171,19 +171,6 @@ define('forum/topic/events', [
 		postTools.removeMenu(components.get('post', 'pid', data.post.pid));
 	}
 
-	function tagsUpdated(tags) {
-		if (tags.length !== $('.tags').first().children().length) {
-			return true;
-		}
-
-		for (let i = 0; i < tags.length; i += 1) {
-			if (!$('.tags .tag-item[data-tag="' + tags[i].value + '"]').length) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	function onPostPurged(postData) {
 		if (!postData || parseInt(postData.tid, 10) !== parseInt(ajaxify.data.tid, 10)) {
 			return;

src/controllers/authentication.js

@@ -244,7 +244,7 @@ authenticationController.login = async (req, res, next) => {
 	}
 
 	const loginWith = meta.config.allowLoginWith || 'username-email';
-	req.body.username = req.body.username.trim();
+	req.body.username = String(req.body.username).trim();
 	const errorHandler = res.locals.noScriptErrors || helpers.noScriptErrors;
 	try {
 		await plugins.hooks.fire('filter:login.check', { req: req, res: res, userData: req.body });

src/flags.js

@@ -807,9 +807,10 @@ Flags.notify = async function (flagObj, uid, notifySelf = false) {
 		});
 		uids = uids.concat(modUids[0]);
 	} else if (flagObj.type === 'user') {
+		const targetDisplayname = flagObj.target && flagObj.target.user ? flagObj.target.user.displayname : '[[global:guest]]';
 		notifObj = await notifications.create({
 			type: 'new-user-flag',
-			bodyShort: `[[notifications:user_flagged_user, ${displayname}, ${flagObj.target.user.displayname}]]`,
+			bodyShort: `[[notifications:user_flagged_user, ${displayname}, ${targetDisplayname}]]`,
 			bodyLong: await plugins.hooks.fire('filter:parse.raw', String(flagObj.description || '')),
 			path: `/flags/${flagObj.flagId}`,
 			nid: `flag:user:${flagObj.targetId}`,

src/posts/diffs.js

@@ -7,7 +7,7 @@ const db = require('../database');
 const meta = require('../meta');
 const plugins = require('../plugins');
 const translator = require('../translator');
-
+const topics = require('../topics');
 
 module.exports = function (Posts) {
 	const Diffs = {};
@@ -38,16 +38,24 @@ module.exports = function (Posts) {
 	};
 
 	Diffs.save = async function (data) {
-		const { pid, uid, oldContent, newContent, edited } = data;
+		const { pid, uid, oldContent, newContent, edited, topic } = data;
 		const editTimestamp = edited || Date.now();
-		const patch = diff.createPatch('', newContent, oldContent);
+		const diffData = {
+			uid: uid,
+			pid: pid,
+		};
+		if (oldContent !== newContent) {
+			diffData.patch = diff.createPatch('', newContent, oldContent);
+		}
+		if (topic.renamed) {
+			diffData.title = topic.oldTitle;
+		}
+		if (topic.tagsupdated && Array.isArray(topic.oldTags)) {
+			diffData.tags = topic.oldTags.map(tag => tag && tag.value).filter(Boolean).join(',');
+		}
 		await Promise.all([
 			db.listPrepend(`post:${pid}:diffs`, editTimestamp),
-			db.setObject(`diff:${pid}.${editTimestamp}`, {
-				uid: uid,
-				pid: pid,
-				patch: patch,
-			}),
+			db.setObject(`diff:${pid}.${editTimestamp}`, diffData),
 		]);
 	};
 
@@ -71,6 +79,8 @@ module.exports = function (Posts) {
 			content: post.content,
 			req: req,
 			timestamp: since,
+			title: post.topic.title,
+			tags: post.topic.tags.map(tag => tag.value),
 		});
 	};
 
@@ -130,6 +140,16 @@ module.exports = function (Posts) {
 		// Replace content with re-constructed content from that point in time
 		post[0].content = diffs.reduce(applyPatch, validator.unescape(post[0].content));
 
+		const titleDiffs = diffs.filter(d => d.hasOwnProperty('title') && d.title);
+		if (titleDiffs.length && post[0].topic) {
+			post[0].topic.title = validator.unescape(String(titleDiffs[titleDiffs.length - 1].title));
+		}
+		const tagDiffs = diffs.filter(d => d.hasOwnProperty('tags') && d.tags);
+		if (tagDiffs.length && post[0].topic) {
+			const tags = tagDiffs[tagDiffs.length - 1].tags.split(',').map(tag => ({ value: tag }));
+			post[0].topic.tags = await topics.getTagData(tags);
+		}
+
 		return post[0];
 	}
 
@@ -144,9 +164,12 @@ module.exports = function (Posts) {
 	}
 
 	function applyPatch(content, aDiff) {
-		const result = diff.applyPatch(content, aDiff.patch, {
-			fuzzFactor: 1,
-		});
-		return typeof result === 'string' ? result : content;
+		if (aDiff && aDiff.patch) {
+			const result = diff.applyPatch(content, aDiff.patch, {
+				fuzzFactor: 1,
+			});
+			return typeof result === 'string' ? result : content;
+		}
+		return content;
 	}
 };

src/posts/edit.js

@@ -29,7 +29,9 @@ module.exports = function (Posts) {
 			throw new Error('[[error:no-post]]');
 		}
 
-		const topicData = await topics.getTopicFields(postData.tid, ['cid', 'mainPid', 'title', 'timestamp', 'scheduled', 'slug']);
+		const topicData = await topics.getTopicFields(postData.tid, [
+			'cid', 'mainPid', 'title', 'timestamp', 'scheduled', 'slug', 'tags',
+		]);
 
 		await scheduledTopicCheck(data, topicData);
 
@@ -53,7 +55,10 @@ module.exports = function (Posts) {
 		]);
 
 		await Posts.setPostFields(data.pid, result.post);
-		const contentChanged = data.content !== oldContent;
+		const contentChanged = data.content !== oldContent ||
+			topic.renamed ||
+			topic.tagsupdated;
+
 		if (meta.config.enablePostHistory === 1 && contentChanged) {
 			await Posts.diffs.save({
 				pid: data.pid,
@@ -61,6 +66,7 @@ module.exports = function (Posts) {
 				oldContent: oldContent,
 				newContent: data.content,
 				edited: editPostData.edited,
+				topic,
 			});
 		}
 		await Posts.uploads.sync(data.pid);
@@ -109,6 +115,7 @@ module.exports = function (Posts) {
 				title: validator.escape(String(topicData.title)),
 				isMainPost: false,
 				renamed: false,
+				tagsupdated: false,
 			};
 		}
 
@@ -124,15 +131,16 @@ module.exports = function (Posts) {
 			newTopicData.slug = `${tid}/${slugify(title) || 'topic'}`;
 		}
 
-		data.tags = data.tags || [];
+		const tagsupdated = Array.isArray(data.tags) &&
+			!_.isEqual(data.tags, topicData.tags.map(tag => tag.value));
 
-		if (data.tags.length) {
+		if (tagsupdated) {
 			const canTag = await privileges.categories.can('topics:tag', topicData.cid, data.uid);
 			if (!canTag) {
 				throw new Error('[[error:no-privileges]]');
 			}
+			await topics.validateTags(data.tags, topicData.cid, data.uid, tid);
 		}
-		await topics.validateTags(data.tags, topicData.cid, data.uid, tid);
 
 		const results = await plugins.hooks.fire('filter:topic.edit', {
 			req: data.req,
@@ -140,7 +148,9 @@ module.exports = function (Posts) {
 			data: data,
 		});
 		await db.setObject(`topic:${tid}`, results.topic);
-		await topics.updateTopicTags(tid, data.tags);
+		if (tagsupdated) {
+			await topics.updateTopicTags(tid, data.tags);
+		}
 		const tags = await topics.getTopicTagsObjects(tid);
 
 		if (rescheduling(data, topicData)) {
@@ -149,7 +159,7 @@ module.exports = function (Posts) {
 
 		newTopicData.tags = data.tags;
 		newTopicData.oldTitle = topicData.title;
-		const renamed = translator.escape(validator.escape(String(title))) !== topicData.title;
+		const renamed = title && translator.escape(validator.escape(String(title))) !== topicData.title;
 		plugins.hooks.fire('action:topic.edit', { topic: newTopicData, uid: data.uid });
 		return {
 			tid: tid,
@@ -160,8 +170,10 @@ module.exports = function (Posts) {
 			slug: newTopicData.slug || topicData.slug,
 			isMainPost: true,
 			renamed: renamed,
-			rescheduled: rescheduling(data, topicData),
+			tagsupdated: tagsupdated,
 			tags: tags,
+			oldTags: topicData.tags,
+			rescheduled: rescheduling(data, topicData),
 		};
 	}
 

src/posts/summary.js

@@ -76,9 +76,15 @@ module.exports = function (Posts) {
 	}
 
 	async function getTopicAndCategories(tids) {
-		const topicsData = await topics.getTopicsFields(tids, ['uid', 'tid', 'title', 'cid', 'slug', 'deleted', 'scheduled', 'postcount', 'mainPid', 'teaserPid']);
+		const topicsData = await topics.getTopicsFields(tids, [
+			'uid', 'tid', 'title', 'cid', 'tags', 'slug',
+			'deleted', 'scheduled', 'postcount', 'mainPid', 'teaserPid',
+		]);
 		const cids = _.uniq(topicsData.map(topic => topic && topic.cid));
-		const categoriesData = await categories.getCategoriesFields(cids, ['cid', 'name', 'icon', 'slug', 'parentCid', 'bgColor', 'color', 'backgroundImage', 'imageClass']);
+		const categoriesData = await categories.getCategoriesFields(cids, [
+			'cid', 'name', 'icon', 'slug', 'parentCid',
+			'bgColor', 'color', 'backgroundImage', 'imageClass',
+		]);
 		return { topics: topicsData, categories: categoriesData };
 	}
 

test/api.js

@@ -191,8 +191,11 @@ describe('API', async () => {
 		const socketAdmin = require('../src/socket.io/admin');
 		// export data for admin user
 		await socketUser.exportProfile({ uid: adminUid }, { uid: adminUid });
+		await wait(2000);
 		await socketUser.exportPosts({ uid: adminUid }, { uid: adminUid });
+		await wait(2000);
 		await socketUser.exportUploads({ uid: adminUid }, { uid: adminUid });
+		await wait(2000);
 		await socketAdmin.user.exportUsersCSV({ uid: adminUid }, {});
 		// wait for export child process to complete
 		await wait(5000);

test/posts.js

@@ -425,6 +425,7 @@ describe('Post\'s', () => {
 				cid: cid,
 				title: 'topic to edit',
 				content: 'A post to edit',
+				tags: ['nodebb'],
 			}, (err, data) => {
 				assert.ifError(err);
 				pid = data.postData.pid;