aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Halter <868228+jhalter@users.noreply.github.com>2021-07-25 11:14:02 -0700
committerJeff Halter <868228+jhalter@users.noreply.github.com>2021-07-25 11:14:02 -0700
commitf7e36225dd16fe1d2428f53eccd4a16dff453a34 (patch)
tree54f2bd6762c1e02a39d1039ada696f9cc56725d8
parentbf290335ef0742721a915102187168ed04236c55 (diff)
FIx icon ID
-rw-r--r--client.go12
-rw-r--r--client/mobius-client-config.yaml2
2 files changed, 10 insertions, 4 deletions
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