Changeset 145 in code for trunk

Timestamp:

Mar 25, 2020, 10:32:44 AM (5 years ago)

Author:

contact

Message:

Handle downstream JOIN/PART with multiple channel names

Closes: ​https://todo.sr.ht/~emersion/soju/19

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -834 +834 @@
                 })
         case "JOIN", "PART":
-                var name string
-                if err := parseMessageParams(msg, &name); err != nil {
-                        return err
-                }
-
-                uc, upstreamName, err := dc.unmarshalEntity(name)
-                if err != nil {
-                        return ircError{&irc.Message{
-                                Command: irc.ERR_NOSUCHCHANNEL,
-                                Params:  []string{name, err.Error()},
-                        }}
-                }
-
-                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,
-                        })
+                var names string
+                if err := parseMessageParams(msg, &names); err != nil {
+                        return err
+                }
+
+                for _, name := range strings.Split(names, ",") {
+                        uc, upstreamName, err := dc.unmarshalEntity(name)
                         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)
+                                return ircError{&irc.Message{
+                                        Command: irc.ERR_NOSUCHCHANNEL,
+                                        Params:  []string{name, err.Error()},
+                                }}
+                        }
+
+                        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)
+                                }
                         }
                 }