Merge branch 'main' of github.com:gillohner/dezentralschweiz_bot

gillohner · Nov 10, 2024 · 104e4c3 · 104e4c3
2 parents 0a1042f + 56be871
commit 104e4c3
Show file tree

Hide file tree

Showing 91 changed files with 54,361 additions and 177 deletions.
diff --git a/bot.js b/bot.js
@@ -1,10 +1,11 @@
 // External Libraries
 import TelegramBot from 'node-telegram-bot-api';
-import { getPublicKey, nip19 } from 'nostr-tools';
 
-// Config and State
+// Config
 import config from './bot/config.js';
-import userStates from './userStates.js';
+
+// Import Tasks
+import { scheduleWeeklyMeetupPost } from "./scheduledTasks.js"
 
 // Handlers
 import { setupCommands } from './bot/commands.js';
@@ -52,6 +53,7 @@ const main = async () => {
   await setupCommands(bot);
   await initializeBot(bot);
   setupEventHandlers(bot);
+  scheduleWeeklyMeetupPost(bot);
 };
 
 main();
diff --git a/bot/commands.js b/bot/commands.js
@@ -1,4 +1,5 @@
-const commands = [{
+const commands = [
+    {
         command: 'start',
         description: 'Starte den Bot'
     },

diff --git a/bot/config.js b/bot/config.js
@@ -8,6 +8,7 @@ const config = {
     DEFAULT_RELAYS: process.env.DEFAULT_RELAYS?.split(',') || [],
     FETCH_RELAY: process.env.FETCH_RELAY,
     ADMIN_CHAT_ID: process.env.ADMIN_CHAT_ID,
+    MEETUP_CHAT_ID: process.env.MEETUP_CHAT_ID,
     BOT_NSEC: process.env.BOT_NSEC,
     EVENT_CALENDAR_NADDR: process.env.EVENT_CALENDAR_NADDR,
 };

diff --git a/datasets/communityLinks.js b/datasets/communityLinks.js
@@ -2,15 +2,18 @@ const communityLinks = {
   'Dezentralschweiz Gruppen': [
     {
       name: 'Bitcoin Gruppe 💬',
-      url: 'https://t.me/+iu9fNXw0NeE4ZmE0'
+      url: 'https://t.me/+iu9fNXw0NeE4ZmE0',
+      id: '-1001759384231'
     },
     {
       name: 'Meetup Gruppe 🍻',
-      url: 'https://t.me/+XEWwvUPaxPBlZjM0'
+      url: 'https://t.me/+XEWwvUPaxPBlZjM0',
+      id: '-1001284407897'
     },
     {
       name: 'Offtopic Gruppe 👀',
-      url: 'https://t.me/joinchat/NL5C5XuMSwczMzJh'
+      url: 'https://t.me/joinchat/NL5C5XuMSwczMzJh',
+      id: '-1001750710633'
     },
     {
       name: 'Dezentralschweiz Backup 🔐 (P2P)',
@@ -19,44 +22,49 @@ const communityLinks = {
   ],
   'Regionale Gruppen': [
     {
-      name: "Bitcoin Alps",
-      url: "https://t.me/bitcoin_alps"
+      name: 'Bitcoin Alps',
+      url: 'https://t.me/bitcoin_alps'
     },
     {
-      name: "Bitcoin Baden",
-      url: "https://bitcoinbaden.ch/"
+      name: 'Bitcoin Baden',
+      url: 'https://bitcoinbaden.ch/'
     },   
     {
-      name: "Einundzwanzig Meetup Ostschweiz",
-      url: "https://t.me/+dl7U3c1THKE2ODhk"
+      name: 'Einundzwanzig Meetup Ostschweiz',
+      url: 'https://t.me/+dl7U3c1THKE2ODhk',
+      id: '-1001737615727'
     },
     {
       name: 'Bitcoin Luzern',
-      url: 'https://t.me/bitcoinluzern'
+      url: 'https://t.me/bitcoinluzern',
+      id: '-1001886830711'
     },
     {
       name: '21⚡️BITCOIN WINTI',
       url: 'https://t.me/+Tle8OoJnAJw2YWRk'
     },
     {
       name: 'Einundzwanzig Meetup Einsiedeln',
-      url: 'https://t.me/+sdT8TNEJIMc2Y2U8'
+      url: 'https://t.me/+sdT8TNEJIMc2Y2U8',
+      id: '-1001885048851'
     },
     {
-      name: "	Einezwänzg Solothurn",
-      url: "https://t.me/+BPb0b8yHLbM4NTY5"
+      name: '	Einezwänzg Solothurn',
+      url: 'https://t.me/+BPb0b8yHLbM4NTY5',
+      id: '-1001965341056'
     },
     {
-      name: "Einundzwanzig Basel",
-      url: "https://t.me/+LWtqciNZDiNmNTFk"
+      name: 'Einundzwanzig Basel',
+      url: 'https://t.me/+LWtqciNZDiNmNTFk'
     },
     {
-      name: "Einundzwanzig Thurgau",
-      url: "https://t.me/Einundzwanzig_Thurgau"
+      name: 'Einundzwanzig Thurgau',
+      url: 'https://t.me/Einundzwanzig_Thurgau',
+      id: '-1001817663515'
     },
     {
-      name: "Bitcoin Weesen SG",
-      url: "https://www.bitcoinweesen.ch"
+      name: 'Bitcoin Weesen SG',
+      url: 'https://www.bitcoinweesen.ch'
     }
   ],
   'Info Gruppen': [
@@ -100,6 +108,10 @@ const communityLinks = {
       name: 'Berglinde Newsletter',
       url: 'https://news.berglinde.com/'
     },
+    {
+      name: 'Berglinde Podcast',
+      url: 'https://www.fountain.fm/show/aed4vKr0mXzHSbXxOOmB'
+    },
     {
       name: 'Bitpartikel Blog',
       url: 'https://bitpartikel.com/cryptonite/'
@@ -115,16 +127,16 @@ const communityLinks = {
       url: 'https://www.bitcoin-mentoring.me'
     },
     {
-      name: "Bitcoin Block",
-      url: "https://bitcoinblock.study/"
+      name: '21Lectures',
+      url: 'https://21lectures.com/partner/dezentralschweiz/'
     },
     {
-      name: "21 Lessons",
-      url: "https://21lessons.com/"
+      name: 'Bitcoin Block',
+      url: 'https://bitcoinblock.study/'
     },
     {
-      name: "House of Satoshi",
-      url: "https://www.house-of-satoshi.ch/"
+      name: 'House of Satoshi',
+      url: 'https://www.house-of-satoshi.ch/'
     }
   ],
   'Vereine': [
@@ -150,6 +162,10 @@ const communityLinks = {
       name: 'Pocket',
       url: 'https://pocketbitcoin.com/'
     },
+    {
+      name: 'BitBox',
+      url: 'https://bitbox.swiss/dezentralschweiz'
+    },
     {
       name: 'Bitagent',
       url: 'http://bitagent.ch/'
@@ -161,6 +177,10 @@ const communityLinks = {
     {
       name: 'Bittr',
       url: 'https://getbittr.com/'
+    },
+    {
+      name: 'ZeusATM',
+      url: 'https://zeusatm.ch/'
     }
   ],
   'Shops': [
@@ -175,7 +195,11 @@ const communityLinks = {
     {
       name: 'Funtoshi ♟️',
       url: 'https://funtoshi.com/'
-    }
+    },
+    {
+      name: 'Yourdevice',
+      url: 'https://yourdevice.ch/'
+    },    
   ]
 };
 

diff --git a/datasets/shitcoinLists.js b/datasets/shitcoinLists.js
@@ -1,5 +1,5 @@
 const ethereumTriggerWords = [
-    "ethereum", "ether", "vitalik", "buterin", "solidity", "etherium", "ethirium", "ithirium", "ethreum", "etherum", "etherium", "etheruem"
+    "ethereum", "ether", "vitalik", "buterin", "solidity", "etherium", "ethirium", "ithirium", "ethreum", "etherum", "etherium", "etheruem", "eth"
 ];
 
 const ethereumResponses = [

diff --git a/handlers/adminApprovalHandler.js b/handlers/adminApprovalHandler.js
@@ -4,13 +4,17 @@ import {
 import {
     handleAdminMeetupSuggestionApproval
 } from './meetupHandlers/meetupSuggestionHandler.js'
+import {
+    postWeeklyMeetups
+} from '../scheduledTasks.js'
 
 const handleAdminApproval = async (bot, callbackQuery, action) => {
     if (action.startsWith('approve_delete_') || action.startsWith('reject_delete_')) {
-        handleAdminMeetupDeletionApproval(bot, callbackQuery);
+        await handleAdminMeetupDeletionApproval(bot, callbackQuery);
     } else if (action.startsWith('approve_meetup_') || action.startsWith('reject_meetup_')) {
         await handleAdminMeetupSuggestionApproval(bot, callbackQuery);
     }
+    postWeeklyMeetups(bot);
 };
 
 export {

diff --git a/handlers/linkHandler.js b/handlers/linkHandler.js
@@ -35,9 +35,9 @@ const handleLinks = async (bot, msg, communityLinks) => {
         bot,
         chatId,
         'Wähle eine Kategorie:', {
-            reply_markup: JSON.stringify(keyboard),
-            disable_notification: true
-        },
+        reply_markup: JSON.stringify(keyboard),
+        disable_notification: true
+    },
         'lastLinksMessageId'
     );
 
@@ -50,16 +50,11 @@ const handleLinksCallback = async (bot, callbackQuery) => {
     const chatId = msg.chat.id;
 
     if (action === 'links_cancel') {
-        // Handle cancel action
-        await bot.answerCallbackQuery(callbackQuery.id, {
-            text: 'Aktion abgebrochen'
-        });
+        await bot.answerCallbackQuery(callbackQuery.id, { text: 'Aktion abgebrochen' });
         try {
-            // Delete the selection message
             deleteMessage(bot, chatId, msg.message_id);
             delete userStates[chatId].lastLinksMessageId;
 
-            // Delete the last category message if it exists
             if (userStates[chatId]?.lastLinksCategoryMessageId) {
                 deleteMessage(bot, chatId, userStates[chatId].lastLinksCategoryMessageId);
                 delete userStates[chatId].lastLinksCategoryMessageId;
@@ -71,13 +66,17 @@ const handleLinksCallback = async (bot, callbackQuery) => {
         const category = action.split('_')[1];
         const links = communityLinks[category];
         let message = `<b>${category}:\n\n</b>`;
+
         links.forEach(link => {
-            message += `${link.name}\n${link.url}\n\n`;
+            let groupName = link.name;
+            if (link.id && link.id === chatId.toString()) {
+                groupName += ' (diese Gruppe)';
+            }
+            message += `${groupName}\n${link.url}\n\n`;
         });
 
         await bot.answerCallbackQuery(callbackQuery.id);
 
-        // Delete the previous category message if it exists
         if (userStates[chatId]?.lastLinksCategoryMessageId) {
             deleteMessage(bot, chatId, userStates[chatId].lastLinksCategoryMessageId);
         }
@@ -86,10 +85,10 @@ const handleLinksCallback = async (bot, callbackQuery) => {
             bot,
             chatId,
             message, {
-                parse_mode: 'HTML',
-                disable_web_page_preview: true,
-                disable_notification: true
-            },
+            parse_mode: 'HTML',
+            disable_web_page_preview: true,
+            disable_notification: true
+        },
             'lastLinksCategoryMessageId'
         );