Changeset 539 in code for trunk

Timestamp:

May 25, 2021, 5:22:22 PM (4 years ago)

Author:

contact

Message:

Add channel status service command

Location:

trunk

Files:

• doc/soju.1.scd (modified) (1 diff)
• service.go (modified) (2 diffs)

trunk/doc/soju.1.scd

@@ -187 +187 @@
         Show a list of saved networks and their current status.
 
+*channel status* [options...]
+        Show a list of saved channels and their current status.
+
+        Options:
+
+        *-network* <name>
+                Only show channels for the specified network. By default, only the
+                channels in the current network are displayed.
+
 *channel update* <name> [options...]
         Update the options of an existing channel.

trunk/service.go

@@ -222 +222 @@
                 "channel": {
                         children: serviceCommandSet{
+                                "status": {
+                                        usage:  "[-network name]",
+                                        desc:   "show a list of saved channels and their current status",
+                                        handle: handleServiceChannelStatus,
+                                },
                                 "update": {
                                         usage:  "<name> [-relay-detached <default|none|highlight|message>] [-reattach-on <default|none|highlight|message>] [-detach-after <duration>] [-detach-on <default|none|highlight|message>]",
@@ -708 +713 @@
 }
 
+func handleServiceChannelStatus(dc *downstreamConn, params []string) error {
+        var defaultNetworkName string
+        if dc.network != nil {
+                defaultNetworkName = dc.network.GetName()
+        }
+
+        fs := newFlagSet()
+        networkName := fs.String("network", defaultNetworkName, "")
+
+        if err := fs.Parse(params); err != nil {
+                return err
+        }
+
+        sendNetwork := func(net *network) {
+                for _, entry := range net.channels.innerMap {
+                        ch := entry.value.(*Channel)
+
+                        var uch *upstreamChannel
+                        if net.conn != nil {
+                                uch = net.conn.channels.Value(ch.Name)
+                        }
+
+                        name := ch.Name
+                        if *networkName == "" {
+                                name += "/" + net.GetName()
+                        }
+
+                        var status string
+                        if uch != nil {
+                                status = "joined"
+                        } else if net.conn != nil {
+                                status = "parted"
+                        } else {
+                                status = "disconnected"
+                        }
+
+                        if ch.Detached {
+                                status += ", detached"
+                        }
+
+                        s := fmt.Sprintf("%v [%v]", name, status)
+                        sendServicePRIVMSG(dc, s)
+                }
+        }
+
+        if *networkName == "" {
+                dc.user.forEachNetwork(sendNetwork)
+        } else {
+                net := dc.user.getNetwork(*networkName)
+                if net == nil {
+                        return fmt.Errorf("unknown network %q", *networkName)
+                }
+                sendNetwork(net)
+        }
+
+        return nil
+}
+
 type channelFlagSet struct {
         *flag.FlagSet