From dc8952ad1802170257de3f1c5be3db0b21c85337 Mon Sep 17 00:00:00 2001
From: Alex Gleason
Date: Tue, 21 Feb 2023 09:00:16 -0600
Subject: [PATCH] Replace `` with empty string in chats and statuses
---
app/soapbox/normalizers/chat-message.ts | 10 ++++++++++
app/soapbox/normalizers/status.ts | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/app/soapbox/normalizers/chat-message.ts b/app/soapbox/normalizers/chat-message.ts
index 642ae0bb3..f11a095b9 100644
--- a/app/soapbox/normalizers/chat-message.ts
+++ b/app/soapbox/normalizers/chat-message.ts
@@ -50,11 +50,21 @@ const normalizeChatMessageEmojiReaction = (chatMessage: ImmutableMap
` to empty string. */
+const fixContent = (chatMessage: ImmutableMap) => {
+ if (chatMessage.get('content') === '') {
+ return chatMessage.set('content', '');
+ } else {
+ return chatMessage;
+ }
+};
+
export const normalizeChatMessage = (chatMessage: Record) => {
return ChatMessageRecord(
ImmutableMap(fromJS(chatMessage)).withMutations(chatMessage => {
normalizeMedia(chatMessage);
normalizeChatMessageEmojiReaction(chatMessage);
+ fixContent(chatMessage);
}),
);
};
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index 277defb8f..57e27806f 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -205,6 +205,15 @@ const normalizeEvent = (status: ImmutableMap) => {
}
};
+/** Rewrite `` to empty string. */
+const fixContent = (status: ImmutableMap) => {
+ if (status.get('content') === '') {
+ return status.set('content', '');
+ } else {
+ return status;
+ }
+};
+
export const normalizeStatus = (status: Record) => {
return StatusRecord(
ImmutableMap(fromJS(status)).withMutations(status => {
@@ -219,6 +228,7 @@ export const normalizeStatus = (status: Record) => {
fixFiltered(status);
fixSensitivity(status);
normalizeEvent(status);
+ fixContent(status);
}),
);
};