Changeset 176 in code for trunk

Timestamp:

Mar 27, 2020, 11:07:20 PM (5 years ago)

Author:

delthas

Message:

Make upstream.SendMessageLabeled use an uint64 id

This commit is preparatory work for code that will call
SendMessageLabeled with a direct downstream id rather than a
downstreamConnection pointer.

Location:

trunk

Files:

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

trunk/downstream.go

@@ -1100 +1100 @@
                         } else {
                                 // NAMES on a channel we have not joined, ask upstream
-                                uc.SendMessageLabeled(dc, &irc.Message{
+                                uc.SendMessageLabeled(dc.id, &irc.Message{
                                         Command: "NAMES",
                                         Params:  []string{upstreamChannel},
@@ -1147 +1147 @@
                 }
 
-                uc.SendMessageLabeled(dc, &irc.Message{
+                uc.SendMessageLabeled(dc.id, &irc.Message{
                         Command: "WHO",
                         Params:  params,
@@ -1204 +1204 @@
                 }
 
-                uc.SendMessageLabeled(dc, &irc.Message{
+                uc.SendMessageLabeled(dc.id, &irc.Message{
                         Command: "WHOIS",
                         Params:  params,
@@ -1289 +1289 @@
                 uc := ucChannel
 
-                uc.SendMessageLabeled(dc, &irc.Message{
+                uc.SendMessageLabeled(dc.id, &irc.Message{
                         Command: "INVITE",
                         Params:  []string{upstreamUser, upstreamChannel},

trunk/upstream.go

@@ -1228 +1228 @@
 }
 
-func (uc *upstreamConn) SendMessageLabeled(dc *downstreamConn, msg *irc.Message) {
+func (uc *upstreamConn) SendMessageLabeled(downstreamID uint64, msg *irc.Message) {
         if uc.labelsSupported {
                 if msg.Tags == nil {
                         msg.Tags = make(map[string]irc.TagValue)
                 }
-                msg.Tags["label"] = irc.TagValue(fmt.Sprintf("sd-%d-%d", dc.id, uc.nextLabelID))
+                msg.Tags["label"] = irc.TagValue(fmt.Sprintf("sd-%d-%d", downstreamID, uc.nextLabelID))
                 uc.nextLabelID++
         }