Changeset 346 in code for trunk

Timestamp:

Jun 30, 2020, 8:28:05 AM (5 years ago)

Author:

hubert

Message:

Send compact channel name lists

This commit resolves sendNames' TODO.

Location:

trunk

Files:

• bridge.go (modified) (2 diffs)
• irc.go (modified) (1 diff)

trunk/bridge.go

@@ -3 +3 @@
 import (
         "gopkg.in/irc.v3"
+        "strings"
 )
 
@@ -35 +36 @@
 
 func sendNames(dc *downstreamConn, ch *upstreamChannel) {
-        // TODO: send multiple members in each message
-
         downstreamName := dc.marshalEntity(ch.conn.network, ch.Name)
 
+        emptyNameReply := &irc.Message{
+                Prefix:  dc.srv.prefix(),
+                Command: irc.RPL_NAMREPLY,
+                Params:  []string{dc.nick, string(ch.Status), downstreamName, ""},
+        }
+        maxLength := maxMessageLength - len(emptyNameReply.String())
+
+        var buf strings.Builder
         for nick, memberships := range ch.Members {
                 s := memberships.Format(dc) + dc.marshalEntity(ch.conn.network, nick)
 
+                if buf.Len() != 0 && maxLength < buf.Len()+1+len(s) {
+                        // There's not enough space for the next space + nick.
+                        dc.SendMessage(&irc.Message{
+                                Prefix:  dc.srv.prefix(),
+                                Command: irc.RPL_NAMREPLY,
+                                Params:  []string{dc.nick, string(ch.Status), downstreamName, buf.String()},
+                        })
+                        buf.Reset()
+                }
+
+                if buf.Len() != 0 {
+                        buf.WriteByte(' ')
+                }
+                buf.WriteString(s)
+        }
+
+        if buf.Len() != 0 {
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
                         Command: irc.RPL_NAMREPLY,
-                        Params:  []string{dc.nick, string(ch.Status), downstreamName, s},
+                        Params:  []string{dc.nick, string(ch.Status), downstreamName, buf.String()},
                 })
         }

trunk/irc.go

@@ -16 +16 @@
         err_invalidcapcmd = "410"
 )
+
+const maxMessageLength = 512
 
 type userModes string