diff options
| author | Gabe Kangas <gabek@real-ity.com> | 2022-03-07 23:45:32 -0800 |
|---|---|---|
| committer | Gabe Kangas <gabek@real-ity.com> | 2022-03-07 23:45:32 -0800 |
| commit | 31e0d9dc0805a41e240e1998a7ba572503546bb5 (patch) | |
| tree | 3bc69ed002ec0883ec97768e194b48c8b3e75349 | |
| parent | c639e0b1282d23a0fa4e9dda3f66b3fd322dc4e8 (diff) | |
Standardize email config prop names
| -rw-r--r-- | controllers/admin/serverConfig.go | 4 | ||||
| -rw-r--r-- | models/notification.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/controllers/admin/serverConfig.go b/controllers/admin/serverConfig.go index f2acb6e35..083851f2d 100644 --- a/controllers/admin/serverConfig.go +++ b/controllers/admin/serverConfig.go @@ -80,7 +80,7 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) { Notifications: notificationsConfigResponse{ Discord: data.GetDiscordConfig(), Browser: data.GetBrowserPushConfig(), - Email: data.GetSMTPConfiguration(), + SMTP: data.GetSMTPConfiguration(), Mailjet: data.GetMailjetConfiguration(), Twitter: data.GetTwitterConfiguration(), }, @@ -154,7 +154,7 @@ type federationConfigResponse struct { type notificationsConfigResponse struct { Browser models.BrowserNotificationConfiguration `json:"browser"` Discord models.DiscordConfiguration `json:"discord"` - Email models.SMTPConfiguration `json:"email"` + SMTP models.SMTPConfiguration `json:"smtp"` Mailjet models.MailjetConfiguration `json:"mailjet"` Twitter models.TwitterConfiguration `json:"twitter"` } diff --git a/models/notification.go b/models/notification.go index a3d767750..390b777b2 100644 --- a/models/notification.go +++ b/models/notification.go @@ -27,7 +27,7 @@ type SMTPConfiguration struct { ListAddress string `json:"listAddress,omitempty"` Username string `json:"username,omitempty"` Password string `json:"password,omitempty"` - Server string `json:"smtpServer,omitempty"` + Server string `json:"server,omitempty"` FromAddress string `json:"fromAddress,omitempty"` GoLiveSubject string `json:"goLiveSubject,omitempty"` } |