From: Tim Cooper <tim.cooper@layeh.com>
Date: Wed, 11 Feb 2015 16:07:29 +0000 (-0400)
Subject: update due to gumble API changes
X-Git-Url: https://git.0d.be/?p=barnard.git;a=commitdiff_plain;h=b56133e03344cfcb80f7a50d2bdcc9c9b513fb4a

update due to gumble API changes
---

diff --git a/client.go b/client.go
index 1d7066d..3d73979 100644
--- a/client.go
+++ b/client.go
@@ -11,8 +11,8 @@ func (b *Barnard) OnConnect(e *gumble.ConnectEvent) {
 	b.UiTree.Rebuild()
 	b.Ui.Refresh()
 
-	b.UpdateInputStatus(fmt.Sprintf("To: %s", e.Client.Self().Channel().Name()))
-	b.AddOutputLine(fmt.Sprintf("Connected to %s", b.Client.Conn().RemoteAddr()))
+	b.UpdateInputStatus(fmt.Sprintf("To: %s", e.Client.Self.Channel.Name))
+	b.AddOutputLine(fmt.Sprintf("Connected to %s", b.Client.Conn.RemoteAddr()))
 	if e.WelcomeMessage != "" {
 		b.AddOutputLine(fmt.Sprintf("Welcome message: %s", esc(e.WelcomeMessage)))
 	}
@@ -56,8 +56,8 @@ func (b *Barnard) OnTextMessage(e *gumble.TextMessageEvent) {
 }
 
 func (b *Barnard) OnUserChange(e *gumble.UserChangeEvent) {
-	if e.Type.Has(gumble.UserChangeChannel) && e.User == b.Client.Self() {
-		b.UpdateInputStatus(fmt.Sprintf("To: %s", e.User.Channel().Name()))
+	if e.Type.Has(gumble.UserChangeChannel) && e.User == b.Client.Self {
+		b.UpdateInputStatus(fmt.Sprintf("To: %s", e.User.Channel.Name))
 	}
 	b.UiTree.Rebuild()
 	b.Ui.Refresh()
diff --git a/ui.go b/ui.go
index b45479f..c1dc6a8 100644
--- a/ui.go
+++ b/ui.go
@@ -39,7 +39,7 @@ func (b *Barnard) AddOutputMessage(sender *gumble.User, message string) {
 	if sender == nil {
 		b.AddOutputLine(message)
 	} else {
-		b.AddOutputLine(fmt.Sprintf("%s: %s", sender.Name(), strings.TrimSpace(esc(message))))
+		b.AddOutputLine(fmt.Sprintf("%s: %s", sender.Name, strings.TrimSpace(esc(message))))
 	}
 }
 
@@ -96,9 +96,9 @@ func (b *Barnard) OnTextInput(ui *uiterm.Ui, textbox *uiterm.Textbox, text strin
 	if text == "" {
 		return
 	}
-	if b.Client != nil && b.Client.Self() != nil {
-		b.Client.Self().Channel().Send(text, false)
-		b.AddOutputMessage(b.Client.Self(), text)
+	if b.Client != nil && b.Client.Self != nil {
+		b.Client.Self.Channel.Send(text, false)
+		b.AddOutputMessage(b.Client.Self, text)
 	}
 }
 
diff --git a/ui_tree.go b/ui_tree.go
index f298ea7..d164cbd 100644
--- a/ui_tree.go
+++ b/ui_tree.go
@@ -12,10 +12,10 @@ type TreeItem struct {
 
 func (ti TreeItem) String() string {
 	if ti.User != nil {
-		return ti.User.Name()
+		return ti.User.Name
 	}
 	if ti.Channel != nil {
-		return ti.Channel.Name()
+		return ti.Channel.Name
 	}
 	return ""
 }
@@ -33,14 +33,14 @@ func (ti TreeItem) TreeItemStyle(fg, bg uiterm.Attribute, active bool) (uiterm.A
 func (b *Barnard) TreeItemSelect(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm.TreeItem) {
 	treeItem := item.(TreeItem)
 	if treeItem.Channel != nil {
-		b.Client.Self().Move(treeItem.Channel)
+		b.Client.Self.Move(treeItem.Channel)
 	}
 }
 
 func (b *Barnard) TreeItem(item uiterm.TreeItem) []uiterm.TreeItem {
 	var treeItem TreeItem
 	if ti, ok := item.(TreeItem); !ok {
-		root := b.Client.Channels()[0]
+		root := b.Client.Channels[0]
 		if root == nil {
 			return nil
 		}
@@ -58,14 +58,14 @@ func (b *Barnard) TreeItem(item uiterm.TreeItem) []uiterm.TreeItem {
 	}
 
 	users := []uiterm.TreeItem{}
-	for _, user := range treeItem.Channel.Users() {
+	for _, user := range treeItem.Channel.Users {
 		users = append(users, TreeItem{
 			User: user,
 		})
 	}
 
 	channels := []uiterm.TreeItem{}
-	for _, subchannel := range treeItem.Channel.Channels() {
+	for _, subchannel := range treeItem.Channel.Children {
 		channels = append(channels, TreeItem{
 			Channel: subchannel,
 		})