Skip to content

Potential fix for outdated firefox and some safari browsers not being able to send messages #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
7w1 wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −10
Open

Potential fix for outdated firefox and some safari browsers not being able to send messages #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/app/components/editor/output.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ const elementToCustomHtml = (
return sanitizeText(matrixTo);
}
case BlockType.Emoticon:
return node.key.startsWith('mxc://')
return node.key?.startsWith('mxc://')
? `<img data-mx-emoticon src="${node.key}" alt="${sanitizeText(
node.shortcode
)}" title="${sanitizeText(node.shortcode)}" height="32" />`
: sanitizeText(node.key);
: sanitizeText(node.key ?? '');
case BlockType.Link:
return testMatrixTo(node.href)
? sanitizeText(node.href)
Expand Down Expand Up @@ -111,10 +111,9 @@ export const toMatrixCustomHTML = (

// strip nicknames if needed
if (opts.stripNickname && opts.nickNameReplacement) {
opts.nickNameReplacement?.keys().forEach((key) => {
const replacement = opts.nickNameReplacement!.get(key) ?? '';
for (const [key, replacement] of opts.nickNameReplacement) {
line = line.replaceAll(key, replacement);
});
}
}
markdownLines += line;
if (index === targetNodes.length - 1) {
Expand Down Expand Up @@ -145,7 +144,7 @@ const elementToPlainText = (node: CustomElement, children: string): string => {
case BlockType.Mention:
return node.name === '@room' ? node.name : node.id;
case BlockType.Emoticon:
return node.key.startsWith('mxc://') ? `:${node.shortcode}:` : node.key;
return node.key?.startsWith('mxc://') ? `:${node.shortcode}:` : (node.key ?? '');
case BlockType.Link:
return `[${children}](${node.href})`;
case BlockType.Command:
Expand Down Expand Up @@ -182,10 +181,9 @@ export const toPlainText = (
text = text.replaceAll(SPOILEREDLINKINPUTREGEX, '$1');

if (stripNickname && nickNameReplacement) {
nickNameReplacement?.keys().forEach((key) => {
const replacement = nickNameReplacement.get(key) ?? '';
for (const [key, replacement] of nickNameReplacement) {
text = text.replaceAll(key, replacement);
});
}
}
return text;
}
Expand All @@ -211,7 +209,7 @@ export const toRawText = (node: Descendant | Descendant[]): string => {
case BlockType.Link:
return `[${children}](${node.href})`;
case BlockType.Emoticon:
return node.key.startsWith('mxc://') ? `:${node.shortcode}:` : node.key;
return node.key?.startsWith('mxc://') ? `:${node.shortcode}:` : (node.key ?? '');
case BlockType.Mention:
return node.name === '@room' ? node.name : node.id;
case BlockType.Command:
Expand Down
Loading