Browse Source

fix #2109 (#2111)

Remove numerics associated with the retired ACC spec
tags/v2.13.0-rc1
Shivaram Lingamneni 4 months ago
parent
commit
ce162e9279
No account linked to committer's email address
2 changed files with 182 additions and 187 deletions
  1. 0
    2
      irc/handlers.go
  2. 182
    185
      irc/numerics.go

+ 0
- 2
irc/handlers.go View File

@@ -90,8 +90,6 @@ func sendSuccessfulRegResponse(service *ircService, client *Client, rb *Response
90 90
 	details := client.Details()
91 91
 	if service != nil {
92 92
 		service.Notice(rb, client.t("Account created"))
93
-	} else {
94
-		rb.Add(nil, client.server.name, RPL_REG_SUCCESS, details.nick, details.accountName, client.t("Account created"))
95 93
 	}
96 94
 	client.server.snomasks.Send(sno.LocalAccounts, fmt.Sprintf(ircfmt.Unescape("Client $c[grey][$r%s$c[grey]] registered account $c[grey][$r%s$c[grey]] from IP %s"), details.nickMask, details.accountName, rb.session.IP().String()))
97 95
 	sendSuccessfulAccountAuth(service, client, rb, false)

+ 182
- 185
irc/numerics.go View File

@@ -12,189 +12,186 @@ package irc
12 12
 // server ecosystem out there. Custom numerics will be marked as such.
13 13
 
14 14
 const (
15
-	RPL_WELCOME                   = "001"
16
-	RPL_YOURHOST                  = "002"
17
-	RPL_CREATED                   = "003"
18
-	RPL_MYINFO                    = "004"
19
-	RPL_ISUPPORT                  = "005"
20
-	RPL_SNOMASKIS                 = "008"
21
-	RPL_BOUNCE                    = "010"
22
-	RPL_TRACELINK                 = "200"
23
-	RPL_TRACECONNECTING           = "201"
24
-	RPL_TRACEHANDSHAKE            = "202"
25
-	RPL_TRACEUNKNOWN              = "203"
26
-	RPL_TRACEOPERATOR             = "204"
27
-	RPL_TRACEUSER                 = "205"
28
-	RPL_TRACESERVER               = "206"
29
-	RPL_TRACESERVICE              = "207"
30
-	RPL_TRACENEWTYPE              = "208"
31
-	RPL_TRACECLASS                = "209"
32
-	RPL_TRACERECONNECT            = "210"
33
-	RPL_STATSLINKINFO             = "211"
34
-	RPL_STATSCOMMANDS             = "212"
35
-	RPL_ENDOFSTATS                = "219"
36
-	RPL_UMODEIS                   = "221"
37
-	RPL_SERVLIST                  = "234"
38
-	RPL_SERVLISTEND               = "235"
39
-	RPL_STATSUPTIME               = "242"
40
-	RPL_STATSOLINE                = "243"
41
-	RPL_LUSERCLIENT               = "251"
42
-	RPL_LUSEROP                   = "252"
43
-	RPL_LUSERUNKNOWN              = "253"
44
-	RPL_LUSERCHANNELS             = "254"
45
-	RPL_LUSERME                   = "255"
46
-	RPL_ADMINME                   = "256"
47
-	RPL_ADMINLOC1                 = "257"
48
-	RPL_ADMINLOC2                 = "258"
49
-	RPL_ADMINEMAIL                = "259"
50
-	RPL_TRACELOG                  = "261"
51
-	RPL_TRACEEND                  = "262"
52
-	RPL_TRYAGAIN                  = "263"
53
-	RPL_LOCALUSERS                = "265"
54
-	RPL_GLOBALUSERS               = "266"
55
-	RPL_WHOISCERTFP               = "276"
56
-	RPL_AWAY                      = "301"
57
-	RPL_USERHOST                  = "302"
58
-	RPL_ISON                      = "303"
59
-	RPL_UNAWAY                    = "305"
60
-	RPL_NOWAWAY                   = "306"
61
-	RPL_WHOISUSER                 = "311"
62
-	RPL_WHOISSERVER               = "312"
63
-	RPL_WHOISOPERATOR             = "313"
64
-	RPL_WHOWASUSER                = "314"
65
-	RPL_ENDOFWHO                  = "315"
66
-	RPL_WHOISIDLE                 = "317"
67
-	RPL_ENDOFWHOIS                = "318"
68
-	RPL_WHOISCHANNELS             = "319"
69
-	RPL_LIST                      = "322"
70
-	RPL_LISTEND                   = "323"
71
-	RPL_CHANNELMODEIS             = "324"
72
-	RPL_UNIQOPIS                  = "325"
73
-	RPL_CREATIONTIME              = "329"
74
-	RPL_WHOISACCOUNT              = "330"
75
-	RPL_NOTOPIC                   = "331"
76
-	RPL_TOPIC                     = "332"
77
-	RPL_TOPICTIME                 = "333"
78
-	RPL_WHOISBOT                  = "335"
79
-	RPL_WHOISACTUALLY             = "338"
80
-	RPL_INVITING                  = "341"
81
-	RPL_SUMMONING                 = "342"
82
-	RPL_INVITELIST                = "346"
83
-	RPL_ENDOFINVITELIST           = "347"
84
-	RPL_EXCEPTLIST                = "348"
85
-	RPL_ENDOFEXCEPTLIST           = "349"
86
-	RPL_VERSION                   = "351"
87
-	RPL_WHOREPLY                  = "352"
88
-	RPL_NAMREPLY                  = "353"
89
-	RPL_WHOSPCRPL                 = "354"
90
-	RPL_LINKS                     = "364"
91
-	RPL_ENDOFLINKS                = "365"
92
-	RPL_ENDOFNAMES                = "366"
93
-	RPL_BANLIST                   = "367"
94
-	RPL_ENDOFBANLIST              = "368"
95
-	RPL_ENDOFWHOWAS               = "369"
96
-	RPL_INFO                      = "371"
97
-	RPL_MOTD                      = "372"
98
-	RPL_ENDOFINFO                 = "374"
99
-	RPL_MOTDSTART                 = "375"
100
-	RPL_ENDOFMOTD                 = "376"
101
-	RPL_WHOISMODES                = "379"
102
-	RPL_YOUREOPER                 = "381"
103
-	RPL_REHASHING                 = "382"
104
-	RPL_YOURESERVICE              = "383"
105
-	RPL_TIME                      = "391"
106
-	RPL_USERSSTART                = "392"
107
-	RPL_USERS                     = "393"
108
-	RPL_ENDOFUSERS                = "394"
109
-	RPL_NOUSERS                   = "395"
110
-	ERR_UNKNOWNERROR              = "400"
111
-	ERR_NOSUCHNICK                = "401"
112
-	ERR_NOSUCHSERVER              = "402"
113
-	ERR_NOSUCHCHANNEL             = "403"
114
-	ERR_CANNOTSENDTOCHAN          = "404"
115
-	ERR_TOOMANYCHANNELS           = "405"
116
-	ERR_WASNOSUCHNICK             = "406"
117
-	ERR_TOOMANYTARGETS            = "407"
118
-	ERR_NOSUCHSERVICE             = "408"
119
-	ERR_NOORIGIN                  = "409"
120
-	ERR_INVALIDCAPCMD             = "410"
121
-	ERR_NORECIPIENT               = "411"
122
-	ERR_NOTEXTTOSEND              = "412"
123
-	ERR_NOTOPLEVEL                = "413"
124
-	ERR_WILDTOPLEVEL              = "414"
125
-	ERR_BADMASK                   = "415"
126
-	ERR_INPUTTOOLONG              = "417"
127
-	ERR_UNKNOWNCOMMAND            = "421"
128
-	ERR_NOMOTD                    = "422"
129
-	ERR_NOADMININFO               = "423"
130
-	ERR_FILEERROR                 = "424"
131
-	ERR_NONICKNAMEGIVEN           = "431"
132
-	ERR_ERRONEUSNICKNAME          = "432"
133
-	ERR_NICKNAMEINUSE             = "433"
134
-	ERR_NICKCOLLISION             = "436"
135
-	ERR_UNAVAILRESOURCE           = "437"
136
-	ERR_REG_UNAVAILABLE           = "440"
137
-	ERR_USERNOTINCHANNEL          = "441"
138
-	ERR_NOTONCHANNEL              = "442"
139
-	ERR_USERONCHANNEL             = "443"
140
-	ERR_NOLOGIN                   = "444"
141
-	ERR_SUMMONDISABLED            = "445"
142
-	ERR_USERSDISABLED             = "446"
143
-	ERR_NOTREGISTERED             = "451"
144
-	ERR_NEEDMOREPARAMS            = "461"
145
-	ERR_ALREADYREGISTRED          = "462"
146
-	ERR_NOPERMFORHOST             = "463"
147
-	ERR_PASSWDMISMATCH            = "464"
148
-	ERR_YOUREBANNEDCREEP          = "465"
149
-	ERR_YOUWILLBEBANNED           = "466"
150
-	ERR_KEYSET                    = "467"
151
-	ERR_INVALIDUSERNAME           = "468"
152
-	ERR_LINKCHANNEL               = "470"
153
-	ERR_CHANNELISFULL             = "471"
154
-	ERR_UNKNOWNMODE               = "472"
155
-	ERR_INVITEONLYCHAN            = "473"
156
-	ERR_BANNEDFROMCHAN            = "474"
157
-	ERR_BADCHANNELKEY             = "475"
158
-	ERR_BADCHANMASK               = "476"
159
-	ERR_NEEDREGGEDNICK            = "477" // conflicted with ERR_NOCHANMODES; see #936
160
-	ERR_BANLISTFULL               = "478"
161
-	ERR_NOPRIVILEGES              = "481"
162
-	ERR_CHANOPRIVSNEEDED          = "482"
163
-	ERR_CANTKILLSERVER            = "483"
164
-	ERR_RESTRICTED                = "484"
165
-	ERR_UNIQOPPRIVSNEEDED         = "485"
166
-	ERR_NOOPERHOST                = "491"
167
-	ERR_UMODEUNKNOWNFLAG          = "501"
168
-	ERR_USERSDONTMATCH            = "502"
169
-	ERR_HELPNOTFOUND              = "524"
170
-	ERR_CANNOTSENDRP              = "573"
171
-	RPL_WHOWASIP                  = "652"
172
-	RPL_WHOISSECURE               = "671"
173
-	RPL_YOURLANGUAGESARE          = "687"
174
-	ERR_INVALIDMODEPARAM          = "696"
175
-	ERR_LISTMODEALREADYSET        = "697"
176
-	ERR_LISTMODENOTSET            = "698"
177
-	RPL_HELPSTART                 = "704"
178
-	RPL_HELPTXT                   = "705"
179
-	RPL_ENDOFHELP                 = "706"
180
-	ERR_NOPRIVS                   = "723"
181
-	RPL_MONONLINE                 = "730"
182
-	RPL_MONOFFLINE                = "731"
183
-	RPL_MONLIST                   = "732"
184
-	RPL_ENDOFMONLIST              = "733"
185
-	ERR_MONLISTFULL               = "734"
186
-	RPL_LOGGEDIN                  = "900"
187
-	RPL_LOGGEDOUT                 = "901"
188
-	ERR_NICKLOCKED                = "902"
189
-	RPL_SASLSUCCESS               = "903"
190
-	ERR_SASLFAIL                  = "904"
191
-	ERR_SASLTOOLONG               = "905"
192
-	ERR_SASLABORTED               = "906"
193
-	ERR_SASLALREADY               = "907"
194
-	RPL_SASLMECHS                 = "908"
195
-	RPL_REG_SUCCESS               = "920"
196
-	RPL_VERIFY_SUCCESS            = "923"
197
-	RPL_REG_VERIFICATION_REQUIRED = "927"
198
-	ERR_TOOMANYLANGUAGES          = "981"
199
-	ERR_NOLANGUAGE                = "982"
15
+	RPL_WELCOME            = "001"
16
+	RPL_YOURHOST           = "002"
17
+	RPL_CREATED            = "003"
18
+	RPL_MYINFO             = "004"
19
+	RPL_ISUPPORT           = "005"
20
+	RPL_SNOMASKIS          = "008"
21
+	RPL_BOUNCE             = "010"
22
+	RPL_TRACELINK          = "200"
23
+	RPL_TRACECONNECTING    = "201"
24
+	RPL_TRACEHANDSHAKE     = "202"
25
+	RPL_TRACEUNKNOWN       = "203"
26
+	RPL_TRACEOPERATOR      = "204"
27
+	RPL_TRACEUSER          = "205"
28
+	RPL_TRACESERVER        = "206"
29
+	RPL_TRACESERVICE       = "207"
30
+	RPL_TRACENEWTYPE       = "208"
31
+	RPL_TRACECLASS         = "209"
32
+	RPL_TRACERECONNECT     = "210"
33
+	RPL_STATSLINKINFO      = "211"
34
+	RPL_STATSCOMMANDS      = "212"
35
+	RPL_ENDOFSTATS         = "219"
36
+	RPL_UMODEIS            = "221"
37
+	RPL_SERVLIST           = "234"
38
+	RPL_SERVLISTEND        = "235"
39
+	RPL_STATSUPTIME        = "242"
40
+	RPL_STATSOLINE         = "243"
41
+	RPL_LUSERCLIENT        = "251"
42
+	RPL_LUSEROP            = "252"
43
+	RPL_LUSERUNKNOWN       = "253"
44
+	RPL_LUSERCHANNELS      = "254"
45
+	RPL_LUSERME            = "255"
46
+	RPL_ADMINME            = "256"
47
+	RPL_ADMINLOC1          = "257"
48
+	RPL_ADMINLOC2          = "258"
49
+	RPL_ADMINEMAIL         = "259"
50
+	RPL_TRACELOG           = "261"
51
+	RPL_TRACEEND           = "262"
52
+	RPL_TRYAGAIN           = "263"
53
+	RPL_LOCALUSERS         = "265"
54
+	RPL_GLOBALUSERS        = "266"
55
+	RPL_WHOISCERTFP        = "276"
56
+	RPL_AWAY               = "301"
57
+	RPL_USERHOST           = "302"
58
+	RPL_ISON               = "303"
59
+	RPL_UNAWAY             = "305"
60
+	RPL_NOWAWAY            = "306"
61
+	RPL_WHOISUSER          = "311"
62
+	RPL_WHOISSERVER        = "312"
63
+	RPL_WHOISOPERATOR      = "313"
64
+	RPL_WHOWASUSER         = "314"
65
+	RPL_ENDOFWHO           = "315"
66
+	RPL_WHOISIDLE          = "317"
67
+	RPL_ENDOFWHOIS         = "318"
68
+	RPL_WHOISCHANNELS      = "319"
69
+	RPL_LIST               = "322"
70
+	RPL_LISTEND            = "323"
71
+	RPL_CHANNELMODEIS      = "324"
72
+	RPL_UNIQOPIS           = "325"
73
+	RPL_CREATIONTIME       = "329"
74
+	RPL_WHOISACCOUNT       = "330"
75
+	RPL_NOTOPIC            = "331"
76
+	RPL_TOPIC              = "332"
77
+	RPL_TOPICTIME          = "333"
78
+	RPL_WHOISBOT           = "335"
79
+	RPL_WHOISACTUALLY      = "338"
80
+	RPL_INVITING           = "341"
81
+	RPL_SUMMONING          = "342"
82
+	RPL_INVITELIST         = "346"
83
+	RPL_ENDOFINVITELIST    = "347"
84
+	RPL_EXCEPTLIST         = "348"
85
+	RPL_ENDOFEXCEPTLIST    = "349"
86
+	RPL_VERSION            = "351"
87
+	RPL_WHOREPLY           = "352"
88
+	RPL_NAMREPLY           = "353"
89
+	RPL_WHOSPCRPL          = "354"
90
+	RPL_LINKS              = "364"
91
+	RPL_ENDOFLINKS         = "365"
92
+	RPL_ENDOFNAMES         = "366"
93
+	RPL_BANLIST            = "367"
94
+	RPL_ENDOFBANLIST       = "368"
95
+	RPL_ENDOFWHOWAS        = "369"
96
+	RPL_INFO               = "371"
97
+	RPL_MOTD               = "372"
98
+	RPL_ENDOFINFO          = "374"
99
+	RPL_MOTDSTART          = "375"
100
+	RPL_ENDOFMOTD          = "376"
101
+	RPL_WHOISMODES         = "379"
102
+	RPL_YOUREOPER          = "381"
103
+	RPL_REHASHING          = "382"
104
+	RPL_YOURESERVICE       = "383"
105
+	RPL_TIME               = "391"
106
+	RPL_USERSSTART         = "392"
107
+	RPL_USERS              = "393"
108
+	RPL_ENDOFUSERS         = "394"
109
+	RPL_NOUSERS            = "395"
110
+	ERR_UNKNOWNERROR       = "400"
111
+	ERR_NOSUCHNICK         = "401"
112
+	ERR_NOSUCHSERVER       = "402"
113
+	ERR_NOSUCHCHANNEL      = "403"
114
+	ERR_CANNOTSENDTOCHAN   = "404"
115
+	ERR_TOOMANYCHANNELS    = "405"
116
+	ERR_WASNOSUCHNICK      = "406"
117
+	ERR_TOOMANYTARGETS     = "407"
118
+	ERR_NOSUCHSERVICE      = "408"
119
+	ERR_NOORIGIN           = "409"
120
+	ERR_INVALIDCAPCMD      = "410"
121
+	ERR_NORECIPIENT        = "411"
122
+	ERR_NOTEXTTOSEND       = "412"
123
+	ERR_NOTOPLEVEL         = "413"
124
+	ERR_WILDTOPLEVEL       = "414"
125
+	ERR_BADMASK            = "415"
126
+	ERR_INPUTTOOLONG       = "417"
127
+	ERR_UNKNOWNCOMMAND     = "421"
128
+	ERR_NOMOTD             = "422"
129
+	ERR_NOADMININFO        = "423"
130
+	ERR_FILEERROR          = "424"
131
+	ERR_NONICKNAMEGIVEN    = "431"
132
+	ERR_ERRONEUSNICKNAME   = "432"
133
+	ERR_NICKNAMEINUSE      = "433"
134
+	ERR_NICKCOLLISION      = "436"
135
+	ERR_UNAVAILRESOURCE    = "437"
136
+	ERR_REG_UNAVAILABLE    = "440"
137
+	ERR_USERNOTINCHANNEL   = "441"
138
+	ERR_NOTONCHANNEL       = "442"
139
+	ERR_USERONCHANNEL      = "443"
140
+	ERR_NOLOGIN            = "444"
141
+	ERR_SUMMONDISABLED     = "445"
142
+	ERR_USERSDISABLED      = "446"
143
+	ERR_NOTREGISTERED      = "451"
144
+	ERR_NEEDMOREPARAMS     = "461"
145
+	ERR_ALREADYREGISTRED   = "462"
146
+	ERR_NOPERMFORHOST      = "463"
147
+	ERR_PASSWDMISMATCH     = "464"
148
+	ERR_YOUREBANNEDCREEP   = "465"
149
+	ERR_YOUWILLBEBANNED    = "466"
150
+	ERR_KEYSET             = "467"
151
+	ERR_INVALIDUSERNAME    = "468"
152
+	ERR_LINKCHANNEL        = "470"
153
+	ERR_CHANNELISFULL      = "471"
154
+	ERR_UNKNOWNMODE        = "472"
155
+	ERR_INVITEONLYCHAN     = "473"
156
+	ERR_BANNEDFROMCHAN     = "474"
157
+	ERR_BADCHANNELKEY      = "475"
158
+	ERR_BADCHANMASK        = "476"
159
+	ERR_NEEDREGGEDNICK     = "477" // conflicted with ERR_NOCHANMODES; see #936
160
+	ERR_BANLISTFULL        = "478"
161
+	ERR_NOPRIVILEGES       = "481"
162
+	ERR_CHANOPRIVSNEEDED   = "482"
163
+	ERR_CANTKILLSERVER     = "483"
164
+	ERR_RESTRICTED         = "484"
165
+	ERR_UNIQOPPRIVSNEEDED  = "485"
166
+	ERR_NOOPERHOST         = "491"
167
+	ERR_UMODEUNKNOWNFLAG   = "501"
168
+	ERR_USERSDONTMATCH     = "502"
169
+	ERR_HELPNOTFOUND       = "524"
170
+	ERR_CANNOTSENDRP       = "573"
171
+	RPL_WHOWASIP           = "652"
172
+	RPL_WHOISSECURE        = "671"
173
+	RPL_YOURLANGUAGESARE   = "687"
174
+	ERR_INVALIDMODEPARAM   = "696"
175
+	ERR_LISTMODEALREADYSET = "697"
176
+	ERR_LISTMODENOTSET     = "698"
177
+	RPL_HELPSTART          = "704"
178
+	RPL_HELPTXT            = "705"
179
+	RPL_ENDOFHELP          = "706"
180
+	ERR_NOPRIVS            = "723"
181
+	RPL_MONONLINE          = "730"
182
+	RPL_MONOFFLINE         = "731"
183
+	RPL_MONLIST            = "732"
184
+	RPL_ENDOFMONLIST       = "733"
185
+	ERR_MONLISTFULL        = "734"
186
+	RPL_LOGGEDIN           = "900"
187
+	RPL_LOGGEDOUT          = "901"
188
+	ERR_NICKLOCKED         = "902"
189
+	RPL_SASLSUCCESS        = "903"
190
+	ERR_SASLFAIL           = "904"
191
+	ERR_SASLTOOLONG        = "905"
192
+	ERR_SASLABORTED        = "906"
193
+	ERR_SASLALREADY        = "907"
194
+	RPL_SASLMECHS          = "908"
195
+	ERR_TOOMANYLANGUAGES   = "981"
196
+	ERR_NOLANGUAGE         = "982"
200 197
 )

Loading…
Cancel
Save