fix: use contentSnippet instead of content (so no markdown skipParsin…

…g shenanigans)

index.js

@@ -96,18 +96,3 @@ RssPlugin.widgets.defineWidgets = widget.defineWidgets;
  * Called on `filter:widget.render:rss`
  */
 RssPlugin.widgets.renderRssWidget = widget.render;
-
-RssPlugin.skipMarkdown = async ({ env, data }) => {
-	const feedUrls = await db.getSetMembers('nodebb-plugin-rss:feeds');
-	const keys = feedUrls.map(url => `nodebb-plugin-rss:feed:${url}:uuid`);
-	const { tid } = data.postData;
-
-	if (utils.isNumber(tid)) {
-		const entries = await db.getSortedSetRangeByScore(keys, 0, 1, tid, tid);
-		if (entries.length) {
-			env.parse = false;
-		}
-	}
-
-	return { env, data };
-};

lib/feed.js

@@ -21,7 +21,7 @@ Feed.getItems = async function (feedUrl, entriesToPull = Feed.DEFAULT_ENTRIES_TO
 			published: item.pubDate,
 			link: { href: item.link },
 			id: item.guid || item.id,
-			content: item.content,
+			content: item.contentSnippet,
 			tags: item.categories,
 		}));
 };

lib/pull.js

@@ -76,13 +76,10 @@ async function postEntry(feed, entry) {
 	winston.info(`[plugin-rss] posting, ${feed.url} - title: ${entry.title}, published date: ${getEntryDate(entry)}`);
 
 	const url = entry.link && entry.link.href;
-	const content = !entry.content.includes(url) ?
-		`${entry.content}<hr /><p><a href="${url}">${url}</a>` :
-		entry.content;
 	const result = await topics.post({
 		uid: posterUid,
 		title: entry.title,
-		content,
+		content: `${entry.content}\n\n----\n\n${url}`,
 		cid: feed.category,
 		tags: tags,
 	});

plugin.json

@@ -14,9 +14,7 @@
         { "hook": "action:topic.purge", "method": "onTopicPurge"},
 
         { "hook": "filter:widgets.getWidgets", "method": "widgets.defineWidgets" },
-        { "hook": "filter:widget.render:rss", "method": "widgets.renderRssWidget" },
-
-        { "hook": "filter:markdown.beforeParse", "method": "skipMarkdown" }
+        { "hook": "filter:widget.render:rss", "method": "widgets.renderRssWidget" }
     ],
     "templates": "./templates",
     "modules": {