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 }} 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); }