Changeset 153 in code for trunk/upstream.go

Timestamp:

Mar 25, 2020, 10:16:53 PM (5 years ago)

Author:

delthas

Message:

Add upstream batch capability support

File:

• trunk/upstream.go (modified) (5 diffs)

trunk/upstream.go

@@ -50 +50 @@
         channels   map[string]*upstreamChannel
         caps       map[string]string
+        batches    map[string]batch
 
         tagsSupported bool
@@ -84 +85 @@
                 channels:              make(map[string]*upstreamChannel),
                 caps:                  make(map[string]string),
+                batches:               make(map[string]batch),
                 availableChannelTypes: stdChannelTypes,
                 availableChannelModes: stdChannelModes,
@@ -151 +153 @@
 
 func (uc *upstreamConn) handleMessage(msg *irc.Message) error {
+        var msgBatch *batch
+        if batchName, ok := msg.GetTag("batch"); ok {
+                b, ok := uc.batches[batchName]
+                if !ok {
+                        return fmt.Errorf("unexpected batch reference: batch was not defined: %q", batchName)
+                }
+                msgBatch = &b
+        }
+
         switch msg.Command {
         case "PING":
@@ -194 +205 @@
 
                         requestCaps := make([]string, 0, 16)
-                        for _, c := range []string{"message-tags"} {
+                        for _, c := range []string{"message-tags", "batch"} {
                                 if _, ok := uc.caps[c]; ok {
                                         requestCaps = append(requestCaps, c)
@@ -406 +417 @@
                         }
                 }
+        case "BATCH":
+                var tag string
+                if err := parseMessageParams(msg, &tag); err != nil {
+                        return err
+                }
+
+                if strings.HasPrefix(tag, "+") {
+                        tag = tag[1:]
+                        if _, ok := uc.batches[tag]; ok {
+                                return fmt.Errorf("unexpected BATCH reference tag: batch was already defined: %q", tag)
+                        }
+                        var batchType string
+                        if err := parseMessageParams(msg, nil, &batchType); err != nil {
+                                return err
+                        }
+                        uc.batches[tag] = batch{
+                                Type:   batchType,
+                                Params: msg.Params[2:],
+                                Outer:  msgBatch,
+                        }
+                } else if strings.HasPrefix(tag, "-") {
+                        tag = tag[1:]
+                        if _, ok := uc.batches[tag]; !ok {
+                                return fmt.Errorf("unknown BATCH reference tag: %q", tag)
+                        }
+                        delete(uc.batches, tag)
+                } else {
+                        return fmt.Errorf("unexpected BATCH reference tag: missing +/- prefix: %q", tag)
+                }
         case "NICK":
                 if msg.Prefix == nil {