aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2020-11-19 11:48:12 -0500
committerDrew DeVault <sir@cmpwn.com>2020-11-19 11:48:12 -0500
commit797b426ec6a6fc0222ff9dc94e33346abcb82663 (patch)
tree1acdfe95660362654b156fcd4771159749894650
parent51498a2dc37987f55b022efb961b68a282be17ed (diff)
downloadalps-797b426ec6a6fc0222ff9dc94e33346abcb82663.tar.gz
alps-797b426ec6a6fc0222ff9dc94e33346abcb82663.zip
Add "Full name" option to settings
This provides the name portion of your From header in the compose view.
-rw-r--r--plugins/base/routes.go19
-rw-r--r--themes/alps/settings.html11
2 files changed, 28 insertions, 2 deletions
diff --git a/plugins/base/routes.go b/plugins/base/routes.go
index f20097e..7a8b845 100644
--- a/plugins/base/routes.go
+++ b/plugins/base/routes.go
@@ -531,7 +531,19 @@ func handleCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOpti
}
if msg.From == "" && strings.ContainsRune(ctx.Session.Username(), '@') {
- msg.From = ctx.Session.Username()
+ settings, err := loadSettings(ctx.Session.Store())
+ if err != nil {
+ return err
+ }
+ if settings.From != "" {
+ addr := mail.Address{
+ Name: settings.From,
+ Address: ctx.Session.Username(),
+ }
+ msg.From = addr.String()
+ } else {
+ msg.From = ctx.Session.Username()
+ }
}
if ctx.Request().Method == http.MethodPost {
@@ -1134,6 +1146,7 @@ const maxMessagesPerPage = 100
type Settings struct {
MessagesPerPage int
Signature string
+ From string
}
func loadSettings(s alps.Store) (*Settings, error) {
@@ -1156,6 +1169,9 @@ func (s *Settings) check() error {
if len(s.Signature) > 2048 {
return fmt.Errorf("Signature must be 2048 characters or fewer")
}
+ if len(s.From) > 512 {
+ return fmt.Errorf("Full name must be 512 characters or fewer")
+ }
return nil
}
@@ -1176,6 +1192,7 @@ func handleSettings(ctx *alps.Context) error {
return echo.NewHTTPError(http.StatusBadRequest, "invalid messages per page: %v", err)
}
settings.Signature = ctx.FormValue("signature")
+ settings.From = ctx.FormValue("from")
if err := settings.check(); err != nil {
return echo.NewHTTPError(http.StatusBadRequest, err)
diff --git a/themes/alps/settings.html b/themes/alps/settings.html
index ebcc532..9fc58ca 100644
--- a/themes/alps/settings.html
+++ b/themes/alps/settings.html
@@ -14,9 +14,18 @@
<main class="settings">
<form method="post">
<div class="action-group">
+ <label for="from">Full name</label>
+ <input
+ type="text"
+ name="from"
+ id="from"
+ value="{{.Settings.From}}"
+ />
+ </div>
+
+ <div class="action-group">
<label for="signature">Message signature</label>
<textarea
- type="number"
name="signature"
id="signature"
rows="5"