From dc1e0b86f249265d4fab77b67baf418c99a6575a Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 12 Jan 2021 16:02:05 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Replace=20Twitter=20links?= =?UTF-8?q?=20with=20Mastodon=20ones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- markdown.js => helpers.js | 10 +++++++++- pug.config.js | 4 ++-- src/team.pug | 2 +- tasks/fetch_feed.js | 5 +++-- 4 files changed, 15 insertions(+), 6 deletions(-) rename markdown.js => helpers.js (61%) diff --git a/markdown.js b/helpers.js similarity index 61% rename from markdown.js rename to helpers.js index 761c989db4e..0bb620c4c14 100644 --- a/markdown.js +++ b/helpers.js @@ -11,4 +11,12 @@ const { render: renderMd } = mdTransformer mdTransformer.render = str => renderMd(str, config) -module.exports = mdTransformer.render +// replacements +const replacements = str => { + return str.replace(/"https:\/\/twitter\.com\/_d11n_\/?"/, '"https://bitcoinhackers.org/@d11n"') +} + +module.exports = { + markdown: mdTransformer.render, + replacements +} diff --git a/pug.config.js b/pug.config.js index 57a8fac1ab6..1f4bdd70cad 100644 --- a/pug.config.js +++ b/pug.config.js @@ -1,5 +1,5 @@ // initialize markdown rendering -const renderMarkdown = require('./markdown') +const { markdown } = require('./helpers') const IS_DEV = process.env.NODE_ENV === 'development' const HOST = IS_DEV ? 'localhost:3000' : 'einundzwanzig.space' @@ -29,5 +29,5 @@ module.exports = { assetPath, formatDate, linkTarget, - renderMarkdown, + markdown, } diff --git a/src/team.pug b/src/team.pug index fe55826d138..cfab8ce252a 100644 --- a/src/team.pug +++ b/src/team.pug @@ -27,4 +27,4 @@ block main if m.url a(href=m.url target="_blank") +sprite("url") - !=renderMarkdown(m.text) + !=markdown(m.text) diff --git a/tasks/fetch_feed.js b/tasks/fetch_feed.js index f643f15f837..67629706a3c 100644 --- a/tasks/fetch_feed.js +++ b/tasks/fetch_feed.js @@ -1,5 +1,6 @@ const { writeFileSync } = require('fs') const { join, resolve } = require('path') +const { replacements } = require('../helpers') const Parser = require('rss-parser') const dir = resolve(__dirname, '..', 'generated') @@ -34,8 +35,8 @@ const parseInfo = e => { const image = ['interview', 'verschiedenes'].includes(info.category) ? e.itunes.image : `/img/cover/${info.category}.png` return { title: e.title.trim(), - content: e.content.trim(), - contentSnippet: e.contentSnippet.trim(), + content: replacements(e.content.trim()), + contentSnippet: replacements(e.contentSnippet.trim()), anchor: e.link, date: e.isoDate, enclosure: e.enclosure,