From bda81f70dda37d85da22eada8a7ce68c7c8972d4 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Thu, 26 Sep 2024 11:44:36 -0700 Subject: [PATCH] fix: rss to masto text truncation --- package-lock.json | 40 +++++++++++++++++++-------------------- package.json | 4 ++-- workers/mastodon/index.js | 17 +++++++++++++++-- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f16c2d5..233ece15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "24.19.11", + "version": "24.19.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "24.19.11", + "version": "24.19.12", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.5.0", @@ -40,7 +40,7 @@ "rimraf": "^6.0.1", "sanitize-html": "^2.13.0", "slugify": "^1.6.6", - "terser": "^5.33.0", + "terser": "^5.34.0", "truncate-html": "^1.1.2" } }, @@ -701,9 +701,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "22.6.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.6.1.tgz", - "integrity": "sha512-V48tCfcKb/e6cVUigLAaJDAILdMP0fUW6BidkPK4GpGjXcfbnoHasCZDwz3N3yVt5we2RHm4XTQCpv0KJz9zqw==", + "version": "22.7.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz", + "integrity": "sha512-qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA==", "dev": true, "license": "MIT", "dependencies": { @@ -989,9 +989,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "dev": true, "funding": [ { @@ -1009,8 +1009,8 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", "node-releases": "^2.0.18", "update-browserslist-db": "^1.1.0" }, @@ -1083,9 +1083,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001663", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz", - "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==", + "version": "1.0.30001664", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz", + "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==", "dev": true, "funding": [ { @@ -1744,9 +1744,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.28", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.28.tgz", - "integrity": "sha512-VufdJl+rzaKZoYVUijN13QcXVF5dWPZANeFTLNy+OSpHdDL5ynXTF35+60RSBbaQYB1ae723lQXHCrf4pyLsMw==", + "version": "1.5.29", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz", + "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==", "dev": true, "license": "ISC" }, @@ -4827,9 +4827,9 @@ } }, "node_modules/terser": { - "version": "5.33.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz", - "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==", + "version": "5.34.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.0.tgz", + "integrity": "sha512-y5NUX+U9HhVsK/zihZwoq4r9dICLyV2jXGOriDAVOeKhq3LKVjgJbGO90FisozXLlJfvjHqgckGmJFBb9KYoWQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { diff --git a/package.json b/package.json index 13ca8bcd..d39f3261 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "24.19.11", + "version": "24.19.12", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { @@ -53,7 +53,7 @@ "rimraf": "^6.0.1", "sanitize-html": "^2.13.0", "slugify": "^1.6.6", - "terser": "^5.33.0", + "terser": "^5.34.0", "truncate-html": "^1.1.2" } } diff --git a/workers/mastodon/index.js b/workers/mastodon/index.js index 8467b99f..335eaeff 100644 --- a/workers/mastodon/index.js +++ b/workers/mastodon/index.js @@ -30,6 +30,9 @@ async function handleMastodonPost(env) { if (existingPost) continue + const title = item.title + const link = item.link + const maxLength = 500 const plainTextDescription = convert(item.description, { wordwrap: false, selectors: [ @@ -40,12 +43,12 @@ async function handleMastodonPost(env) { { selector: '*', format: 'block' } ] }) - const content = `${item.title}\n\n${plainTextDescription}\n\n${item.link}` + + const content = truncateContent(title, plainTextDescription, link, maxLength) await postToMastodon(mastodonApiUrl, accessToken, content) const timestamp = new Date().toISOString() - await env.RSS_TO_MASTODON_NAMESPACE.put(item.link, timestamp) console.log(`Posted stored URL: ${item.link}`) @@ -57,6 +60,16 @@ async function handleMastodonPost(env) { } } +function truncateContent(title, description, link, maxLength) { + const baseLength = `${title}\n\n${link}`.length + const availableSpace = maxLength - baseLength - 4 + let truncatedDescription = description + + if (description.length > availableSpace) truncatedDescription = description.substring(0, availableSpace).split(' ').slice(0, -1).join(' ') + '...' + + return `${title}\n\n${truncatedDescription}\n\n${link}` +} + async function fetchRSSFeed(rssFeedUrl) { const response = await fetch(rssFeedUrl) const rssText = await response.text()