From d7a4ae1f9c1e9153dd7ec3e156684e2224ddf9bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 18:22:18 -0500 Subject: [PATCH 1/2] chore(deps): bump postcss from 8.4.7 to 8.4.8 in /install (#10372) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.7 to 8.4.8. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.7...8.4.8) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a2f9a8d6e4..7902a85bc3 100644 --- a/install/package.json +++ b/install/package.json @@ -106,7 +106,7 @@ "passport-local": "1.0.0", "pg": "8.7.3", "pg-cursor": "2.7.3", - "postcss": "8.4.7", + "postcss": "8.4.8", "postcss-clean": "1.2.0", "prompt": "1.2.2", "ioredis": "4.28.5", From 371b46581a8734cc76001578ac182112417885b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 7 Mar 2022 18:44:31 -0500 Subject: [PATCH 2/2] fix: #10366, remove dupe /files dont display duplicate thumb og:image items --- src/controllers/topics.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 291acf78cf..ee2f2722cb 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -269,11 +269,15 @@ async function addTags(topicData, req, res) { async function addOGImageTags(res, topicData, postAtIndex) { const uploads = postAtIndex ? await posts.uploads.listWithSizes(postAtIndex.pid) : []; const images = uploads.map((upload) => { - upload.name = `${url + upload_url}/files/${upload.name}`; + upload.name = `${url + upload_url}/${upload.name}`; return upload; }); if (topicData.thumbs) { - images.push(...topicData.thumbs.map(thumbObj => ({ name: nconf.get('url') + thumbObj.url }))); + const path = require('path'); + const thumbs = topicData.thumbs.filter( + t => t && images.every(img => path.normalize(img.name) !== path.normalize(url + t.url)) + ); + images.push(...thumbs.map(thumbObj => ({ name: url + thumbObj.url }))); } if (topicData.category.backgroundImage && (!postAtIndex || !postAtIndex.index)) { images.push(topicData.category.backgroundImage);