Use strings.ReplaceAll method

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 8c95aebbf2273882e57dadb1c0d09352a4bed0ed..0a5a108da9fa706a0b3f6c410131c1944b006cfa 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -44,7 +44,6 @@ type ClientConn struct {
        transfersMU sync.Mutex
        transfers   map[int]map[[4]byte]*FileTransfer
 
-       Agreed bool
        logger *zap.SugaredLogger
 }
 
@@ -95,7 +94,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
        cc.Server.mux.Lock()
        defer cc.Server.mux.Unlock()
 
-       if requestNum != tranKeepAlive {
+       if requestNum != TranKeepAlive {
                // reset the user idle timer
                cc.IdleTime = 0
 
@@ -108,11 +107,11 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
                        cc.Idle = false
 
                        cc.sendAll(
-                               tranNotifyChangeUser,
-                               NewField(fieldUserID, *cc.ID),
-                               NewField(fieldUserFlags, cc.Flags),
-                               NewField(fieldUserName, cc.UserName),
-                               NewField(fieldUserIconID, cc.Icon),
+                               TranNotifyChangeUser,
+                               NewField(FieldUserID, *cc.ID),
+                               NewField(FieldUserFlags, cc.Flags),
+                               NewField(FieldUserName, cc.UserName),
+                               NewField(FieldUserIconID, cc.Icon),
                        )
                }
        }
@@ -145,7 +144,7 @@ func (cc *ClientConn) Disconnect() {
 
        delete(cc.Server.Clients, binary.BigEndian.Uint16(*cc.ID))
 
-       for _, t := range cc.notifyOthers(*NewTransaction(tranNotifyDeleteUser, nil, NewField(fieldUserID, *cc.ID))) {
+       for _, t := range cc.notifyOthers(*NewTransaction(TranNotifyDeleteUser, nil, NewField(FieldUserID, *cc.ID))) {
                cc.Server.outbox <- t
        }
 
@@ -157,7 +156,7 @@ func (cc *ClientConn) Disconnect() {
 // notifyOthers sends transaction t to other clients connected to the server
 func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) {
        for _, c := range sortedClients(cc.Server.Clients) {
-               if c.ID != cc.ID && c.Agreed {
+               if c.ID != cc.ID {
                        t.clientID = c.ID
                        trans = append(trans, t)
                }
@@ -190,7 +189,7 @@ func (cc *ClientConn) NewErrReply(t *Transaction, errMsg string) Transaction {
                ID:        t.ID,
                ErrorCode: []byte{0, 0, 0, 1},
                Fields: []Field{
-                       NewField(fieldError, []byte(errMsg)),
+                       NewField(FieldError, []byte(errMsg)),
                },
        }
 }
@@ -255,5 +254,5 @@ func (cc *ClientConn) String() string {
                "None.\n",
        )
 
-       return strings.Replace(template, "\n", "\r", -1)
+       return strings.ReplaceAll(template, "\n", "\r")
 }