From 37546872f9c4336787b9917ca9841a9743988c5b Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Wed, 17 Apr 2024 10:37:41 +0200
Subject: [PATCH] js/mailhops_details.js: move auth data out of routes
 calculation.

Auth data needs only be processed once and is independent from the
actual route data.

This has the added benefit that auth data, which is entirely local, is
shown even if the API returned an error.
---
 js/mailhops_details.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/js/mailhops_details.js b/js/mailhops_details.js
index 845b496..07313a4 100644
--- a/js/mailhops_details.js
+++ b/js/mailhops_details.js
@@ -129,25 +129,26 @@ function updateContent(msg, noauth) {
       asn = '<br/>ASN Org: ' + MailHopsUtils.htmlEncode(route[i].asn.autonomous_system_organization);
       asn += ' (<a href="https://dnschecker.org/asn-whois-lookup.php?query='+route[i].asn.autonomous_system_number+'" target="_blank" title="ASN Lookup">' + route[i].asn.autonomous_system_number + '</a>)'
     }
-    
-    var auth = '';
-    if (!noauth && msg.message.auth.length) {
-      for (var a = 0; a < msg.message.auth.length; a++){
-        if (msg.message.auth[a].icon) {
-          auth += '<label class="tiny ui label ' + msg.message.auth[a].color + '"><img src="' + msg.message.auth[a].icon + '"/>' + msg.message.auth[a].type + ' ' + msg.message.auth[a].copy + '</label>';          
+
+    // append child
+    items.push('<div class="item"><div class="content"><div class="header"><img src="'+ icon + '" /> ' + header + weather +' <label class="ui circular label icon" style="float: right;">'+ (i + 1) +'</label></div><div class="description">'+ description + asn + '</div></div></div>');
+  }
+
+  var auth = '';
+  if (!noauth && msg.message.auth.length) {
+    for (var a = 0; a < msg.message.auth.length; a++){
+      if (msg.message.auth[a].icon) {
+        auth += '<label class="tiny ui label ' + msg.message.auth[a].color + '"><img src="' + msg.message.auth[a].icon + '"/>' + msg.message.auth[a].type + ' ' + msg.message.auth[a].copy + '</label>';
+      }
+      else if (msg.message.auth[a].link) {
+        if (-1 !== msg.message.auth[a].link.indexOf(',')) {
+          auth += '<a class="tiny ui label ' + msg.message.auth[a].color + '" href="'+msg.message.auth[a].link.substr(0,msg.message.auth[a].link.indexOf(','))+'" target="_blank">' + msg.message.auth[a].type + '</a>';
         }
-        else if (msg.message.auth[a].link) {
-          if (-1 !== msg.message.auth[a].link.indexOf(',')) {
-            auth += '<a class="tiny ui label ' + msg.message.auth[a].color + '" href="'+msg.message.auth[a].link.substr(0,msg.message.auth[a].link.indexOf(','))+'" target="_blank">' + msg.message.auth[a].type + '</a>';            
-          }
-          else {
-            auth += '<a class="tiny ui label ' + msg.message.auth[a].color + '" href="'+msg.message.auth[a].link+'" target="_blank">' + msg.message.auth[a].type + '</a>';            
-          }
+        else {
+          auth += '<a class="tiny ui label ' + msg.message.auth[a].color + '" href="'+msg.message.auth[a].link+'" target="_blank">' + msg.message.auth[a].type + '</a>';
         }
       }
     }
-    // append child
-    items.push('<div class="item"><div class="content"><div class="header"><img src="'+ icon + '" /> ' + header + weather +' <label class="ui circular label icon" style="float: right;">'+ (i + 1) +'</label></div><div class="description">'+ description + asn + '</div></div></div>');    
   }
 
   // header