fix(topic-events): repeated invocations of Posts.addTopicEvents cause…

…d dupes to be added to DOM
NodeBB · Jan 27, 2021 · df2fdd5 · df2fdd5
1 parent 9559fad
commit df2fdd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
@@ -285,6 +285,10 @@ define('forum/topic/posts', [
 			return;
 		}
 
+		// Filter out events already in DOM
+		const eventIdsInDOM = Array.from(document.querySelectorAll('[component="topic/event"]')).map(el => parseInt(el.getAttribute('data-topic-event-id'), 10));
+		events = events.filter(event => !eventIdsInDOM.includes(event.id));
+
 		let postTimestamps = ajaxify.data.posts.map(post => post.timestamp);
 
 		const reverse = config.topicPostSort === 'newest_to_oldest';

diff --git a/src/topics/events.js b/src/topics/events.js
@@ -126,6 +126,6 @@ Events.log = async (tid, payload) => {
 		events: [payload],
 	});
 
-	({ events } = plugins.hooks.fire('filter:topic.events.log', { events }));
+	({ events } = await plugins.hooks.fire('filter:topic.events.log', { events }));
 	return events;
 };