@capybara-hq/plugin-telegram 0.1.0-rc.5 → 0.1.0-rc.6

package/.capybara-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "name": "telegram",
-  "version": "0.1.0-rc.5",
+  "version": "0.1.0-rc.6",
   "publisher": "Capybara",
   "description": {
     "en": "Telegram (channel@1 bot over the Bot API: long polling or webhook, inline keyboard cards)",
@@ -17,7 +17,7 @@
     "entry": "./dist/index.mjs",
     "manifest": {
       "name": "telegram",
-      "version": "0.1.0-rc.5",
+      "version": "0.1.0-rc.6",
       "sdk": "^0.1.0-rc.4",
       "provides": [
         "channel@1"

package/dist/index.mjs

@@ -599,10 +599,12 @@ var urlButton = (text, url) => isHttp(url) ? [{ text, url }] : [];
 function cardText(card, locale) {
   const url = card.kind === "connect" || card.kind === "bind" ? card.url : card.webUrl;
   const lines = renderCardAsText(card, locale).split("\n");
-  const last = lines[lines.length - 1];
-  if (lines.length > 1 && last?.endsWith(url)) {
-    lines.pop();
-    const label = markdownToTelegramHtml(last.slice(0, last.length - url.length));
+  let at = lines.length - 1;
+  if (card.kind === "question" && card.state === "pending" && card.textReply !== void 0) at--;
+  const line = lines[at];
+  if (at > 0 && line?.endsWith(url)) {
+    lines.splice(at, 1);
+    const label = markdownToTelegramHtml(line.slice(0, line.length - url.length));
     return { body: markdownToTelegramHtml(lines.join("\n")), linkLine: `${label}${htmlLink(url)}` };
   }
   return { body: markdownToTelegramHtml(lines.join("\n")) };
@@ -649,7 +651,9 @@ async function keyboard(card, locale, tokens) {
     case "question": {
       const f = card.form.fields[0];
       const rows = [];
-      if (card.state === "pending" && f && !f.multiSelect && questionRenderableInline(card.form) && "enum" in f.schema) {
+      if (card.state === "pending" && f && !f.multiSelect && // With textReply the Other path is a plain reply: a field with allowOther still gets its
+      // option buttons, never an Other button.
+      questionRenderableInline(card.form, { textReply: card.textReply !== void 0 }) && "enum" in f.schema) {
         for (const option of f.schema.enum) {
           rows.push(
             await callbackButton(tokens, option, {
@@ -1342,7 +1346,7 @@ function createTelegramChannel(o) {
 // src/index.ts
 var index_default = defineExtension({
   name: "telegram",
-  version: "0.1.0-rc.5",
+  version: "0.1.0-rc.6",
   sdk: "^0.1.0-rc.4",
   provides: [CHANNEL_EXTENSION_POINT],
   permissions: { network: ["api.telegram.org"] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capybara-hq/plugin-telegram",
-  "version": "0.1.0-rc.5",
+  "version": "0.1.0-rc.6",
   "type": "module",
   "license": "Apache-2.0",
   "description": "Telegram (channel@1 bot over the Bot API: long polling or webhook, inline keyboard cards)",