From 2adcdff131bf9485661defc0095ba947440a2953 Mon Sep 17 00:00:00 2001 From: David Vitor Antonio Date: Thu, 13 Mar 2025 10:58:03 -0300 Subject: [PATCH 1/5] fix markdown --- package.json | 2 +- packages/channels/src/content/types.ts | 1 + packages/channels/src/telegram/renderers/carousel.ts | 10 +++++++--- packages/channels/src/telegram/renderers/choices.ts | 2 +- packages/server/package.json | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2135626bc..7757a2831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@botpress/messaging", - "version": "1.2.17", + "version": "1.2.18", "description": "Botpress messaging repo", "author": "Botpress, Inc.", "license": "AGPL-3.0", diff --git a/packages/channels/src/content/types.ts b/packages/channels/src/content/types.ts index e7879138d..d0be0bb33 100644 --- a/packages/channels/src/content/types.ts +++ b/packages/channels/src/content/types.ts @@ -48,6 +48,7 @@ export interface CardContent extends Content { subtitle?: string image?: string actions: ActionButton[] + markdown?: boolean } export interface LocationContent extends Content { diff --git a/packages/channels/src/telegram/renderers/carousel.ts b/packages/channels/src/telegram/renderers/carousel.ts index 2db7e101c..20f3eb8a5 100644 --- a/packages/channels/src/telegram/renderers/carousel.ts +++ b/packages/channels/src/telegram/renderers/carousel.ts @@ -30,7 +30,7 @@ export class TelegramCarouselRenderer extends CarouselRenderer { } endRenderCard(context: Context, card: CardContent) { - const text = `*${card.title}*${card.subtitle ? '\n' + card.subtitle : ''}` + const text = `${card.title}${card.subtitle ? '\n' + card.subtitle : ''}` if (card.image) { context.channel.messages.push({ action: 'upload_photo' }) @@ -39,12 +39,16 @@ export class TelegramCarouselRenderer extends CarouselRenderer { url: card.image, filename: path.basename(card.image) }, - extra: { caption: text, parse_mode: 'Markdown', ...Markup.inlineKeyboard(context.buttons) } + extra: { + caption: text, + ...(card.markdown && { parse_mode: 'Markdown' }), + ...Markup.inlineKeyboard(context.buttons) + } }) } else { context.channel.messages.push({ text, - extra: Markup.inlineKeyboard(context.buttons) + extra: { ...(card.markdown && { parse_mode: 'Markdown' }), ...Markup.inlineKeyboard(context.buttons) } }) } } diff --git a/packages/channels/src/telegram/renderers/choices.ts b/packages/channels/src/telegram/renderers/choices.ts index 345978046..48e09731e 100644 --- a/packages/channels/src/telegram/renderers/choices.ts +++ b/packages/channels/src/telegram/renderers/choices.ts @@ -10,6 +10,6 @@ export class TelegramChoicesRenderer extends ChoicesRenderer { } const buttons = payload.choices.map((x) => Markup.button.callback(x.title, x.value)) - context.messages[0].extra = Markup.keyboard(buttons).oneTime() + context.messages[0].extra = { ...context.messages[0].extra, ...Markup.keyboard(buttons).oneTime() } } } diff --git a/packages/server/package.json b/packages/server/package.json index d84bf8685..6fc488f9b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@botpress/messaging-server", - "version": "1.2.17", + "version": "1.2.18", "main": "index.ts", "license": "AGPL-3.0", "scripts": { From 3e0ae104ad43b36a3ed41af4680171b88bbd7de3 Mon Sep 17 00:00:00 2001 From: David Vitor Antonio Date: Thu, 13 Mar 2025 11:07:06 -0300 Subject: [PATCH 2/5] update workflow --- .github/workflows/build.yml | 2 +- .nvmrc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce433dd73..697a82f77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} diff --git a/.nvmrc b/.nvmrc index b6a7d89c6..e69de29bb 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +0,0 @@ -16 From 13dc40e66fd527eccdbe88668e1360d139aa5f2d Mon Sep 17 00:00:00 2001 From: David Vitor Antonio Date: Thu, 13 Mar 2025 11:28:42 -0300 Subject: [PATCH 3/5] fix --- .github/workflows/build.yml | 2 +- .nvmrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 697a82f77..23583dfad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@master - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' cache: 'yarn' diff --git a/.nvmrc b/.nvmrc index e69de29bb..e2838c8b8 100644 --- a/.nvmrc +++ b/.nvmrc @@ -0,0 +1 @@ +v16.14.0 \ No newline at end of file From 91157ecd763ac6924baa78deca8903f9d84ff627 Mon Sep 17 00:00:00 2001 From: David Vitor Antonio Date: Thu, 13 Mar 2025 11:54:39 -0300 Subject: [PATCH 4/5] fix --- .github/workflows/tests.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ef36aa9f..9119c2f18 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -169,20 +169,25 @@ jobs: steps: - name: Checkout code uses: actions/checkout@master - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' cache: 'yarn' + + - name: Install Firefox + run: sudo apt-get install -y firefox + + - name: Upgrade Cypress + run: yarn add cypress@latest --dev + - name: Fetch Node Packages run: | yarn --immutable yarn build - name: Run e2e tests - run: | - yarn test:chat:${{ matrix.browser }} + run: xvfb-run --auto-servernum yarn test:chat:${{ matrix.browser }} - name: Run unit tests working-directory: ./packages/inject - run: | - yarn test + run: yarn test From 00bf9fc3bdd60bc0d84697da46b556781f610585 Mon Sep 17 00:00:00 2001 From: David Vitor Antonio Date: Thu, 13 Mar 2025 12:41:18 -0300 Subject: [PATCH 5/5] fix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9119c2f18..4dde65ce0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -164,7 +164,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - browser: ['chrome', 'firefox'] + browser: ['chrome'] steps: - name: Checkout code