X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/5853654f0a618dc89f893992a7f0d211456483f8..6699cff21c226aa900ed3517c0f7ef3d50cefc17:/hotline/client_conn.go diff --git a/hotline/client_conn.go b/hotline/client_conn.go index 14aef9e..48a6947 100644 --- a/hotline/client_conn.go +++ b/hotline/client_conn.go @@ -94,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 @@ -102,16 +102,16 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error { // the user is no longer away if cc.Idle { flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(cc.Flags))) - flagBitmap.SetBit(flagBitmap, userFlagAway, 0) + flagBitmap.SetBit(flagBitmap, UserFlagAway, 0) binary.BigEndian.PutUint16(cc.Flags, uint16(flagBitmap.Int64())) 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), ) } } @@ -144,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 } @@ -189,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)), }, } } @@ -254,5 +254,5 @@ func (cc *ClientConn) String() string { "None.\n", ) - return strings.Replace(template, "\n", "\r", -1) + return strings.ReplaceAll(template, "\n", "\r") }