summaryrefslogtreecommitdiff
path: root/packages/backend/src/core
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-06-14 17:13:16 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-06-14 17:13:16 +0000
commit93885530c82fce4da9cc5b1e05d4dd4eaf151934 (patch)
tree2723c3bdcf852d4c01eedc319d1d8f53868bff3a /packages/backend/src/core
parentmerge: Auto-select the first page of reactions on the note "reactions" tab (r... (diff)
parentfix conversion of empty links to mfm URL (diff)
downloadsharkey-93885530c82fce4da9cc5b1e05d4dd4eaf151934.tar.gz
sharkey-93885530c82fce4da9cc5b1e05d4dd4eaf151934.tar.bz2
sharkey-93885530c82fce4da9cc5b1e05d4dd4eaf151934.zip
merge: Don't convert empty HTML elements to MFM (resolves #982) (!1116)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1116 Closes #982 Approved-by: dakkar <dakkar@thenautilus.net> Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/backend/src/core')
-rw-r--r--packages/backend/src/core/MfmService.ts12
1 files changed, 9 insertions, 3 deletions
diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index 551b25394a..839cdf534c 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -75,9 +75,8 @@ export class MfmService {
switch (node.tagName) {
case 'br': {
text += '\n';
- break;
+ return;
}
-
case 'a': {
const txt = getText(node);
const rel = node.attribs.rel;
@@ -123,9 +122,16 @@ export class MfmService {
text += generateLink();
}
- break;
+ return;
}
+ }
+ // Don't produce invalid empty MFM
+ if (node.childNodes.length < 1) {
+ return;
+ }
+
+ switch (node.tagName) {
case 'h1': {
text += '**【';
appendChildren(node.childNodes);