Changeset 457 in code for trunk

Timestamp:

Mar 9, 2021, 5:55:34 PM (4 years ago)

Author:

contact

Message:

Add Network.{URL,GetUsername,GetRealname}

Just a bunch of helpers that can be re-used.

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• upstream.go (modified) (3 diffs)

trunk/db.go

@@ -5 +5 @@
         "fmt"
         "math"
+        "net/url"
         "strings"
         "sync"
@@ -53 +54 @@
         }
         return net.Addr
+}
+
+func (net *Network) URL() (*url.URL, error) {
+        s := net.Addr
+        if !strings.Contains(s, "://") {
+                // This is a raw domain name, make it an URL with the default scheme
+                s = "ircs://" + s
+        }
+
+        u, err := url.Parse(s)
+        if err != nil {
+                return nil, fmt.Errorf("failed to parse upstream server URL: %v", err)
+        }
+
+        return u, nil
+}
+
+func (net *Network) GetUsername() string {
+        if net.Username != "" {
+                return net.Username
+        }
+        return net.Nick
+}
+
+func (net *Network) GetRealname() string {
+        if net.Realname != "" {
+                return net.Realname
+        }
+        return net.Nick
 }
 

trunk/upstream.go

@@ -11 +11 @@
         "io"
         "net"
-        "net/url"
         "strconv"
         "strings"
@@ -110 +109 @@
         dialer := net.Dialer{Timeout: connectTimeout}
 
-        s := network.Addr
-        if !strings.Contains(s, "://") {
-                // This is a raw domain name, make it an URL with the default scheme
-                s = "ircs://" + s
-        }
-
-        u, err := url.Parse(s)
+        u, err := network.URL()
         if err != nil {
-                return nil, fmt.Errorf("failed to parse upstream server URL: %v", err)
+                return nil, err
         }
 
@@ -1567 +1560 @@
 func (uc *upstreamConn) register() {
         uc.nick = uc.network.Nick
-        uc.username = uc.network.Username
-        if uc.username == "" {
-                uc.username = uc.nick
-        }
-        uc.realname = uc.network.Realname
-        if uc.realname == "" {
-                uc.realname = uc.nick
-        }
+        uc.username = uc.network.GetUsername()
+        uc.realname = uc.network.GetRealname()
 
         uc.SendMessage(&irc.Message{