Changeset 77 in code for trunk/downstream.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/downstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -59 +59 @@
         username   string
         realname   string
-        upstream   *Upstream
+        network    *network // can be nil
 }
 
@@ -101 +101 @@
 func (dc *downstreamConn) forEachUpstream(f func(*upstreamConn)) {
         dc.user.forEachUpstream(func(uc *upstreamConn) {
-                if dc.upstream != nil && uc.upstream != dc.upstream {
+                if dc.network != nil && uc.network != dc.network {
                         return
                 }
@@ -302 +302 @@
 func (dc *downstreamConn) register() error {
         username := strings.TrimPrefix(dc.username, "~")
-        var upstreamName string
+        var networkName string
         if i := strings.LastIndexAny(username, "/@"); i >= 0 {
-                upstreamName = username[i+1:]
+                networkName = username[i+1:]
         }
         if i := strings.IndexAny(username, "/@"); i >= 0 {
@@ -321 +321 @@
         }
 
-        if upstreamName != "" {
-                dc.upstream = dc.user.getUpstream(upstreamName)
-                if dc.upstream == nil {
-                        dc.logger.Printf("failed registration: unknown upstream %q", upstreamName)
+        if networkName != "" {
+                dc.network = dc.user.getNetwork(networkName)
+                if dc.network == nil {
+                        dc.logger.Printf("failed registration: unknown network %q", networkName)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.ERR_PASSWDMISMATCH,
-                                Params:  []string{"*", fmt.Sprintf("Unknown upstream server %q", upstreamName)},
+                                Params:  []string{"*", fmt.Sprintf("Unknown network %q", networkName)},
                         })
                         return nil