From 735bc150113e6a35318d021ec9e91c6e2a226a77 Mon Sep 17 00:00:00 2001 From: Ajay Bura <32841439+ajbura@users.noreply.github.com> Date: Mon, 11 May 2026 22:59:43 +1000 Subject: [PATCH 1/2] fix: empty heading crash on edit msg (#2929) * fix crash when editing message with empty trailing heading * remove unused imports --- src/app/components/CallEmbedProvider.tsx | 1 - src/app/components/editor/input.ts | 8 ++++---- src/app/components/editor/output.ts | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/app/components/CallEmbedProvider.tsx b/src/app/components/CallEmbedProvider.tsx index b50b1f504..a78c210b5 100644 --- a/src/app/components/CallEmbedProvider.tsx +++ b/src/app/components/CallEmbedProvider.tsx @@ -1,6 +1,5 @@ import React, { ReactNode, useCallback, useRef } from 'react'; import { useAtomValue, useSetAtom } from 'jotai'; -import { config } from 'folds'; import { CallEmbedContextProvider, CallEmbedRefContextProvider, diff --git a/src/app/components/editor/input.ts b/src/app/components/editor/input.ts index b56e46ed2..1af30a7f0 100644 --- a/src/app/components/editor/input.ts +++ b/src/app/components/editor/input.ts @@ -193,7 +193,7 @@ const parseBlockquoteNode = ( if (child.name === 'p') { appendLine(); - quoteLines.push(child.children.flatMap((c) => getInlineElement(c, processText))); + quoteLines.push(getInlineElement(child, processText)); return; } @@ -283,7 +283,7 @@ const parseListNode = ( if (child.name === 'li') { appendLine(); - listLines.push(child.children.flatMap((c) => getInlineElement(c, processText))); + listLines.push(getInlineElement(child, processText)); return; } @@ -331,7 +331,7 @@ const parseHeadingNode = ( node: Element, processText: ProcessTextCallback ): HeadingElement | ParagraphElement => { - const children = node.children.flatMap((child) => getInlineElement(child, processText)); + const children = getInlineElement(node, processText); const headingMatch = node.name.match(/^h([123456])$/); const [, g1AsLevel] = headingMatch ?? ['h3', '3']; @@ -394,7 +394,7 @@ export const domToEditorInput = ( appendLine(); children.push({ type: BlockType.Paragraph, - children: node.children.flatMap((child) => getInlineElement(child, processText)), + children: getInlineElement(node, processText), }); return; } diff --git a/src/app/components/editor/output.ts b/src/app/components/editor/output.ts index 5310012bb..2942a8319 100644 --- a/src/app/components/editor/output.ts +++ b/src/app/components/editor/output.ts @@ -11,7 +11,7 @@ import { } from '../../plugins/markdown'; import { findAndReplace } from '../../utils/findAndReplace'; import { sanitizeForRegex } from '../../utils/regex'; -import { getCanonicalAliasOrRoomId, isUserId } from '../../utils/matrix'; +import { isUserId } from '../../utils/matrix'; export type OutputOptions = { allowTextFormatting?: boolean; @@ -215,7 +215,7 @@ export const getMentions = (mx: MatrixClient, roomId: string, editor: Editor): M if (node.name === '@room') { mentionData.room = true; } - + if (isUserId(node.id) && node.id !== mx.getUserId()) { mentionData.users.add(node.id); } From 2864a5e4b8c85d2706623a4fd49634c6d511fa70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 May 2026 15:34:41 +1000 Subject: [PATCH 2/2] chore(deps): bump dawidd6/action-download-artifact from 20 to 21 (#2925) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 20 to 21. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/8305c0f1062bb0d184d09ef4493ecb9288447732...b6e2e70617bc3265edd6dab6c906732b2f1ae151) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-version: '21' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yml index 6fe443636..7d8e321e4 100644 --- a/.github/workflows/deploy-pull-request.yml +++ b/.github/workflows/deploy-pull-request.yml @@ -16,7 +16,7 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Download pr number - uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20 + uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21 with: workflow: ${{ github.event.workflow.id }} run_id: ${{ github.event.workflow_run.id }} @@ -25,7 +25,7 @@ jobs: id: pr run: echo "id=$(> $GITHUB_OUTPUT - name: Download artifact - uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20 + uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21 with: workflow: ${{ github.event.workflow.id }} run_id: ${{ github.event.workflow_run.id }}