Add Network.{URL,GetUsername,GetRealname}

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

db.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 	"math"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
@@ -54,6 +55,35 @@ func (net *Network) GetName() string {
 	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
+}
+
 type MessageFilter int
 
 const (

upstream.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -109,15 +108,9 @@ func connectToUpstream(network *network) (*upstreamConn, error) {
 
 	dialer := net.Dialer{Timeout: connectTimeout}
 
-	s := network.Addr
+	u, err := network.URL()
-	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 nil, err
 	}
 
 	var netConn net.Conn
@@ -1566,14 +1559,8 @@ func splitSpace(s string) []string {
 
 func (uc *upstreamConn) register() {
 	uc.nick = uc.network.Nick
-	uc.username = uc.network.Username
+	uc.username = uc.network.GetUsername()
-	if uc.username == "" {
+	uc.realname = uc.network.GetRealname()
-		uc.username = uc.nick
-	}
-	uc.realname = uc.network.Realname
-	if uc.realname == "" {
-		uc.realname = uc.nick
-	}
 
 	uc.SendMessage(&irc.Message{
 		Command: "CAP",