Make the name part in from e-mails optional. Closes #1602.

knadh · Dec 30, 2023 · 2feb1b0 · 2feb1b0
1 parent b2a5e37
commit 2feb1b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/campaigns.go b/cmd/campaigns.go
@@ -47,7 +47,7 @@ type campaignContentReq struct {
 }
 
 var (
-	regexFromAddress = regexp.MustCompile(`(.+?)\s<(.+?)@(.+?)>`)
+	regexFromAddress = regexp.MustCompile(`((.+?)\s)?<(.+?)@(.+?)>`)
 )
 
 // handleGetCampaigns handles retrieval of campaigns.

diff --git a/frontend/src/views/settings/general.vue b/frontend/src/views/settings/general.vue
@@ -32,7 +32,7 @@
     <b-field :label="$t('settings.general.fromEmail')" label-position="on-border"
       :message="$t('settings.general.fromEmailHelp')">
       <b-input v-model="data['app.from_email']" name="app.from_email"
-        placeholder="Listmonk <[email protected]>" pattern="(.+?)\s<(.+?)@(.+?)>" :maxlength="300" />
+        placeholder="Listmonk <[email protected]>" pattern="((.+?)\s)?<(.+?)@(.+?)>" :maxlength="300" />
     </b-field>
     <b-field :label="$t('settings.general.adminNotifEmails')" label-position="on-border"
       :message="$t('settings.general.adminNotifEmailsHelp')">