From 8589228c73a8abb5de890bfbd3fa8ab2807dfda0 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 20 May 2020 16:25:25 +0200
Subject: Replace IMAPMessage.TextPartName with TextPart

---
 themes/alps/mailbox.html      | 2 +-
 themes/alps/message.html      | 6 +++---
 themes/sourcehut/mailbox.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'themes')

diff --git a/themes/alps/mailbox.html b/themes/alps/mailbox.html
index dfc79fe..8d9aa54 100644
--- a/themes/alps/mailbox.html
+++ b/themes/alps/mailbox.html
@@ -43,7 +43,7 @@
           {{ end }}
           </div>
           <div class="message-list-subject  message-list-item {{ if not (.HasFlag "\\Seen") }}message-list-unread{{ end }}">
-            <a href="{{.URL}}?part={{.TextPartName}}">
+            <a href="{{.TextPart.URL false}}">
               {{if .Envelope.Subject}}
                 {{.Envelope.Subject}}
               {{else}}
diff --git a/themes/alps/message.html b/themes/alps/message.html
index a60af4e..6e88297 100644
--- a/themes/alps/message.html
+++ b/themes/alps/message.html
@@ -123,10 +123,10 @@
 
             <span class="followups">
               {{if .Message.HasFlag "\\Draft"}}
-                <a class="action-group button-link" href="{{.Message.URL}}/edit?part={{.Message.TextPartName}}">Edit draft</a>
+                <a class="action-group button-link" href="{{.Message.URL}}/edit?part={{.Message.TextPart.PathString}}">Edit draft</a>
               {{else}}
-                <a class="action-group button-link" href="{{.Message.URL}}/reply?part={{.Message.TextPartName}}">Reply</a>
-                <a class="action-group button-link" href="{{.Message.URL}}/forward?part={{.Message.TextPartName}}">Forward</a>
+                <a class="action-group button-link" href="{{.Message.URL}}/reply?part={{.Message.TextPart.PathString}}">Reply</a>
+                <a class="action-group button-link" href="{{.Message.URL}}/forward?part={{.Message.TextPart.PathString}}">Forward</a>
               {{end}}
             </span>
           </div>
diff --git a/themes/sourcehut/mailbox.html b/themes/sourcehut/mailbox.html
index 58eb52b..1175cbe 100644
--- a/themes/sourcehut/mailbox.html
+++ b/themes/sourcehut/mailbox.html
@@ -53,7 +53,7 @@
           <li class="nav-item">
             <a
               class="nav-link"
-              href="/message/{{$.Mailbox.Name | pathescape}}/{{.Uid}}?part={{.TextPartName}}"
+              href="{{.TextPart.URL false}}"
             >
             <span class="text-muted date">
               {{ .Envelope.Date | formatdate }}
-- 
cgit v1.2.3