@codebam/cf-workers-telegram-bot 12.0.0 → 12.2.0

package/dist/telegram_bot.js

@@ -160,7 +160,7 @@ export default class TelegramBot {
                     console.log(this.update);
                     const ctx = new TelegramExecutionContext(this, this.update);
                     this.currentContext = ctx;
-                    if (!(await ctx.shouldProcess())) {
+                    if (ctx.shouldProcess && !(await ctx.shouldProcess())) {
                         console.log('Skipping update processing based on context validation');
                         return new Response('ok');
                     }

package/dist/telegram_execution_context.js

@@ -110,7 +110,7 @@ export default class TelegramExecutionContext {
                 console.warn('Failed to fetch business connection info:', e);
             }
         }
-        if (ownerId !== undefined && this.getChatId() === ownerId.toString()) {
+        if (ownerId !== undefined && (this.getChatId() === ownerId.toString() || this.userId === ownerId)) {
             return false;
         }
         return true;
@@ -345,6 +345,9 @@ export default class TelegramExecutionContext {
      * @returns Promise with the API response
      */
     async sendTyping() {
+        if (this.update_type === 'guest_message') {
+            return null;
+        }
         const params = {
             chat_id: this.getChatId(),
             message_thread_id: this.getThreadId(),

package/dist/utils.js

@@ -31,17 +31,18 @@ export async function markdownToHtml(s) {
     };
     renderer.strong = ({ tokens }) => `<b>${renderer.parser.parseInline(tokens)}</b>`;
     renderer.em = ({ tokens }) => `<i>${renderer.parser.parseInline(tokens)}</i>`;
-    renderer.codespan = ({ text }) => `<code>${text}</code>`;
+    const escapeHtml = (text) => text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    renderer.codespan = ({ text }) => `<code>${escapeHtml(text)}</code>`;
     renderer.code = ({ text, lang }) => {
-        const escapedText = text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        const escapedText = escapeHtml(text);
         if (lang) {
             return `<pre><code class="language-${lang}">${escapedText}</code></pre>\n`;
         }
         return `<pre><code>${escapedText}</code></pre>\n`;
     };
     renderer.del = ({ tokens }) => `<s>${renderer.parser.parseInline(tokens)}</s>`;
-    renderer.link = ({ href, tokens }) => `<a href="${href}">${renderer.parser.parseInline(tokens)}</a>`;
-    renderer.image = ({ href, text }) => `<a href="${href}">${text}</a>`;
+    renderer.link = ({ href, tokens }) => `<a href="${escapeHtml(href)}">${renderer.parser.parseInline(tokens)}</a>`;
+    renderer.image = ({ href, text }) => `<a href="${escapeHtml(href)}">${escapeHtml(text)}</a>`;
     renderer.blockquote = ({ tokens }) => {
         return `<blockquote>${renderer.parser.parse(tokens)}</blockquote>\n`;
     };
@@ -60,14 +61,14 @@ export async function markdownToHtml(s) {
             }
         }
         // Escape everything else
-        return text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        return escapeHtml(text);
     };
     renderer.text = (token) => {
         if ('tokens' in token && token.tokens) {
             return renderer.parser.parseInline(token.tokens);
         }
         // Escape standard HTML entities
-        return token.text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        return escapeHtml(token.text);
     };
     marked.setOptions({
         gfm: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "12.0.0",
+	"version": "12.2.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",