|
@@ -52,8 +52,7 @@ For example, $bAMODE #channel +o dan$b grants the the holder of the "dan"
|
52
|
52
|
account the +o operator mode every time they join #channel. To list current
|
53
|
53
|
accounts and modes, use $bAMODE #channel$b. Note that users are always
|
54
|
54
|
referenced by their registered account names, not their nicknames.`,
|
55
|
|
- helpShort: `$bAMODE$b modifies persistent mode settings for channel members.`,
|
56
|
|
- authRequired: true,
|
|
55
|
+ helpShort: `$bAMODE$b modifies persistent mode settings for channel members.`,
|
57
|
56
|
},
|
58
|
57
|
}
|
59
|
58
|
)
|
|
@@ -70,61 +69,69 @@ func csAmodeHandler(server *Server, client *Client, command, params string, rb *
|
70
|
69
|
if channel == nil {
|
71
|
70
|
csNotice(rb, client.t("Channel does not exist"))
|
72
|
71
|
return
|
73
|
|
- }
|
74
|
|
-
|
75
|
|
- clientAccount := client.Account()
|
76
|
|
- if clientAccount == "" || clientAccount != channel.Founder() {
|
77
|
|
- csNotice(rb, client.t("You must be the channel founder to use AMODE"))
|
|
72
|
+ } else if channel.Founder() == "" {
|
|
73
|
+ csNotice(rb, client.t("Channel is not registered"))
|
78
|
74
|
return
|
79
|
75
|
}
|
80
|
76
|
|
81
|
77
|
modeChanges, unknown := modes.ParseChannelModeChanges(strings.Fields(modeChange)...)
|
82
|
|
-
|
|
78
|
+ var change modes.ModeChange
|
83
|
79
|
if len(modeChanges) > 1 || len(unknown) > 0 {
|
84
|
80
|
csNotice(rb, client.t("Invalid mode change"))
|
85
|
81
|
return
|
|
82
|
+ } else if len(modeChanges) == 1 {
|
|
83
|
+ change = modeChanges[0]
|
|
84
|
+ } else {
|
|
85
|
+ change = modes.ModeChange{Op: modes.List}
|
86
|
86
|
}
|
87
|
87
|
|
88
|
|
- if len(modeChanges) == 0 || modeChanges[0].Op == modes.List {
|
89
|
|
- persistentModes := channel.AccountToUmode()
|
90
|
|
- // sort the persistent modes in descending order of priority, i.e.,
|
91
|
|
- // ascending order of their index in the ChannelUserModes list
|
92
|
|
- sort.Slice(persistentModes, func(i, j int) bool {
|
93
|
|
- index := func(modeChange modes.ModeChange) int {
|
94
|
|
- for idx, mode := range modes.ChannelUserModes {
|
95
|
|
- if modeChange.Mode == mode {
|
96
|
|
- return idx
|
97
|
|
- }
|
98
|
|
- }
|
99
|
|
- return len(modes.ChannelUserModes)
|
100
|
|
- }
|
101
|
|
- return index(persistentModes[i]) < index(persistentModes[j])
|
102
|
|
- })
|
103
|
|
- csNotice(rb, fmt.Sprintf(client.t("Channel %s has %d persistent modes set"), channelName, len(persistentModes)))
|
104
|
|
- for _, modeChange := range persistentModes {
|
105
|
|
- csNotice(rb, fmt.Sprintf(client.t("Account %s receives mode +%s"), modeChange.Arg, string(modeChange.Mode)))
|
106
|
|
- }
|
107
|
|
- return
|
108
|
|
- }
|
109
|
|
-
|
|
88
|
+ // normalize and validate the account argument
|
110
|
89
|
accountIsValid := false
|
111
|
|
- change := modeChanges[0]
|
112
|
|
- // Arg is the account name, casefold it here
|
113
|
90
|
change.Arg, _ = CasefoldName(change.Arg)
|
114
|
|
- if change.Arg != "" {
|
115
|
|
- _, err := server.accounts.LoadAccount(change.Arg)
|
116
|
|
- accountIsValid = (err == nil)
|
|
91
|
+ switch change.Op {
|
|
92
|
+ case modes.List:
|
|
93
|
+ accountIsValid = true
|
|
94
|
+ case modes.Add:
|
|
95
|
+ // if we're adding a mode, the account must exist
|
|
96
|
+ if change.Arg != "" {
|
|
97
|
+ _, err := server.accounts.LoadAccount(change.Arg)
|
|
98
|
+ accountIsValid = (err == nil)
|
|
99
|
+ }
|
|
100
|
+ case modes.Remove:
|
|
101
|
+ // allow removal of accounts that may have been deleted
|
|
102
|
+ accountIsValid = (change.Arg != "")
|
117
|
103
|
}
|
118
|
104
|
if !accountIsValid {
|
119
|
105
|
csNotice(rb, client.t("Account does not exist"))
|
120
|
106
|
return
|
121
|
107
|
}
|
122
|
|
- applied := channel.ApplyAccountToUmodeChange(change)
|
123
|
|
- if applied {
|
124
|
|
- csNotice(rb, fmt.Sprintf(client.t("Successfully set mode %s"), change.String()))
|
125
|
|
- go server.channelRegistry.StoreChannel(channel, IncludeLists)
|
126
|
|
- } else {
|
127
|
|
- csNotice(rb, client.t("Change was a no-op"))
|
|
108
|
+
|
|
109
|
+ affectedModes, err := channel.ProcessAccountToUmodeChange(client, change)
|
|
110
|
+
|
|
111
|
+ if err == errInsufficientPrivs {
|
|
112
|
+ csNotice(rb, client.t("Insufficient privileges"))
|
|
113
|
+ return
|
|
114
|
+ } else if err != nil {
|
|
115
|
+ csNotice(rb, client.t("Internal error"))
|
|
116
|
+ return
|
|
117
|
+ }
|
|
118
|
+
|
|
119
|
+ switch change.Op {
|
|
120
|
+ case modes.List:
|
|
121
|
+ // sort the persistent modes in descending order of priority
|
|
122
|
+ sort.Slice(affectedModes, func(i, j int) bool {
|
|
123
|
+ return umodeGreaterThan(affectedModes[i].Mode, affectedModes[j].Mode)
|
|
124
|
+ })
|
|
125
|
+ csNotice(rb, fmt.Sprintf(client.t("Channel %s has %d persistent modes set"), channelName, len(affectedModes)))
|
|
126
|
+ for _, modeChange := range affectedModes {
|
|
127
|
+ csNotice(rb, fmt.Sprintf(client.t("Account %s receives mode +%s"), modeChange.Arg, string(modeChange.Mode)))
|
|
128
|
+ }
|
|
129
|
+ case modes.Add, modes.Remove:
|
|
130
|
+ if len(affectedModes) > 0 {
|
|
131
|
+ csNotice(rb, fmt.Sprintf(client.t("Successfully set mode %s"), change.String()))
|
|
132
|
+ } else {
|
|
133
|
+ csNotice(rb, client.t("Change was a no-op"))
|
|
134
|
+ }
|
128
|
135
|
}
|
129
|
136
|
}
|
130
|
137
|
|