Rework the data model to improve the performance

Signed-off-by: Max Magorsch <arzano@gentoo.org>

6 files changed, 14 insertions, 16 deletions

diff --git a/web/templates/home/home.tmpl b/web/templates/home/home.tmpl
index 20fa1ba..39cf1fb 100644
--- a/web/templates/home/home.tmpl
+++ b/web/templates/home/home.tmpl
@@ -45,7 +45,7 @@
                 <div class="mx-auto text-center">
                     <p class="mb-1"><a class="text-muted" href="/popular"><b>Recent Popular Threads</b></a></p>
                     {{range .PopularThreads}}
-                    <p class="mb-1"><a href="/{{(makeMessage .Headers).GetListNameFromSubject}}/message/{{.Id}}" class="text-muted">{{(makeMessage .Headers).GetHeaderField "Subject"}}</a></p>
+                    <p class="mb-1"><a href="/{{.GetListNameFromSubject}}/message/{{.Id}}" class="text-muted">{{.Subject}}</a></p>
                     {{end}}
                 </div>
             </div>
@@ -87,7 +87,7 @@
                                     {{$listName:=.Name}}
                                     {{range .Messages}}
                                         <tr>
-                                            <td><a href="/{{$listName}}/message/{{.Id}}">{{.GetHeaderField "Subject"}}</a></td>
+                                            <td><a href="/{{$listName}}/message/{{.Id}}">{{.Subject}}</a></td>
                                             <td>{{.GetAuthorName}}</td>
                                         </tr>
                                     {{end}}
diff --git a/web/templates/list/messages.tmpl b/web/templates/list/messages.tmpl
index 31084bd..fff6a53 100644
--- a/web/templates/list/messages.tmpl
+++ b/web/templates/list/messages.tmpl
@@ -28,7 +28,7 @@
 
                 {{range .Messages}}
                 <tr>
-                  <td><a href="../../message/{{.Id}}">{{.GetHeaderField "Subject"}}</a></td>
+                  <td><a href="../../message/{{.Id}}">{{.Subject}}</a></td>
                   <td>{{.GetAuthorName}}</td>
                   <td><span class="ag-date">{{.Date.Format "Mon, 2 Jan 2006 15:04:05"}}</span></td>
                 </tr>
diff --git a/web/templates/list/threads.tmpl b/web/templates/list/threads.tmpl
index ec07e49..933417a 100644
--- a/web/templates/list/threads.tmpl
+++ b/web/templates/list/threads.tmpl
@@ -28,7 +28,7 @@
 
                 {{range .Messages}}
                 <tr>
-                  <td><a href="../../message/{{.Id}}">{{.GetHeaderField "Subject"}}</a></td>
+                  <td><a href="../../message/{{.Id}}">{{.Subject}}</a></td>
                   <td>{{.GetAuthorName}}</td>
                   <td><span class="ag-date">{{.Date.Format "Mon, 2 Jan 2006 15:04:05"}}</span></td>
                 </tr>
diff --git a/web/templates/message/show.tmpl b/web/templates/message/show.tmpl
index 7b88c35..76ffdf4 100644
--- a/web/templates/message/show.tmpl
+++ b/web/templates/message/show.tmpl
@@ -13,22 +13,22 @@
             <table class="table table-sm ag-header-table">
               <tr>
                 <th class="ag-header-name-col">From:</th>
-                <td>{{formatAddr (.Message.GetHeaderField "From")}}</td>
+                <td>{{formatAddr (.Message.From)}}</td>
               </tr>
               <tr>
                 <th>To:</th>
-                <td>{{formatAddr (.Message.GetHeaderField "To")}}</td>
+                <td>{{formatAddrList (.Message.To)}}</td>
               </tr>
-              {{if .Message.HasHeaderField "Cc"}}
+              {{if .Message.Cc}}
               <tr>
                 <th>Cc:</th>
-                <td>{{formatAddr (.Message.GetHeaderField "Cc")}}</td>
+                <td>{{formatAddrList (.Message.Cc)}}</td>
               </tr>
               {{end}}
 
               <tr>
                 <th>Subject:</th>
-                <td><strong>{{.Message.GetHeaderField "Subject"}}</strong></td>
+                <td><strong>{{.Message.Subject}}</strong></td>
               </tr>
               <tr>
                 <th>Date:</th>
@@ -49,9 +49,9 @@
             </table>
           </div>
 
-          <pre class="ag-message-content">{{.Message.GetBody}}</pre>
+          <pre class="ag-message-content">{{.Message.Body}}</pre>
 
-          {{if .Message.HasAttachments }}
+          {{if .Message.Attachments }}
             <h3>Attachments</h3>
 
             <div class="table-responsive">
@@ -61,7 +61,7 @@
                   <th>MIME type</th>
                 </tr>
 
-                {{range .Message.GetAttachments}}
+                {{range .Message.Attachments}}
                   <tr>
                     <td>{{.Filename}}</td>
                     <td>{{.Mime}}</td>
diff --git a/web/templates/popular/threads.tmpl b/web/templates/popular/threads.tmpl
index 5b849eb..4dfcbbc 100644
--- a/web/templates/popular/threads.tmpl
+++ b/web/templates/popular/threads.tmpl
@@ -12,13 +12,11 @@
             <table class="table">
                 <tr>
                     <th>Thread</th>
-                    <th>Number of messages</th>
                 </tr>
 
                 {{range .}}
                     <tr>
-                        <td><a href="/{{(makeMessage .Headers).GetListNameFromSubject}}/message/{{.Id}}/">{{(makeMessage .Headers).GetSubject}}</a></td>
-                        <td>{{.Count}}</td>
+                        <td><a href="/{{.GetListNameFromSubject}}/message/{{.Id}}/">{{.Subject}}</a></td>
                     </tr>
                 {{end}}
 
diff --git a/web/templates/search/searchresults.tmpl b/web/templates/search/searchresults.tmpl
index ecd64f0..19ed5e4 100644
--- a/web/templates/search/searchresults.tmpl
+++ b/web/templates/search/searchresults.tmpl
@@ -28,7 +28,7 @@
 
                 {{range .Messages}}
                 <tr>
-                  <td><a href="/{{.GetListNameFromSubject}}/message/{{.Id}}">{{.GetHeaderField "Subject"}}</a></td>
+                  <td><a href="/{{.GetListNameFromSubject}}/message/{{.Id}}">{{.Subject}}</a></td>
                   <td>{{.GetAuthorName}}</td>
                   <td><span class="ag-date">{{.Date.Format "Mon, 2 Jan 2006 15:04:05"}}</span></td>
                 </tr>