From: Jeff Halter <redacted>
Date: Sun, 25 Jul 2021 18:14:02 +0000 (-0700)
Subject: FIx icon ID
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/f7e36225dd16fe1d2428f53eccd4a16dff453a34?ds=inline

FIx icon ID
---

diff --git a/client.go b/client.go
index 0c8cdb0..2f79552 100644
--- a/client.go
+++ b/client.go
@@ -44,6 +44,12 @@ type ClientPrefs struct {
 	Tracker   string     `yaml:"Tracker"`
 }
 
+func (cp *ClientPrefs) IconBytes() []byte {
+	iconBytes := make([]byte, 2)
+	binary.BigEndian.PutUint16(iconBytes, uint16(cp.IconID))
+	return iconBytes
+}
+
 func readConfig(cfgPath string) (*ClientPrefs, error) {
 	fh, err := os.Open(cfgPath)
 	if err != nil {
@@ -717,7 +723,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
 					*NewTransaction(
 						tranAgreed, nil,
 						NewField(fieldUserName, []byte(c.pref.Username)),
-						NewField(fieldUserIconID, *c.Icon),
+						NewField(fieldUserIconID, c.pref.IconBytes()),
 						NewField(fieldUserFlags, []byte{0x00, 0x00}),
 						NewField(fieldOptions, []byte{0x00, 0x00}),
 					),
@@ -726,7 +732,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
 				c.UI.Pages.HidePage("agreement")
 				c.UI.App.SetFocus(c.UI.chatInput)
 			} else {
-				c.Disconnect()
+				_ = c.Disconnect()
 				c.UI.Pages.SwitchToPage("home")
 			}
 		},
@@ -838,7 +844,7 @@ func (c *Client) LogIn(login string, password string) error {
 		*NewTransaction(
 			tranLogin, nil,
 			NewField(fieldUserName, []byte(c.pref.Username)),
-			NewField(fieldUserIconID, []byte{0x07, 0xd1}),
+			NewField(fieldUserIconID, c.pref.IconBytes()),
 			NewField(fieldUserLogin, []byte(NegatedUserString([]byte(login)))),
 			NewField(fieldUserPassword, []byte(NegatedUserString([]byte(password)))),
 			NewField(fieldVersion, []byte{0, 2}),
diff --git a/client/mobius-client-config.yaml b/client/mobius-client-config.yaml
index 868797c..978122b 100644
--- a/client/mobius-client-config.yaml
+++ b/client/mobius-client-config.yaml
@@ -1,5 +1,5 @@
 Username: unnamed
-IconID: 2000
+IconID: 414
 Tracker: hltracker.com:5498
 Bookmarks:
   - Name: Example Server