Changeset 286 in code for trunk

Timestamp:

May 1, 2020, 4:12:47 PM (5 years ago)

Author:

contact

Message:

Unify upstream NOTICE and PRIVMSG handling

File:

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

trunk/upstream.go

@@ -278 +278 @@
                 })
                 return nil
-        case "NOTICE":
+        case "NOTICE", "PRIVMSG":
                 if msg.Prefix == nil {
                         return fmt.Errorf("expected a prefix")
                 }
 
+                var entity, text string
+                if err := parseMessageParams(msg, &entity, &text); err != nil {
+                        return err
+                }
+
+                if msg.Prefix.Name == serviceNick {
+                        uc.logger.Printf("skipping %v from soju's service: %v", msg.Command, msg)
+                        break
+                }
+                if entity == serviceNick {
+                        uc.logger.Printf("skipping %v to soju's service: %v", msg.Command, msg)
+                        break
+                }
+
                 if msg.Prefix.User == "" && msg.Prefix.Host == "" { // server message
                         uc.produce("", msg, nil)
-                } else { // regular user NOTICE
-                        var entity, text string
-                        if err := parseMessageParams(msg, &entity, &text); err != nil {
-                                return err
-                        }
-
+                } else { // regular user NOTICE or PRIVMSG
                         target := entity
                         if target == uc.nick {
@@ -1084 +1093 @@
                         })
                 })
-        case "PRIVMSG":
-                if msg.Prefix == nil {
-                        return fmt.Errorf("expected a prefix")
-                }
-
-                var entity, text string
-                if err := parseMessageParams(msg, &entity, &text); err != nil {
-                        return err
-                }
-
-                if msg.Prefix.Name == serviceNick {
-                        uc.logger.Printf("skipping PRIVMSG from soju's service: %v", msg)
-                        break
-                }
-                if entity == serviceNick {
-                        uc.logger.Printf("skipping PRIVMSG to soju's service: %v", msg)
-                        break
-                }
-
-                target := entity
-                if target == uc.nick {
-                        target = msg.Prefix.Name
-                }
-                uc.produce(target, msg, nil)
         case "INVITE":
                 var nick, channel string