Changeset 93 in code for trunk/db.go

Timestamp:

Mar 13, 2020, 11:06:02 AM (5 years ago)

Author:

contact

Message:

Add support for upstream PASS command

File:

• trunk/db.go (modified) (5 diffs)

trunk/db.go

@@ -19 +19 @@
         Username string
         Realname string
+        Pass     string
 }
 
@@ -90 +91 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query("SELECT id, addr, nick, username, realname FROM Network WHERE user = ?", username)
+        rows, err := db.db.Query("SELECT id, addr, nick, username, realname, pass FROM Network WHERE user = ?", username)
         if err != nil {
                 return nil, err
@@ -99 +100 @@
         for rows.Next() {
                 var net Network
-                var username, realname *string
-                if err := rows.Scan(&net.ID, &net.Addr, &net.Nick, &username, &realname); err != nil {
+                var username, realname, pass *string
+                if err := rows.Scan(&net.ID, &net.Addr, &net.Nick, &username, &realname, &pass); err != nil {
                         return nil, err
                 }
@@ -108 +109 @@
                 if realname != nil {
                         net.Realname = *realname
+                }
+                if pass != nil {
+                        net.Pass = *pass
                 }
                 networks = append(networks, net)
@@ -122 +126 @@
         defer db.lock.Unlock()
 
-        var netUsername, netRealname *string
+        var netUsername, realname, pass *string
         if network.Username != "" {
                 netUsername = &network.Username
         }
         if network.Realname != "" {
-                netRealname = &network.Realname
+                realname = &network.Realname
+        }
+        if network.Pass != "" {
+                pass = &network.Pass
         }
 
         var err error
         if network.ID != 0 {
-                _, err = db.db.Exec("UPDATE Network SET addr = ?, nick = ?, username = ?, realname = ? WHERE id = ?", network.Addr, network.Nick, netUsername, netRealname, network.ID)
+                _, err = db.db.Exec(`UPDATE Network
+                        SET addr = ?, nick = ?, username = ?, realname = ?, pass = ?
+                        WHERE id = ?`,
+                        network.Addr, network.Nick, netUsername, realname, pass, network.ID)
         } else {
                 var res sql.Result
-                res, err = db.db.Exec("INSERT INTO Network(user, addr, nick, username, realname) VALUES (?, ?, ?, ?, ?)", username, network.Addr, network.Nick, netUsername, netRealname)
+                res, err = db.db.Exec(`INSERT INTO Network(user, addr, nick, username,
+                                realname, pass)
+                        VALUES (?, ?, ?, ?, ?, ?)`,
+                        username, network.Addr, network.Nick, netUsername, realname, pass)
                 if err != nil {
                         return err