Changeset 535 in code for trunk/user.go

Timestamp:

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

Author:

contact

Message:

Introduce the soju.im/bouncer-networks-notify capability

File:

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

trunk/user.go

@@ -519 +519 @@
                                 dc.updateSupportedCaps()
 
-                                if dc.caps["soju.im/bouncer-networks"] {
+                                if dc.caps["soju.im/bouncer-networks-notify"] {
                                         dc.SendMessage(&irc.Message{
                                                 Prefix:  dc.srv.prefix(),
@@ -658 +658 @@
                 dc.updateSupportedCaps()
 
-                if dc.caps["soju.im/bouncer-networks"] {
+                if dc.caps["soju.im/bouncer-networks-notify"] {
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -726 +726 @@
         u.addNetwork(network)
 
-        // TODO: broadcast network status
         idStr := fmt.Sprintf("%v", network.ID)
+        attrs := getNetworkAttrs(network)
         u.forEachDownstream(func(dc *downstreamConn) {
-                if dc.caps["soju.im/bouncer-networks"] {
+                if dc.caps["soju.im/bouncer-networks-notify"] {
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
                                 Command: "BOUNCER",
-                                Params:  []string{"NETWORK", idStr, "network=" + network.GetName()},
+                                Params:  []string{"NETWORK", idStr, attrs.String()},
                         })
                 }
@@ -791 +791 @@
         u.addNetwork(updatedNetwork)
 
-        // TODO: broadcast BOUNCER NETWORK notifications
+        // TODO: only broadcast attributes that have changed
+        idStr := fmt.Sprintf("%v", updatedNetwork.ID)
+        attrs := getNetworkAttrs(updatedNetwork)
+        u.forEachDownstream(func(dc *downstreamConn) {
+                if dc.caps["soju.im/bouncer-networks-notify"] {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: "BOUNCER",
+                                Params:  []string{"NETWORK", idStr, attrs.String()},
+                        })
+                }
+        })
 
         return updatedNetwork, nil
@@ -810 +821 @@
         idStr := fmt.Sprintf("%v", network.ID)
         u.forEachDownstream(func(dc *downstreamConn) {
-                if dc.caps["soju.im/bouncer-networks"] {
+                if dc.caps["soju.im/bouncer-networks-notify"] {
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),