Changeset 163 in code for trunk

Timestamp:

Mar 26, 2020, 9:43:48 PM (5 years ago)

Author:

delthas

Message:

Add downstream INVITE support

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• upstream.go (modified) (1 diff)

trunk/downstream.go

@@ -1237 +1237 @@
                         uc.network.ring.Produce(echoMsg)
                 }
+        case "INVITE":
+                var user, channel string
+                if err := parseMessageParams(msg, &user, &channel); err != nil {
+                        return err
+                }
+
+                ucChannel, upstreamChannel, err := dc.unmarshalEntity(channel)
+                if err != nil {
+                        return err
+                }
+
+                ucUser, upstreamUser, err := dc.unmarshalEntity(user)
+                if err != nil {
+                        return err
+                }
+
+                if ucChannel != ucUser {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_USERNOTINCHANNEL,
+                                Params:  []string{dc.nick, user, channel, "They aren't on that channel"},
+                        }}
+                }
+                uc := ucChannel
+
+                uc.SendMessageLabeled(dc, &irc.Message{
+                        Command: "INVITE",
+                        Params:  []string{upstreamUser, upstreamChannel},
+                })
         default:
                 dc.logger.Printf("unhandled message: %v", msg)

trunk/upstream.go

@@ -1046 +1046 @@
                         })
                 })
+        case irc.RPL_INVITING:
+                var nick string
+                var channel string
+                if err := parseMessageParams(msg, &nick, &channel); err != nil {
+                        return err
+                }
+
+                uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_INVITING,
+                                Params:  []string{dc.nick, dc.marshalNick(uc, nick), dc.marshalChannel(uc, channel)},
+                        })
+                })
         case "TAGMSG":
                 // TODO: relay to downstream connections that accept message-tags