Changeset 462 in code for trunk/upstream.go

Timestamp:

Mar 15, 2021, 10:11:42 PM (4 years ago)

Author:

contact

Message:

Properly handle all ISUPPORT negations

File:

• trunk/upstream.go (modified) (1 diff)

trunk/upstream.go

@@ -635 +635 @@
                         }
 
-                        if !negate && hasValue {
-                                // TODO: reset to defaults when the token is negated
-                                switch parameter {
-                                case "CHANMODES":
-                                        if err := uc.handleChanModes(value); err != nil {
-                                                return err
-                                        }
-                                case "CHANTYPES":
+                        var err error
+                        switch parameter {
+                        case "CHANMODES":
+                                if !negate {
+                                        err = uc.handleChanModes(value)
+                                } else {
+                                        uc.availableChannelModes = stdChannelModes
+                                }
+                        case "CHANTYPES":
+                                if !negate {
                                         uc.availableChannelTypes = value
-                                case "PREFIX":
-                                        if err := uc.handleMemberships(value); err != nil {
-                                                return err
-                                        }
+                                } else {
+                                        uc.availableChannelTypes = stdChannelTypes
                                 }
+                        case "PREFIX":
+                                if !negate {
+                                        err = uc.handleMemberships(value)
+                                } else {
+                                        uc.availableMemberships = stdMemberships
+                                }
+                        }
+                        if err != nil {
+                                return err
                         }
                 }