anidb: rename misc.go to globals.go

[go-anidb.git] / auth.go

diff --git a/auth.go b/auth.go
index 6e4af5a83f4917c97d71854f0d21b2aeb5a2fbba..c63d49bec0dfce6ff1996d83657accdcff0a7d10 100644 (file)
--- a/auth.go
+++ b/auth.go
@@ -92,12 +92,12 @@ func (udp *udpWrap) ReAuth() udpapi.APIReply {
        defer udp.credLock.Unlock()
 
        if c := udp.credentials; c != nil {
-               logRequest(paramSet{cmd: "AUTH", params: paramMap{"user": decrypt(c.username)}})
+               udp.logRequest(paramSet{cmd: "AUTH", params: paramMap{"user": decrypt(c.username)}})
                r := udp.AniDBUDP.Auth(
                        decrypt(c.username),
                        decrypt(c.password),
                        decrypt(c.udpKey))
-               logReply(r)
+               udp.logReply(r)
 
                err := r.Error()
 
@@ -117,18 +117,22 @@ func (udp *udpWrap) ReAuth() udpapi.APIReply {
                udp.connected = err == nil
 
                if udp.connected {
-                       // We can't use SendRecv here as it would deadlock
-                       ch := make(chan udpapi.APIReply, 1)
-                       udp.sendQueueCh <- paramSet{
-                               cmd:    "USER",
-                               params: paramMap{"user": decrypt(c.username)},
-                               ch:     ch,
-                       }
-                       reply := <-ch
-
-                       if reply != nil {
-                               uid, _ := parseUserReply(reply)
-                               udp.user = uid.User()
+                       if user := UserByName(decrypt(c.username)); user != nil {
+                               udp.user = user
+                       } else {
+                               // We can't use SendRecv here as it would deadlock
+                               ch := make(chan udpapi.APIReply, 1)
+                               udp.sendQueueCh <- paramSet{
+                                       cmd:    "USER",
+                                       params: paramMap{"user": decrypt(c.username)},
+                                       ch:     ch,
+                               }
+                               reply := <-ch
+
+                               if reply != nil {
+                                       uid, _ := parseUserReply(reply)
+                                       udp.user = uid.User()
+                               }
                        }
                }
 
@@ -181,7 +185,7 @@ func (adb *AniDB) Logout() error {
 
        if adb.udp.connected {
                adb.udp.connected = false
-               logRequest(paramSet{cmd: "LOGOUT"})
+               adb.udp.logRequest(paramSet{cmd: "LOGOUT"})
                return adb.udp.Logout()
        }
        return nil