Changeset 77 in code for trunk/upstream.go

Timestamp:

Mar 4, 2020, 5:22:58 PM (5 years ago)

Author:

contact

Message:

Add SQLite database

Closes: ​https://todo.sr.ht/~emersion/jounce/9

File:

• trunk/upstream.go (modified) (8 diffs)

trunk/upstream.go

@@ -26 +26 @@
 
 type upstreamConn struct {
-        upstream *Upstream
+        network  *network
         logger   Logger
         net      net.Conn
@@ -42 +42 @@
         registered bool
         nick       string
+        username   string
+        realname   string
         closed     bool
         modes      modeSet
@@ -48 +50 @@
 }
 
-func connectToUpstream(u *user, upstream *Upstream) (*upstreamConn, error) {
-        logger := &prefixLogger{u.srv.Logger, fmt.Sprintf("upstream %q: ", upstream.Addr)}
-        logger.Printf("connecting to server")
-
-        netConn, err := tls.Dial("tcp", upstream.Addr, nil)
+func connectToUpstream(network *network) (*upstreamConn, error) {
+        logger := &prefixLogger{network.user.srv.Logger, fmt.Sprintf("upstream %q: ", network.Addr)}
+
+        addr := network.Addr
+        if !strings.ContainsRune(addr, ':') {
+                addr = addr + ":6697"
+        }
+
+        logger.Printf("connecting to TLS server at address %q", addr)
+        netConn, err := tls.Dial("tcp", addr, nil)
         if err != nil {
-                return nil, fmt.Errorf("failed to dial %q: %v", upstream.Addr, err)
+                return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
         }
 
@@ -61 +68 @@
         msgs := make(chan *irc.Message, 64)
         uc := &upstreamConn{
-                upstream: upstream,
+                network: network,
                 logger:   logger,
                 net:      netConn,
                 irc:      irc.NewConn(netConn),
-                srv:      u.srv,
-                user:     u,
+                srv:      network.user.srv,
+                user:     network.user,
                 messages: msgs,
-                ring:     NewRing(u.srv.RingCap),
+                ring:     NewRing(network.user.srv.RingCap),
                 channels: make(map[string]*upstreamChannel),
                 history:  make(map[string]uint64),
@@ -103 +110 @@
 func (uc *upstreamConn) forEachDownstream(f func(*downstreamConn)) {
         uc.user.forEachDownstream(func(dc *downstreamConn) {
-                if dc.upstream != nil && dc.upstream != uc.upstream {
+                if dc.network != nil && dc.network != uc.network {
                         return
                 }
@@ -164 +171 @@
                 uc.logger.Printf("connection registered")
 
-                for _, ch := range uc.upstream.Channels {
+                channels, err := uc.srv.db.ListChannels(uc.network.ID)
+                if err != nil {
+                        uc.logger.Printf("failed to list channels from database: %v", err)
+                        break
+                }
+
+                for _, ch := range channels {
                         uc.SendMessage(&irc.Message{
                                 Command: "JOIN",
-                                Params:  []string{ch},
+                                Params:  []string{ch.Name},
                         })
                 }
@@ -372 +385 @@
 
 func (uc *upstreamConn) register() {
-        uc.nick = uc.upstream.Nick
+        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.SendMessage(&irc.Message{
                 Command: "NICK",
@@ -379 +401 @@
         uc.SendMessage(&irc.Message{
                 Command: "USER",
-                Params:  []string{uc.upstream.Username, "0", "*", uc.upstream.Realname},
+                Params:  []string{uc.username, "0", "*", uc.realname},
         })
 }