Changeset 146 in code for trunk/downstream.go

Timestamp:

Mar 25, 2020, 10:54:08 AM (5 years ago)

Author:

contact

Message:

Add support for channel keys

File:

• trunk/downstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -833 +833 @@
                         uc.SendMessage(msg)
                 })
-        case "JOIN", "PART":
-                var names string
-                if err := parseMessageParams(msg, &names); err != nil {
-                        return err
-                }
-
-                for _, name := range strings.Split(names, ",") {
+        case "JOIN":
+                var namesStr string
+                if err := parseMessageParams(msg, &namesStr); err != nil {
+                        return err
+                }
+
+                var keys []string
+                if len(msg.Params) > 1 {
+                        keys = strings.Split(msg.Params[1], ",")
+                }
+
+                for i, name := range strings.Split(namesStr, ",") {
                         uc, upstreamName, err := dc.unmarshalEntity(name)
                         if err != nil {
@@ -848 +853 @@
                         }
 
+                        var key string
+                        if len(keys) > i {
+                                key = keys[i]
+                        }
+
+                        params := []string{upstreamName}
+                        if key != "" {
+                                params = append(params, key)
+                        }
                         uc.SendMessage(&irc.Message{
-                                Command: msg.Command,
-                                Params:  []string{upstreamName},
-                        })
-
-                        switch msg.Command {
-                        case "JOIN":
-                                err := dc.srv.db.StoreChannel(uc.network.ID, &Channel{
-                                        Name: upstreamName,
-                                })
-                                if err != nil {
-                                        dc.logger.Printf("failed to create channel %q in DB: %v", upstreamName, err)
-                                }
-                        case "PART":
-                                if err := dc.srv.db.DeleteChannel(uc.network.ID, upstreamName); err != nil {
-                                        dc.logger.Printf("failed to delete channel %q in DB: %v", upstreamName, err)
-                                }
+                                Command: "JOIN",
+                                Params:  params,
+                        })
+
+                        err = dc.srv.db.StoreChannel(uc.network.ID, &Channel{
+                                Name: upstreamName,
+                                Key:  key,
+                        })
+                        if err != nil {
+                                dc.logger.Printf("failed to create channel %q in DB: %v", upstreamName, err)
+                        }
+                }
+        case "PART":
+                var namesStr string
+                if err := parseMessageParams(msg, &namesStr); err != nil {
+                        return err
+                }
+
+                var reason string
+                if len(msg.Params) > 1 {
+                        reason = msg.Params[1]
+                }
+
+                for _, name := range strings.Split(namesStr, ",") {
+                        uc, upstreamName, err := dc.unmarshalEntity(name)
+                        if err != nil {
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_NOSUCHCHANNEL,
+                                        Params:  []string{name, err.Error()},
+                                }}
+                        }
+
+                        params := []string{upstreamName}
+                        if reason != "" {
+                                params = append(params, reason)
+                        }
+                        uc.SendMessage(&irc.Message{
+                                Command: "PART",
+                                Params:  params,
+                        })
+
+                        if err := dc.srv.db.DeleteChannel(uc.network.ID, upstreamName); err != nil {
+                                dc.logger.Printf("failed to delete channel %q in DB: %v", upstreamName, err)
                         }
                 }