From a11abb8225bd3078c46bd790a664b236bedaafb3 Mon Sep 17 00:00:00 2001
From: Edouard Paris <m@edouard.paris>
Date: Thu, 4 Apr 2019 13:24:01 +0200
Subject: [PATCH] views channel node alias

---
 network/models/channel.go |  1 +
 ui/models/models.go       |  8 ++++++++
 ui/views/channels.go      | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/network/models/channel.go b/network/models/channel.go
index 488c4f8..22da178 100644
--- a/network/models/channel.go
+++ b/network/models/channel.go
@@ -37,6 +37,7 @@ type Channel struct {
 	Private             bool
 	PendingHTLC         []*HTLC
 	LastUpdate          *time.Time
+	Node                *Node
 }
 
 func (m Channel) MarshalLogObject(enc logging.ObjectEncoder) error {
diff --git a/ui/models/models.go b/ui/models/models.go
index 147ffde..1a04fb7 100644
--- a/ui/models/models.go
+++ b/ui/models/models.go
@@ -58,6 +58,14 @@ func (m *Models) RefreshChannels(ctx context.Context) error {
 				return err
 			}
 
+			if channels[i].Node == nil {
+				channels[i].Node, err = m.App.Network.GetNode(ctx,
+					channels[i].RemotePubKey)
+				if err != nil {
+					return err
+				}
+			}
+
 			m.Channels.Update(channels[i])
 		}
 	}
diff --git a/ui/views/channels.go b/ui/views/channels.go
index 453b487..9b774fa 100644
--- a/ui/views/channels.go
+++ b/ui/views/channels.go
@@ -60,32 +60,44 @@ func (c *Channels) Set(g *gocui.Gui, x0, y0, x1, y1 int) error {
 
 func displayChannelsColumns(v *gocui.View) {
 	v.Clear()
-	fmt.Fprintln(v, fmt.Sprintf("%-9s %-26s %12s %12s %5s  %-15s",
+	fmt.Fprintln(v, fmt.Sprintf("%-9s %-20s %-26s %12s %12s %5s  %-15s %s",
 		"Status",
+		"Alias",
 		"Gauge",
 		"Local",
 		"Capacity",
 		"pHTLC",
 		"Last Update",
+		"ID",
 	))
 }
 
 func (c *Channels) display(v *gocui.View) {
 	v.Clear()
 	for _, item := range c.channels.List() {
-		line := fmt.Sprintf("%s %s %s %12d %5d  %15s %500s",
+		line := fmt.Sprintf("%s %-20s %s %s %12d %5d  %15s %d %500s",
 			active(item),
+			alias(item),
 			gauge(item),
 			color.Cyan(fmt.Sprintf("%12d", item.LocalBalance)),
 			item.Capacity,
 			len(item.PendingHTLC),
 			lastUpdate(item),
+			item.ID,
 			"",
 		)
 		fmt.Fprintln(v, line)
 	}
 }
 
+func alias(c *netmodels.Channel) string {
+	if c.Node == nil || c.Node.Alias == "" {
+		return c.RemotePubKey[:19]
+	}
+
+	return c.Node.Alias
+}
+
 func lastUpdate(c *netmodels.Channel) string {
 	if c.LastUpdate != nil {
 		return c.LastUpdate.Format("15:04:05 Jan _2")