From ec646d65065b19bc87b00a15e697ecfbf2bc92d6 Mon Sep 17 00:00:00 2001
From: liamcottle <liam@liamcottle.com>
Date: Tue, 17 Sep 2024 17:05:43 +1200
Subject: [PATCH] use server provided display name

---
 .../nomadnetwork/NomadNetworkPage.vue          | 18 +++---------------
 .../nomadnetwork/NomadNetworkSidebar.vue       |  6 +++---
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/frontend/components/nomadnetwork/NomadNetworkPage.vue b/src/frontend/components/nomadnetwork/NomadNetworkPage.vue
index 8942046..131689f 100644
--- a/src/frontend/components/nomadnetwork/NomadNetworkPage.vue
+++ b/src/frontend/components/nomadnetwork/NomadNetworkPage.vue
@@ -16,7 +16,7 @@
 
                 <!-- node info -->
                 <div class="my-auto">
-                    <span class="font-semibold">{{ selectedNode.name }}</span>
+                    <span class="font-semibold">{{ selectedNode.display_name }}</span>
                     <span v-if="selectedNodePath" @click="onDestinationPathClick(selectedNodePath)" class="text-sm cursor-pointer"> - {{ selectedNodePath.hops }} {{ selectedNodePath.hops === 1 ? 'hop' : 'hops' }} away</span>
                 </div>
 
@@ -268,19 +268,7 @@ export default {
             }
         },
         updateNodeFromAnnounce: function(announce) {
-            this.nodes[announce.destination_hash] = {
-                ...announce,
-                // helper property for easily grabbing node name from app data
-                name: this.getNodeNameFromAppData(announce.app_data),
-            };
-        },
-        getNodeNameFromAppData: function(appData) {
-            try {
-                // app data should be node name, and our server provides it base64 encoded
-                return Utils.decodeBase64ToUtf8String(appData);
-            } catch(e){
-                return "Anonymous Node";
-            }
+            this.nodes[announce.destination_hash] = announce;
         },
         async loadNodePage(destinationHash, pagePath, addToHistory = true, loadFromCache = true) {
 
@@ -498,7 +486,7 @@ export default {
 
                 // update selected node, so relative urls work correctly when returned by the new node
                 this.selectedNode = this.nodes[destinationHash] || {
-                    name: "Unknown Node",
+                    display_name: "Unknown Node",
                     destination_hash: destinationHash,
                 };
 
diff --git a/src/frontend/components/nomadnetwork/NomadNetworkSidebar.vue b/src/frontend/components/nomadnetwork/NomadNetworkSidebar.vue
index 5a4d733..a48400f 100644
--- a/src/frontend/components/nomadnetwork/NomadNetworkSidebar.vue
+++ b/src/frontend/components/nomadnetwork/NomadNetworkSidebar.vue
@@ -19,7 +19,7 @@
                             </div>
                         </div>
                         <div>
-                            <div class="text-gray-900">{{ node.name }}</div>
+                            <div class="text-gray-900">{{ node.display_name }}</div>
                             <div class="text-gray-500 text-sm">{{ formatTimeAgo(node.updated_at) }}</div>
                         </div>
                     </div>
@@ -95,9 +95,9 @@ export default {
         searchedNodes() {
             return this.nodesOrderedByLatestAnnounce.filter((node) => {
                 const search = this.nodesSearchTerm.toLowerCase();
-                const matchesAppData = node.name.toLowerCase().includes(search);
+                const matchesDisplayName = node.display_name.toLowerCase().includes(search);
                 const matchesDestinationHash = node.destination_hash.toLowerCase().includes(search);
-                return matchesAppData || matchesDestinationHash;
+                return matchesDisplayName || matchesDestinationHash;
             });
         },
     },