|
@@ -23,7 +23,7 @@ var (
|
23
|
23
|
|
24
|
24
|
// DefaultUserModes are set on all users when they login.
|
25
|
25
|
// this can be overridden in the `accounts` config, with the `default-user-modes` key
|
26
|
|
- DefaultUserModes = modes.ModeChanges{}
|
|
26
|
+ DefaultUserModes = modes.Modes{}
|
27
|
27
|
)
|
28
|
28
|
|
29
|
29
|
// ApplyUserModeChanges applies the given changes, and returns the applied changes.
|
|
@@ -110,32 +110,35 @@ func ApplyUserModeChanges(client *Client, changes modes.ModeChanges, force bool,
|
110
|
110
|
return applied
|
111
|
111
|
}
|
112
|
112
|
|
|
113
|
+// parseDefaultModes uses the provided mode change parser to parse the rawModes.
|
|
114
|
+func parseDefaultModes(rawModes string, parser func(params ...string) (modes.ModeChanges, map[rune]bool)) modes.Modes {
|
|
115
|
+ modeChangeStrings := strings.Fields(rawModes)
|
|
116
|
+ modeChanges, _ := parser(modeChangeStrings...)
|
|
117
|
+ defaultModes := make(modes.Modes, 0)
|
|
118
|
+ for _, modeChange := range modeChanges {
|
|
119
|
+ if modeChange.Op == modes.Add {
|
|
120
|
+ defaultModes = append(defaultModes, modeChange.Mode)
|
|
121
|
+ }
|
|
122
|
+ }
|
|
123
|
+ return defaultModes
|
|
124
|
+}
|
|
125
|
+
|
113
|
126
|
// ParseDefaultChannelModes parses the `default-modes` line of the config
|
114
|
127
|
func ParseDefaultChannelModes(rawModes *string) modes.Modes {
|
115
|
128
|
if rawModes == nil {
|
116
|
129
|
// not present in config, fall back to compile-time default
|
117
|
130
|
return DefaultChannelModes
|
118
|
131
|
}
|
119
|
|
- modeChangeStrings := strings.Fields(*rawModes)
|
120
|
|
- modeChanges, _ := modes.ParseChannelModeChanges(modeChangeStrings...)
|
121
|
|
- defaultChannelModes := make(modes.Modes, 0)
|
122
|
|
- for _, modeChange := range modeChanges {
|
123
|
|
- if modeChange.Op == modes.Add {
|
124
|
|
- defaultChannelModes = append(defaultChannelModes, modeChange.Mode)
|
125
|
|
- }
|
126
|
|
- }
|
127
|
|
- return defaultChannelModes
|
|
132
|
+ return parseDefaultModes(*rawModes, modes.ParseChannelModeChanges)
|
128
|
133
|
}
|
129
|
134
|
|
130
|
135
|
// ParseDefaultUserModes parses the `default-user-modes` line of the config
|
131
|
|
-func ParseDefaultUserModes(rawModes *string) modes.ModeChanges {
|
|
136
|
+func ParseDefaultUserModes(rawModes *string) modes.Modes {
|
132
|
137
|
if rawModes == nil {
|
133
|
138
|
// not present in config, fall back to compile-time default
|
134
|
139
|
return DefaultUserModes
|
135
|
140
|
}
|
136
|
|
- modeChangeStrings := strings.Fields(*rawModes)
|
137
|
|
- modeChanges, _ := modes.ParseUserModeChanges(modeChangeStrings...)
|
138
|
|
- return modeChanges
|
|
141
|
+ return parseDefaultModes(*rawModes, modes.ParseUserModeChanges)
|
139
|
142
|
}
|
140
|
143
|
|
141
|
144
|
// #1021: channel key must be valid as a non-final parameter
|