Extensive refactor and clean up

[rbdr/mobius] / hotline / user.go

diff --git a/hotline/user.go b/hotline/user.go
index e64bf8486e04909be9544d20ab470ebe561cb19a..f3754d36328141114d5ef6dd8139b86ee91134ff 100644 (file)
--- a/hotline/user.go
+++ b/hotline/user.go
@@ -3,6 +3,7 @@ package hotline
 import (
        "encoding/binary"
        "io"
+       "math/big"
        "slices"
 )
 
@@ -14,18 +15,33 @@ const (
        UserFlagRefusePChat = 3 // User refuses private chat
 )
 
-// FieldOptions flags are sent from v1.5+ clients as part of TranAgreed
+// User options are sent from clients and represent options set in the client's preferences.
 const (
-       refusePM     = 0 // User has "Refuse private messages" pref set
-       refuseChat   = 1 // User has "Refuse private chat" pref set
-       autoResponse = 2 // User has "Automatic response" pref set
+       UserOptRefusePM     = 0 // User has "Refuse private messages" pref set
+       UserOptRefuseChat   = 1 // User has "Refuse private chat" pref set
+       UserOptAutoResponse = 2 // User has "Automatic response" pref set
 )
 
+type UserFlags [2]byte
+
+func (f *UserFlags) IsSet(i int) bool {
+       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(f[:])))
+       return flagBitmap.Bit(i) == 1
+}
+
+func (f *UserFlags) Set(i int, newVal uint) {
+       flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(f[:])))
+       flagBitmap.SetBit(flagBitmap, i, newVal)
+       binary.BigEndian.PutUint16(f[:], uint16(flagBitmap.Int64()))
+}
+
 type User struct {
-       ID    []byte // Size 2
+       ID    [2]byte
        Icon  []byte // Size 2
        Flags []byte // Size 2
        Name  string // Variable length user name
+
+       readOffset int // Internal offset to track read progress
 }
 
 func (u *User) Read(p []byte) (int, error) {
@@ -40,23 +56,27 @@ func (u *User) Read(p []byte) (int, error) {
                u.Flags = u.Flags[2:]
        }
 
-       out := append(u.ID[:2], u.Icon[:2]...)
-       out = append(out, u.Flags[:2]...)
-       out = append(out, nameLen...)
-       out = append(out, u.Name...)
-
-       return copy(p, slices.Concat(
-               u.ID,
+       b := slices.Concat(
+               u.ID[:],
                u.Icon,
                u.Flags,
                nameLen,
                []byte(u.Name),
-       )), io.EOF
+       )
+
+       if u.readOffset >= len(b) {
+               return 0, io.EOF // All bytes have been read
+       }
+
+       n := copy(p, b)
+       u.readOffset = n
+
+       return n, nil
 }
 
 func (u *User) Write(p []byte) (int, error) {
        namelen := int(binary.BigEndian.Uint16(p[6:8]))
-       u.ID = p[0:2]
+       u.ID = [2]byte(p[0:2])
        u.Icon = p[2:4]
        u.Flags = p[4:6]
        u.Name = string(p[8 : 8+namelen])