Upgrade to go-imap v2

3 files changed, 17 insertions, 19 deletions

diff --git a/themes/alps/mailbox.html b/themes/alps/mailbox.html
index c6fd6c9..e33f8dd 100644
--- a/themes/alps/mailbox.html
+++ b/themes/alps/mailbox.html
@@ -23,15 +23,15 @@
 
           {{ if and (not (.HasFlag "\\Deleted")) .Envelope }}
           <div class="message-list-checkbox {{$classes}}">
-            <input type="checkbox" name="uids" value="{{.Uid}}" form="messages-form">
+            <input type="checkbox" name="uids" value="{{.UID}}" form="messages-form">
           </div>
           <div class="message-list-sender {{$classes}}">
             {{ range .Envelope.From }}
-            <a href='?query=from:"{{.MailboxName}}@{{.HostName}}"'>
-            {{ if .PersonalName }}
-              {{.PersonalName}}
+            <a href='?query=from:"{{.Addr}}"'>
+            {{ if .Name }}
+              {{.Name}}
             {{ else }}
-              {{.MailboxName}}@{{.HostName}}
+              {{.Addr}}
             {{ end }}
             </a>
             {{ end }}
@@ -41,7 +41,7 @@
             {{if .HasFlag "\\Answered"}}<span class="Replied">↩</span>{{end}}
             {{if .HasFlag "$Forwarded"}}<span class="Forwarded">↪</span>{{end}}
             <form method="POST" action="/message/{{.Mailbox}}/flag">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.UID}}">
               {{ if .HasFlag "\\Flagged" -}}
               <input type="hidden" name="action" value="remove">
               {{ else }}
diff --git a/themes/alps/message.html b/themes/alps/message.html
index 350ab0a..ee5aa02 100644
--- a/themes/alps/message.html
+++ b/themes/alps/message.html
@@ -15,7 +15,7 @@
 
             {{ if and (ne .Mailbox.Name "Archive") (ne .Mailbox.Name "Drafts") (ne .Mailbox.Name "Sent") }}
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <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>
@@ -24,7 +24,7 @@
 
             {{ if and (ne .Mailbox.Name "INBOX") (ne .Mailbox.Name "Sent") (ne .Mailbox.Name "Drafts") }}
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <input type="hidden" name="to" value="INBOX">
               <button>
               {{ if (eq .Mailbox.Name "Junk") }}
@@ -38,7 +38,7 @@
 
             {{ if or (eq .Mailbox.Name "INBOX") (eq .Mailbox.Name "Trash") }}
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <input type="hidden" name="next" value="{{$back}}">
               <input type="hidden" name="to" value="Junk">
               <button>Report Spam</button>
@@ -47,13 +47,13 @@
 
             {{ if or (eq .Mailbox.Name "Trash") (eq .Mailbox.Name "Junk") }}
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/delete">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <input type="hidden" name="next" value="{{$back}}">
               <button>Delete Permanently</button>
             </form>
             {{ else }}
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <input type="hidden" name="next" value="{{$back}}">
               <input type="hidden" name="to" value="Trash">
               <button>Delete</button>
@@ -61,7 +61,7 @@
             {{ end }}
 
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/flag">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <input type="hidden" name="action" value="remove">
               <input type="hidden" name="flags" value="\Seen">
               <input type="hidden" name="next" value="{{$back}}">
@@ -69,7 +69,7 @@
             </form>
 
             <form class="action-group" method="post" action="/message/{{.Mailbox.Name | pathescape}}/move">
-              <input type="hidden" name="uids" value="{{.Message.Uid}}">
+              <input type="hidden" name="uids" value="{{.Message.UID}}">
               <select class="action-group" name="to">
                 {{range .Mailboxes}}
                   <option value="{{.Name}}" {{if eq .Name $.Mailbox.Name}}selected>Move to...{{else}}>{{.Name}}{{ end }}</option>
@@ -176,8 +176,8 @@
       {{define "addr-list"}}
         {{range $i, $addr := .}}
           {{if $i}},{{end}}
-          <strong>{{.PersonalName}}</strong>
-          &lt;<a href="/compose?to={{.Address}}">{{.Address}}</a>&gt;
+          <strong>{{.Name}}</strong>
+          &lt;<a href="/compose?to={{.Addr}}">{{.Addr}}</a>&gt;
         {{end}}
       {{end}}
 
diff --git a/themes/alps/util.html b/themes/alps/util.html
index 9cdfd86..bd580c3 100644
--- a/themes/alps/util.html
+++ b/themes/alps/util.html
@@ -9,10 +9,8 @@
     {{- end -}}
     {{- if .Info.HasAttr "\\HasChildren" }}/{{ end }}
   </a>
-  {{ if .Status }}
-  {{ if .Status.Unseen }}
-  <span class="unseen">({{.Status.Unseen}})</span>
-  {{ end }}
+  {{ if gt .Info.Unseen 0 }}
+  <span class="unseen">({{.Info.Unseen}})</span>
   {{ end }}
 </li>
 {{ else }}