Changeset 649 in code for trunk

Timestamp:

Oct 17, 2021, 7:54:18 PM (4 years ago)

Author:

contact

Message:

Unify away-notify and account-notify handling

Location:

trunk

Files:

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

trunk/downstream.go

@@ -411 +411 @@
                 return
         }
+        if msg.Command == "AWAY" && !dc.caps["away-notify"] {
+                // TODO: we can send AWAY if we just sent a PRIVMSG/NOTICE to this user
+                return
+        }
         if msg.Command == "ACCOUNT" && !dc.caps["account-notify"] {
                 return

trunk/upstream.go

@@ -1372 +1372 @@
                         })
                 })
-        case "AWAY":
-                if msg.Prefix == nil {
-                        return fmt.Errorf("expected a prefix")
-                }
-
-                uc.forEachDownstream(func(dc *downstreamConn) {
-                        if !dc.caps["away-notify"] {
-                                return
-                        }
-                        dc.SendMessage(&irc.Message{
-                                Prefix:  dc.marshalUserPrefix(uc.network, msg.Prefix),
-                                Command: "AWAY",
-                                Params:  msg.Params,
-                        })
-                })
-        case "ACCOUNT":
+        case "AWAY", "ACCOUNT":
                 if msg.Prefix == nil {
                         return fmt.Errorf("expected a prefix")