Changeset 120 in code for trunk

Timestamp:

Mar 19, 2020, 12:14:44 AM (5 years ago)

Author:

delthas

Message:

Add create-network bouncer service command

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• service.go (modified) (3 diffs)
• user.go (modified) (1 diff)

trunk/downstream.go

@@ -639 +639 @@
                 dc.logger.Printf("auto-saving network %q", networkName)
                 var err error
-                network, err = dc.user.createNetwork(networkName, dc.nick)
+                network, err = dc.user.createNetwork(&Network{
+                        Addr: networkName,
+                        Nick: dc.nick,
+                })
                 if err != nil {
                         return err

trunk/service.go

@@ -2 +2 @@
 
 import (
+        "flag"
         "fmt"
+        "io/ioutil"
         "strings"
 
@@ -59 +61 @@
                         handle: handleServiceHelp,
                 },
+                "create-network": {
+                        usage:  "-addr <addr> [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick]",
+                        desc:   "add a new network",
+                        handle: handleServiceCreateNetwork,
+                },
         }
 }
@@ -86 +93 @@
         return nil
 }
+
+func handleServiceCreateNetwork(dc *downstreamConn, params []string) error {
+        fs := flag.NewFlagSet("", flag.ContinueOnError)
+        fs.SetOutput(ioutil.Discard)
+        addr := fs.String("addr", "", "")
+        name := fs.String("name", "", "")
+        username := fs.String("username", "", "")
+        pass := fs.String("pass", "", "")
+        realname := fs.String("realname", "", "")
+        nick := fs.String("nick", "", "")
+
+        if err := fs.Parse(params); err != nil {
+                return err
+        }
+        if *addr == "" {
+                return fmt.Errorf("flag addr is required")
+        }
+
+        if *nick == "" {
+                *nick = dc.nick
+        }
+
+        var err error
+        network, err := dc.user.createNetwork(&Network{
+                Addr:     *addr,
+                Name:     *name,
+                Username: *username,
+                Pass:     *pass,
+                Realname: *realname,
+                Nick:     *nick,
+        })
+        if err != nil {
+                return fmt.Errorf("could not create network: %v", err)
+        }
+
+        sendServicePRIVMSG(dc, fmt.Sprintf("created network %s successfully", network.GetName()))
+        return nil
+}

trunk/user.go

@@ -159 +159 @@
 }
 
-func (u *user) createNetwork(addr, nick string) (*network, error) {
-        network := newNetwork(u, &Network{
-                Addr: addr,
-                Nick: nick,
-        })
+func (u *user) createNetwork(net *Network) (*network, error) {
+        network := newNetwork(u, net)
         err := u.srv.db.StoreNetwork(u.Username, &network.Network)
         if err != nil {