From 7207f1661a95f5e3228a36eacaf81e15a6d8f24d Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Wed, 7 Aug 2024 15:38:30 +0200 Subject: [PATCH] Remove Telegram groups and links --- .github/workflows/build.yml | 2 -- content/meta.json | 1 - src/includes/_footer.pug | 2 -- src/includes/template.pug | 2 -- src/index.pug | 14 ++------------ src/telegram.pug | 23 ----------------------- tasks/generate_pages.js | 1 - tasks/generate_site_data.js | 33 +-------------------------------- 8 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 src/telegram.pug diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 358865a949b..0f1363f56ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,8 +32,6 @@ jobs: run: npm ci - name: Build run: npm run prod - env: - TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} # Deploy, limited to the master branch - name: Deploy if: success() && github.ref == 'refs/heads/master' diff --git a/content/meta.json b/content/meta.json index aa253d0cb43..619122757b1 100644 --- a/content/meta.json +++ b/content/meta.json @@ -5,7 +5,6 @@ "themeColor": "#f7931a", "cardImage": "/img/cover/news.png", "twitterUrl": "https://twitter.com/_einundzwanzig_", - "telegramUrl": "https://t.me/einundzwanzigpodcast", "instagramUrl": "https://www.instagram.com/einundzwanzig_podcast", "shopUrl": "https://einundzwanzig.shop/", "soundcloudUrl": "https://soundcloud.com/einundzwanzig_beats", diff --git a/src/includes/_footer.pug b/src/includes/_footer.pug index 337fd863c69..46ce6a2aa4b 100644 --- a/src/includes/_footer.pug +++ b/src/includes/_footer.pug @@ -10,8 +10,6 @@ footer#footer.footer p.social a(href=site.meta.twitterUrl rel="me nofollow noopener" target="_blank" title="Twitter") +sprite("twitter") - a(href=site.meta.telegramUrl rel="me nofollow noopener" target="_blank" title="Telegram") - +sprite("telegram") a(href=site.meta.youtubeUrl rel="me nofollow noopener" target="_blank" title="YouTube") +sprite("youtube") a(href=site.meta.instagramUrl rel="me nofollow noopener" target="_blank" title="Instagram") diff --git a/src/includes/template.pug b/src/includes/template.pug index 578fad73e38..bd81251566c 100644 --- a/src/includes/template.pug +++ b/src/includes/template.pug @@ -27,8 +27,6 @@ html(lang="de") a(href="/meetups/" class=(navCurrent === 'meetups' && 'current')) Meetups a(href="https://portal.einundzwanzig.space/de/event/overview?l=de" rel="nofollow noopener") Events a(href="https://portal.einundzwanzig.space/" rel="nofollow noopener") Portal - a(href="https://nostrnests.com/9noscz/" rel="nofollow noopener") Nostrnest - a(href="/telegram/" class=(navCurrent === 'telegram' && 'current')) Telegram a(href="/shops/" class=(navCurrent === 'shops' && 'current')) Shops a(href=site.meta.youtubeUrl target="_blank" rel="nofollow noopener") YouTube a(href=site.meta.shoutoutUrl target="_blank" rel="nofollow noopener") Shoutout diff --git a/src/index.pug b/src/index.pug index f48baf792b3..4277631b5c7 100644 --- a/src/index.pug +++ b/src/index.pug @@ -30,16 +30,6 @@ block main .current +episodePlayer(currentEpisode) - section#telegram - :markdown-it(html linkify typographer) - ## 💬 Komm in die Gruppe! - - Mit unserer Telegram-Gruppe bieten wir dir ein Shitcoin-freies Refugium: Mit über 2.000 Gleichgesinnten - sprechen wir dort nicht über den Preis, Altcoins oder sonstige unwichtigen Dinge. In unserer Gruppe - findest du News, Informationen und bekommst praktische Ratschläge zu technischen Themen. - - a.button(href=site.meta.telegramUrl target="_blank" rel="nofollow noopener") Ab in die Gruppe - //- section#shop //- :markdown-it(html linkify typographer) //- ## 🛍 Unser bitcoin-only Shop @@ -80,8 +70,8 @@ block main ## 🗣 Sei laut, shout out! Wenn du möchtest, dass wir im Podcast deinen Shoutout vorlesen, dann bist du mit 21.000 Sats dabei! - Wir sammeln alle Einnahmen bis die 1.000.000 Sats voll sind. Dann lassen wir in unserer Telegram-Gruppe - darüber abstimmen welches Bitcoin-Projekt aus Deutschland diese kostbaren Sats bekommen soll. + Wir sammeln alle Einnahmen bis die 1.000.000 Sats voll sind. Dann lassen wir darüber abstimmen welches + Bitcoin-Projekt diese kostbaren Sats bekommen soll. Wenn du also einen Shoutout in unserem Podcast kaufst, [unterstützt](/spenden/) du damit auch ein Bitcoin Projekt. a.button(href=site.meta.shoutoutUrl target="_blank" rel="nofollow noopener") Shoutout senden diff --git a/src/telegram.pug b/src/telegram.pug deleted file mode 100644 index 82bfd718060..00000000000 --- a/src/telegram.pug +++ /dev/null @@ -1,23 +0,0 @@ -extends /template.pug - -block vars - - const title = 'Telegram-Gruppen' - - const description = 'Eine Liste von Telegram-Gruppen der Einundzwanzig Community.' - -block main - #telegram.wrap - section - h1= title - p= description - - :markdown-it(html linkify typographer) - Neue Gruppen können gerne [per Pull Request](https://github.com/Einundzwanzig-Podcast/einundzwanzig.space/edit/master/content/telegram.json) hinzugefügt werden. - Hier gibt es ein [Video-Tutorial](https://www.youtube.com/watch?v=BNJc9LExEzU), wie ein neuer Pull Request erstellt werden kann. - - ul - each group in telegram - li - a(href=group.url rel="nofollow noopener" target="_blank")= group.name - if group.members - = ' ' - small.members= `(${group.members} Mitglieder)` diff --git a/tasks/generate_pages.js b/tasks/generate_pages.js index 09608ecf280..cf077c1ec09 100644 --- a/tasks/generate_pages.js +++ b/tasks/generate_pages.js @@ -51,7 +51,6 @@ renderPage('meetups', 'meetups', { navCurrent: 'meetups', meetups: site.meetups, renderPage('spenden', 'spenden', { navCurrent: 'spenden', spendenregister, spendenuebersicht }) renderPage('media', 'media', { navCurrent: 'media' }) renderPage('soundboard', 'soundboard', { navCurrent: 'soundboard', soundboard }) -renderPage('telegram', 'telegram', { navCurrent: 'telegram', telegram: site.telegram }) renderPage('shops', 'shops', { navCurrent: 'shops', shops }) renderPage('verein', 'verein', { navCurrent: 'verein' }) renderPage('kontakt', 'kontakt', { navCurrent: 'kontakt' }) diff --git a/tasks/generate_site_data.js b/tasks/generate_site_data.js index 84eff5fef7e..e04f9953530 100644 --- a/tasks/generate_site_data.js +++ b/tasks/generate_site_data.js @@ -3,10 +3,8 @@ const { basename, join, resolve } = require('path') const request = require('sync-request') const { toMeetupMapInfo } = require('../helpers') const meta = require('../content/meta.json') -const telegram = require('../content/telegram.json') const soundboard = require('../content/soundboard.json') -const { TELEGRAM_BOT_TOKEN } = process.env const loadJson = url => { const jsonBody = request('GET', url).getBody('utf8') return JSON.parse(jsonBody) @@ -14,27 +12,6 @@ const loadJson = url => { const dir = (...path) => resolve(__dirname, '..', ...path) const writeJSON = (file, data) => writeFileSync(file, JSON.stringify(data, null, 2)) -const getTelegramMembersCount = group => { - if (TELEGRAM_BOT_TOKEN) { - const { name, url } = group - if (url.startsWith('https://t.me/')) { - [, , telegramId] = url.match(/:\/\/t\.me\/(?!(\+|joinchat))(.*)/) || [] - if (telegramId) { - try { - const { ok, result } = loadJson(`https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/getChatMemberCount?chat_id=@${telegramId}`) - if (ok) { - return result - } - } catch (err) { - const [, description] = err.message.match(/"description":"(.*?)"/) || [] - console.error('Failed to get mebers count for', name, ' - ', description) - } - } else { - console.log('No Telegram ID for', name, url) - } - } - } -} let recentBlocks = [] try { @@ -47,13 +24,6 @@ const block = recentBlocks.length && recentBlocks[0].height const now = new Date() const date = now.toJSON().split('T')[0] -// Telegram -const telegramData = telegram.map(t => - Object.assign(t, { - members: getTelegramMembersCount(t), - }) -) - // Meetups let meetups = [] try { @@ -78,8 +48,7 @@ writeJSON(dir('generated', 'site-data.json'), { block, meta, meetups, - upcomingMeetups, - telegram: telegramData + upcomingMeetups }) // Soundboard