small refactoring

Author: kondaurovDev

docs/index.html

@@ -54,7 +54,8 @@
     <div class="container">
         <div class="links">
             <a href="/telegram-bot-api/">Telegram Bot API Documentation</a>
-            <a href="/telegram-bot-playground/">Bot Editor</a>
+            <a href="/telegram-bot-playground/">Bot Playground</a>
+            
         </div>
     </div>
 </body>

docs/telegram-bot-playground/assets/index-D5yhjlgw.js

@@ -23,12 +23,13 @@ export default {
       }
     }
 
-    console.log("got a message", msg.text)
-
-    return {
-      type: "message",
-      text: "hey :)"
+    if (msg.text) { // reply with "hey" on any text message
+      return {
+        type: "message",
+        text: "hey 😇"
+      }
     }
+
   },
 } satisfies BotMessageHandlers
 

docs/telegram-bot-playground/assets/index-jDxP3pDx.js

@@ -3,9 +3,12 @@ import type { BotMessageHandlers } from "@effect-ak/tg-bot-client"
 export default {
   on_message: (msg) => {
 
-    return {
-      type: "message",
-      text: "hey :)"
+    if (msg.text) {
+      return {
+        type: "message",
+        text: "hey 😀"
+      }
     }
+
   },
 } satisfies BotMessageHandlers

docs/telegram-bot-playground/example/command.ts

@@ -18,9 +18,12 @@ export default {
       }
     }
 
-    return {
-      type: "message",
-      text: "hey, send me a message in the format '3+3+3' and I will return you the sum of it in a text file"
+    if (msg.text) { //reply on any text message
+      return {
+        type: "message",
+        text: "hey 🙃, send me a message in the format '3+3+3' and I will return you the sum of it in a text file"
+      }
     }
+
   },
 } satisfies BotMessageHandlers

docs/telegram-bot-playground/example/empty.ts

@@ -9,7 +9,7 @@
   <link rel="icon" type="image/png" sizes="32x32" href="./favicon.ico">
 
 
-  <script type="module" crossorigin src="./assets/index-jDxP3pDx.js"></script>
+  <script type="module" crossorigin src="./assets/index-D5yhjlgw.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-BzQa5oof.css">
 </head>
 
@@ -53,7 +53,7 @@ <h2>Telegram Bot Playground 🤖 </h2>
         x-model="$store.state.selectedExample"
         @change="$dispatch('change-example')"
       >
-        <option value="empty.ts">Empty</option>
+        <option value="empty.ts">Simple Bot</option>
         <option value="command.ts">Command Bot</option>
         <option value="file.ts">File Bot</option>
       </select>

docs/telegram-bot-playground/example/file.ts

@@ -5,7 +5,7 @@ export const setupDts = async (
   monaco: Monaco
 ) => {
 
-  const dts = await fetchText("https://cdn.jsdelivr.net/npm/@effect-ak/tg-bot-client@0.2.2/dist/index.d.ts");
+  const dts = await fetchText("https://cdn.jsdelivr.net/npm/@effect-ak/tg-bot-client@0.3.3/dist/index.d.ts");
 
   monaco.languages.typescript.typescriptDefaults.setExtraLibs([
     {

docs/telegram-bot-playground/index.html

@@ -1,3 +1,4 @@
+import { makeTgBotClient } from "@effect-ak/tg-bot-client";
 import type { GlobalState } from "#/tg-bot-playground/main";
 import type { TsTextModel } from "#/common/editor/ts-text-model";
 
@@ -14,8 +15,6 @@ export const makeRunnableBot =
           return;
         }
 
-        console.log("code", code.serialized)
-
         worker.postMessage({
           command: 'run-bot',
           token: state.bot.token,
@@ -28,7 +27,7 @@ export const makeRunnableBot =
       })
 
 export const checkTokenAndRun =
-  (state: GlobalState, runnableBot: RunnableBot) => {
+  async (state: GlobalState, runnableBot: RunnableBot) => {
 
     const token = state.bot.token;
 
@@ -37,21 +36,29 @@ export const checkTokenAndRun =
       return
     };
 
-    fetch(`https://api.telegram.org/bot${token}/getMe`)
-      .then(_ => _.json())
+    const client =
+      makeTgBotClient({
+        bot_token: token
+      });
+
+    await client.execute("get_me", {})
       .then(info => {
-        if (info.ok) {
-          state.bot.name = info.result.first_name;
-          state.bot.isReachable = true;
-          console.log("Running bot")
-          runnableBot(state);
-        } else {
-          state.bot.name = "nameless";
-          state.bot.isReachable = false;
-        }
+        state.bot.name = info.first_name;
+        state.bot.isReachable = true;
+        console.log("Running bot")
+        return runnableBot(state);
       }).catch(error => {
-        console.warn("check token error", error);
+        state.botUpdates.push(error);
+        state.bot.name = "nameless";
         state.bot.isReachable = false;
       });
 
+    const webhook =
+      await client.execute("get_webhook_info", {});
+
+    if (webhook.url) {
+      state.botUpdates.push("Cannot work with webhooks, delete it first");
+      state.bot.isReachable = false;
+    }
+
   }

src/common/editor/setup.ts

@@ -53,7 +53,7 @@ <h2>Telegram Bot Playground 🤖 </h2>
         x-model="$store.state.selectedExample"
         @change="$dispatch('change-example')"
       >
-        <option value="empty.ts">Empty</option>
+        <option value="empty.ts">Simple Bot</option>
         <option value="command.ts">Command Bot</option>
         <option value="file.ts">File Bot</option>
       </select>

src/tg-bot-playground/bot-launcher/run.ts

@@ -73,7 +73,7 @@ async function setup() {
 
   botLauncher.worker.onmessage = (event: MessageEvent) => {
     const data = event.data
-    console.log('got message from worker', data);
+    // console.log('got message from worker', data);
     if (!data) return;
     if (data.botState) {
       Object.assign(state.bot, data.botState)

src/tg-bot-playground/index.html

@@ -23,12 +23,13 @@ export default {
       }
     }
 
-    console.log("got a message", msg.text)
-
-    return {
-      type: "message",
-      text: "hey :)"
+    if (msg.text) { // reply with "hey" on any text message
+      return {
+        type: "message",
+        text: "hey 😇"
+      }
     }
+
   },
 } satisfies BotMessageHandlers
 

src/tg-bot-playground/main.ts

@@ -3,9 +3,12 @@ import type { BotMessageHandlers } from "@effect-ak/tg-bot-client"
 export default {
   on_message: (msg) => {
 
-    return {
-      type: "message",
-      text: "hey :)"
+    if (msg.text) {
+      return {
+        type: "message",
+        text: "hey 😀"
+      }
     }
+
   },
 } satisfies BotMessageHandlers

src/tg-bot-playground/static/example/command.ts

@@ -18,9 +18,12 @@ export default {
       }
     }
 
-    return {
-      type: "message",
-      text: "hey, send me a message in the format '3+3+3' and I will return you the sum of it in a text file"
+    if (msg.text) { //reply on any text message
+      return {
+        type: "message",
+        text: "hey 🙃, send me a message in the format '3+3+3' and I will return you the sum of it in a text file"
+      }
     }
+
   },
 } satisfies BotMessageHandlers