Changeset 532 in code for trunk/user.go

Timestamp:

May 25, 2021, 2:42:51 PM (4 years ago)

Author:

contact

Message:

Implement the soju.im/bouncer-networks extension

File:

• trunk/user.go (modified) (6 diffs)

trunk/user.go

@@ -142 +142 @@
 func (net *network) forEachDownstream(f func(*downstreamConn)) {
         net.user.forEachDownstream(func(dc *downstreamConn) {
+                if dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
+                        return
+                }
                 if dc.network != nil && dc.network != net {
                         return
@@ -512 +515 @@
                         uc.updateAway()
 
+                        netIDStr := fmt.Sprintf("%v", uc.network.ID)
                         uc.forEachDownstream(func(dc *downstreamConn) {
                                 dc.updateSupportedCaps()
-                                sendServiceNOTICE(dc, fmt.Sprintf("connected to %s", uc.network.GetName()))
+
+                                if dc.caps["soju.im/bouncer-networks"] {
+                                        dc.SendMessage(&irc.Message{
+                                                Prefix:  dc.srv.prefix(),
+                                                Command: "BOUNCER",
+                                                Params:  []string{"NETWORK", netIDStr, "status=connected"},
+                                        })
+                                } else {
+                                        sendServiceNOTICE(dc, fmt.Sprintf("connected to %s", uc.network.GetName()))
+                                }
 
                                 dc.updateNick()
@@ -641 +654 @@
         }
 
+        netIDStr := fmt.Sprintf("%v", uc.network.ID)
         uc.forEachDownstream(func(dc *downstreamConn) {
                 dc.updateSupportedCaps()
+
+                if dc.caps["soju.im/bouncer-networks"] {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BOUNCER",
+                                Params:  []string{"NETWORK", netIDStr, "status=disconnected"},
+                        })
+                }
         })
 
         if uc.network.lastError == nil {
                 uc.forEachDownstream(func(dc *downstreamConn) {
-                        sendServiceNOTICE(dc, fmt.Sprintf("disconnected from %s", uc.network.GetName()))
+                        if !dc.caps["soju.im/bouncer-networks"] {
+                                sendServiceNOTICE(dc, fmt.Sprintf("disconnected from %s", uc.network.GetName()))
+                        }
                 })
         }
@@ -701 +725 @@
 
         u.addNetwork(network)
+
+        // TODO: broadcast network status
+        idStr := fmt.Sprintf("%v", network.ID)
+        u.forEachDownstream(func(dc *downstreamConn) {
+                if dc.caps["soju.im/bouncer-networks"] {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BOUNCER",
+                                Params:  []string{"NETWORK", idStr, "network=" + network.GetName()},
+                        })
+                }
+        })
 
         return network, nil
@@ -755 +791 @@
         u.addNetwork(updatedNetwork)
 
+        // TODO: broadcast BOUNCER NETWORK notifications
+
         return updatedNetwork, nil
 }
@@ -769 +807 @@
 
         u.removeNetwork(network)
+
+        idStr := fmt.Sprintf("%v", network.ID)
+        u.forEachDownstream(func(dc *downstreamConn) {
+                if dc.caps["soju.im/bouncer-networks"] {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BOUNCER",
+                                Params:  []string{"NETWORK", idStr, "*"},
+                        })
+                }
+        })
+
         return nil
 }