fix: stop adding RE and FWD if alrady in the msg title (#131)

fix: stop adding RE and FWD if already in the msg title
zextras · Jul 21, 2022 · a43425b · a43425b
1 parent a848b74
commit a43425b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/store/editor-slice.ts b/src/store/editor-slice.ts
@@ -53,6 +53,12 @@ type CreateEditorPayload = {
 	};
 };
 
+// Regex reply msg title
+const REPLY_REGEX = /(^(re:\s)+)/i;
+
+// Regex forward msg title
+const FORWARD_REGEX = /(^(fwd:\s)+)/i;
+
 function createEditorReducer(
 	state: EditorsStateType,
 	{ payload }: { payload: CreateEditorPayload }
@@ -138,7 +144,7 @@ function createEditorReducer(
 						id: payload.id,
 						text: textWithSignatureRepliesForwards,
 						to: retrieveReplyTo(payload.original),
-						subject: `RE: ${payload.original.subject}`,
+						subject: `RE: ${payload.original.subject.replace(REPLY_REGEX, '')}`,
 						original: payload.original,
 						attach: { mp: retrieveAttachmentsType(payload.original, 'attachment') },
 						urgent: payload.original.urgent,
@@ -156,7 +162,7 @@ function createEditorReducer(
 						text: textWithSignatureRepliesForwards,
 						to: retrieveALL(payload.original, payload.accounts),
 						cc: retrieveCC(payload.original, payload.accounts),
-						subject: `RE: ${payload.original.subject}`,
+						subject: `RE: ${payload.original.subject.replace(REPLY_REGEX, '')}`,
 						original: payload.original,
 						attach: { mp: retrieveAttachmentsType(payload.original, 'attachment') },
 						urgent: payload.original.urgent,
@@ -172,7 +178,7 @@ function createEditorReducer(
 					state.editors[payload.editorId] = {
 						...empty,
 						text: textWithSignatureRepliesForwards,
-						subject: `Fwd: ${payload.original.subject}`,
+						subject: `FWD: ${payload.original.subject.replace(FORWARD_REGEX, '')}`,
 						original: payload.original,
 						attach: { mp: retrieveAttachmentsType(payload.original, 'attachment') },
 						urgent: payload.original.urgent,