From 252f08e828b02062a23324769b43baa227cbba71 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Thu, 3 Mar 2022 14:06:37 +0000
Subject: [PATCH] Doc: Improved rendering of news items

---
 .../WebsiteAssets/templates/main-new.mustache |  5 -----
 packages/tools/website/build.ts               | 22 +++++++++++++------
 packages/tools/website/utils/types.ts         |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Assets/WebsiteAssets/templates/main-new.mustache b/Assets/WebsiteAssets/templates/main-new.mustache
index 8c98095cb..dfb7f0d93 100644
--- a/Assets/WebsiteAssets/templates/main-new.mustache
+++ b/Assets/WebsiteAssets/templates/main-new.mustache
@@ -65,11 +65,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 							{{{contentHtml}}}
 							{{#showBottomLinks}}
 								<div class="bottom-links">
-									{{#discussOnForumLink}}
-										<a class="bottom-link" href="{{{discussOnForumLink}}}">
-											<i class="fab fa-discourse"></i></i> Discuss on the forum
-										</a>
-									{{/discussOnForumLink}}
 									{{#showImproveThisDoc}}
 										<a class="bottom-link" href="https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}">
 											<i class="fab fa-github"></i> Improve this doc
diff --git a/packages/tools/website/build.ts b/packages/tools/website/build.ts
index e5e70e40c..6b5f82b75 100644
--- a/packages/tools/website/build.ts
+++ b/packages/tools/website/build.ts
@@ -111,7 +111,7 @@ function renderPageToHtml(md: string, targetPath: string, templateParams: Templa
 		...templateParams,
 	};
 
-	templateParams.showBottomLinks = templateParams.showImproveThisDoc || !!templateParams.discussOnForumLink;
+	templateParams.showBottomLinks = templateParams.showImproveThisDoc;
 
 	const title = [];
 
@@ -139,6 +139,9 @@ function renderPageToHtml(md: string, targetPath: string, templateParams: Templa
 
 function renderFileToHtml(sourcePath: string, targetPath: string, templateParams: TemplateParams) {
 	let md = readFileSync(sourcePath, 'utf8');
+	if (templateParams.isNews) {
+		md = processNewsMarkdown(md, sourcePath);
+	}
 	md = stripOffFrontMatter(md).doc;
 	return renderPageToHtml(md, targetPath, templateParams);
 }
@@ -168,6 +171,15 @@ async function loadSponsors(): Promise<Sponsors> {
 	return output;
 }
 
+const processNewsMarkdown = (md: string, mdFilePath: string): string => {
+	const info = stripOffFrontMatter(md);
+	md = info.doc.trim();
+	const dateString = moment(info.created).format('D MMM YYYY');
+	md = md.replace(/^# (.*)/, `# [$1](https://github.com/laurent22/joplin/blob/dev/readme/news/${path.basename(mdFilePath)})\n\n*Published on **${dateString}***\n\n`);
+	md += `\n\n* * *\n\n[<i class="fab fa-discourse"></i> Discuss on the forum](${discussLink})`;
+	return md;
+};
+
 const makeNewsFrontPage = async (sourceFilePaths: string[], targetFilePath: string, templateParams: TemplateParams) => {
 	const maxNewsPerPage = 20;
 
@@ -175,11 +187,7 @@ const makeNewsFrontPage = async (sourceFilePaths: string[], targetFilePath: stri
 
 	for (const mdFilePath of sourceFilePaths) {
 		let md = await readFile(mdFilePath, 'utf8');
-		const info = stripOffFrontMatter(md);
-		md = info.doc.trim();
-		const dateString = moment(info.created).format('D MMM YYYY');
-		md = md.replace(/^# (.*)/, `# [$1](https://github.com/laurent22/joplin/blob/dev/readme/news/${path.basename(mdFilePath)})\n\n*Published on **${dateString}***\n\n`);
-		md += `\n\n* * *\n\n[<i class="fab fa-discourse"></i> Discuss on the forum](${discussLink})`;
+		md = processNewsMarkdown(md, mdFilePath);
 		frontPageMd.push(md);
 		if (frontPageMd.length >= maxNewsPerPage) break;
 	}
@@ -344,8 +352,8 @@ async function main() {
 			...source[2],
 			templateHtml: mainTemplateHtml,
 			pageName: isNews ? 'news-item' : '',
-			discussOnForumLink: isNews ? discussLink : '',
 			showImproveThisDoc: !isNews,
+			isNews,
 			partials,
 			assetUrls,
 		});
diff --git a/packages/tools/website/utils/types.ts b/packages/tools/website/utils/types.ts
index 154cea022..70fbfd03f 100644
--- a/packages/tools/website/utils/types.ts
+++ b/packages/tools/website/utils/types.ts
@@ -71,9 +71,9 @@ export interface TemplateParams {
 	navbar?: NavBar;
 	showJoplinCloudLinks?: boolean;
 	assetUrls: AssetUrls;
-	discussOnForumLink?: string;
 	showBottomLinks?: boolean;
 	openGraph: OpenGraphTags;
+	isNews?: boolean;
 }
 
 export interface PlanPageParams extends TemplateParams {