Deuxfleurs/alps
23
1
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity

Linkify address lists

Browse source
This commit is contained in:
Simon Ser 2019-12-17 13:02:38 +01:00
parent 0c21c501ff
commit e2d70ba6ca
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/base/public/message.html
View file

@ -49,24 +49,32 @@
</form> </form>
{{end}} {{end}}
{{define "addr-list"}}
{{range $i := .}}
{{if $i}},{{end}}
{{.PersonalName}}
&lt;<a href="/compose?to={{.Address}}">{{.Address}}</a>&gt;
{{end}}
{{end}}
<ul> <ul>
<li> <li>
<strong>Date</strong>: {{.Message.Envelope.Date | formatdate}} <strong>Date</strong>: {{.Message.Envelope.Date | formatdate}}
</li> </li>
<li> <li>
<strong>From</strong>: {{.Message.Envelope.From | formataddrlist}} <strong>From</strong>: {{template "addr-list" .Message.Envelope.From}}
</li> </li>
<li> <li>
<strong>To</strong>: {{.Message.Envelope.To | formataddrlist}} <strong>To</strong>: {{template "addr-list" .Message.Envelope.To}}
</li> </li>
{{if .Message.Envelope.Cc}} {{if .Message.Envelope.Cc}}
<li> <li>
<strong>Cc</strong>: {{.Message.Envelope.Cc | formataddrlist}} <strong>Cc</strong>: {{template "addr-list" .Message.Envelope.Cc}}
</li> </li>
{{end}} {{end}}
{{if .Message.Envelope.Bcc}} {{if .Message.Envelope.Bcc}}
<li> <li>
<strong>Bcc</strong>: {{.Message.Envelope.Bcc | formataddrlist}} <strong>Bcc</strong>: {{template "addr-list" .Message.Envelope.Bcc}}
</li> </li>
{{end}} {{end}}
</ul> </ul>

5
plugins/base/routes.go
View file

@ -263,6 +263,11 @@ func handleCompose(ectx echo.Context) error {
msg.From = ctx.Session.Username() msg.From = ctx.Session.Username()
} }
msg.To = strings.Split(ctx.QueryParam("to"), ",")
msg.Subject = ctx.QueryParam("subject")
msg.Text = ctx.QueryParam("body")
msg.InReplyTo = ctx.QueryParam("in-reply-to")
if ctx.Request().Method == http.MethodGet && ctx.Param("uid") != "" { if ctx.Request().Method == http.MethodGet && ctx.Param("uid") != "" {
// This is a reply // This is a reply
mboxName, uid, err := parseMboxAndUid(ctx.Param("mbox"), ctx.Param("uid")) mboxName, uid, err := parseMboxAndUid(ctx.Param("mbox"), ctx.Param("uid"))

8
plugins/base/template.go
View file

@ -3,7 +3,6 @@ package koushinbase
import ( import (
"html/template" "html/template"
"net/url" "net/url"
"strings"
"time" "time"
"github.com/emersion/go-imap" "github.com/emersion/go-imap"
@ -16,13 +15,6 @@ var templateFuncs = template.FuncMap{
"pathescape": func(s string) string { "pathescape": func(s string) string {
return url.PathEscape(s) return url.PathEscape(s)
}, },
"formataddrlist": func(addrs []*imap.Address) string {
l := make([]string, len(addrs))
for i, addr := range addrs {
l[i] = addr.PersonalName + " <" + addr.Address() + ">"
}
return strings.Join(l, ", ")
},
"formatdate": func(t time.Time) string { "formatdate": func(t time.Time) string {
return t.Format("Mon Jan 02 15:04") return t.Format("Mon Jan 02 15:04")
}, },