From 81f52cc90653c210998a0d85951ef65f09e0f491 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 27 Mar 2020 10:46:32 +0100
Subject: [PATCH] themes/alps: better redirect after performing message
 operations

Go back to the right page.
---
 themes/alps/mailbox.html |  4 ++--
 themes/alps/message.html | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/themes/alps/mailbox.html b/themes/alps/mailbox.html
index 6d870ba..6453d69 100644
--- a/themes/alps/mailbox.html
+++ b/themes/alps/mailbox.html
@@ -7,7 +7,7 @@
     <a href="/compose" class="compose-mail">Compose&nbsp;Mail</a>
     {{$current := .Mailbox}}
     {{range .Mailboxes}}
-      <a href="/mailbox/{{.Name | pathescape}}"
+      <a href="{{.URL}}"
           {{ if eq $current.Name .Name }}class="active"{{ end }}>
         {{ if eq .Name "INBOX" }}
           Inbox
@@ -44,7 +44,7 @@
               {{ end }}
             </td>
             <td width="80%" class="message-list-subject">
-              <a href="/message/{{$.Mailbox.Name | pathescape}}/{{.Uid}}?part={{.TextPartName}}">
+              <a href="{{.URL}}?part={{.TextPartName}}">
                 {{if .Envelope.Subject}}
                   {{.Envelope.Subject}}
                 {{else}}
diff --git a/themes/alps/message.html b/themes/alps/message.html
index 38ae948..3f5a689 100644
--- a/themes/alps/message.html
+++ b/themes/alps/message.html
@@ -25,13 +25,15 @@
   <th colspan="2">
     <div class="actions-wrap">
       <div class="actions-message">
-        <a href="/mailbox/{{.Mailbox.Name | pathescape}}?page={{.MailboxPage}}" class="button-link">« Back</a>
+        {{$back := printf "%v?page=%v" .Mailbox.URL .MailboxPage}}
+        <a href="{{$back}}" class="button-link">« Back</a>
         &nbsp;&nbsp;
 
         {{ if and (ne .Mailbox.Name "Archive") (ne .Mailbox.Name "Drafts") (ne .Mailbox.Name "Sent") }}
         <form method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
           <input type="hidden" name="uids" value="{{.Message.Uid}}">
           <input type="hidden" name="to" value="Archive">
+          <input type="hidden" name="next" value="{{$back}}">
           <button>Archive</button>
         </form>
         {{ end }}
@@ -53,6 +55,7 @@
         {{ if or (eq .Mailbox.Name "INBOX") (eq .Mailbox.Name "Trash") }}
         <form method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
           <input type="hidden" name="uids" value="{{.Message.Uid}}">
+          <input type="hidden" name="next" value="{{$back}}">
           &nbsp;&nbsp;
           <input type="hidden" name="to" value="Junk">
           <button>Report Spam</button>
@@ -62,11 +65,13 @@
         {{ if or (eq .Mailbox.Name "Trash") (eq .Mailbox.Name "Junk") }}
         <form method="post" action="/message/{{.Mailbox.Name | pathescape}}/delete">
           <input type="hidden" name="uids" value="{{.Message.Uid}}">
+          <input type="hidden" name="next" value="{{$back}}">
           <button>Delete Permanently</button>
         </form>
         {{ else }}
         <form method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
           <input type="hidden" name="uids" value="{{.Message.Uid}}">
+          <input type="hidden" name="next" value="{{$back}}">
           &nbsp;&nbsp;
           <input type="hidden" name="to" value="Trash">
           <button>Delete</button>
@@ -75,8 +80,9 @@
 
         <form method="post" action="/message/{{.Mailbox.Name | pathescape}}/flag">
           <input type="hidden" name="uids" value="{{.Message.Uid}}">
-          <input type="hidden" name="flags" value="\Seen">
           <input type="hidden" name="action" value="remove">
+          <input type="hidden" name="flags" value="\Seen">
+          <input type="hidden" name="next" value="{{$back}}">
           <button>Mark&nbsp;Unread</button>
         </form>