commit 421837e
Hubert Hirtz
·
2020-08-16 14:06:47 +0000 UTC
parent 1b15bf8
irc: Use better names for casefolded variables
2 files changed,
+60,
-59
M
app.go
M
app.go
+2,
-2
1@@ -56,7 +56,7 @@ func NewApp(cfg Config) (app *App, err error) {
2 app.highlights[i] = strings.ToLower(app.highlights[i])
3 }
4 } else {
5- app.highlights = []string{app.s.LNick()}
6+ app.highlights = []string{app.s.NickCf()}
7 }
8
9 return
10@@ -89,7 +89,7 @@ func (app *App) handleIRCEvent(ev irc.Event) {
11 case irc.RegisteredEvent:
12 app.win.AddLine(ui.Home, ui.NewLineNow("--", "Connected to the server"), false)
13 if app.cfg.Highlights == nil {
14- app.highlights[0] = app.s.LNick()
15+ app.highlights[0] = app.s.NickCf()
16 }
17 case irc.SelfNickEvent:
18 line := fmt.Sprintf("\x0314%s\x03\u2192\x0314%s\x03", ev.FormerNick, ev.NewNick)
+58,
-57
1@@ -143,13 +143,13 @@ type Session struct {
2 state ConnectionState
3 typingStamps map[string]time.Time
4
5- nick string
6- lNick string
7- user string
8- real string
9- acct string
10- host string
11- auth SASLClient
12+ nick string
13+ nickCf string
14+ user string
15+ real string
16+ acct string
17+ host string
18+ auth SASLClient
19
20 availableCaps map[string]string
21 enabledCaps map[string]struct{}
22@@ -169,7 +169,7 @@ func NewSession(conn io.ReadWriteCloser, params SessionParams) (s Session, err e
23 debug: params.Debug,
24 typingStamps: map[string]time.Time{},
25 nick: params.Nickname,
26- lNick: strings.ToLower(params.Nickname),
27+ nickCf: strings.ToLower(params.Nickname),
28 user: params.Username,
29 real: params.RealName,
30 auth: params.Auth,
31@@ -240,8 +240,8 @@ func (s *Session) Nick() string {
32 return s.nick
33 }
34
35-func (s *Session) LNick() string {
36- return s.lNick
37+func (s *Session) NickCf() string {
38+ return s.nickCf
39 }
40
41 func (s *Session) IsChannel(name string) bool {
42@@ -484,7 +484,7 @@ func (s *Session) handle(msg Message) (err error) {
43 switch msg.Command {
44 case rplWelcome:
45 s.nick = msg.Params[0]
46- s.lNick = strings.ToLower(s.nick)
47+ s.nickCf = strings.ToLower(s.nick)
48 s.state = ConnRegistered
49 s.evts <- RegisteredEvent{}
50
51@@ -497,7 +497,7 @@ func (s *Session) handle(msg Message) (err error) {
52 case rplIsupport:
53 s.updateFeatures(msg.Params[1 : len(msg.Params)-1])
54 case rplWhoreply:
55- if s.lNick == strings.ToLower(msg.Params[5]) {
56+ if s.nickCf == strings.ToLower(msg.Params[5]) {
57 s.host = msg.Params[3]
58 }
59 case "CAP":
60@@ -579,19 +579,19 @@ func (s *Session) handle(msg Message) (err error) {
61 }
62 case "JOIN":
63 nick, _, _ := FullMask(msg.Prefix)
64- lNick := strings.ToLower(nick)
65- channel := strings.ToLower(msg.Params[0])
66+ nickCf := strings.ToLower(nick)
67+ channelCf := strings.ToLower(msg.Params[0])
68
69- if lNick == s.lNick {
70- s.channels[channel] = Channel{
71+ if nickCf == s.nickCf {
72+ s.channels[channelCf] = Channel{
73 Name: msg.Params[0],
74 Members: map[string]string{},
75 }
76- } else if c, ok := s.channels[channel]; ok {
77- if _, ok := s.users[lNick]; !ok {
78- s.users[lNick] = User{Nick: nick}
79+ } else if c, ok := s.channels[channelCf]; ok {
80+ if _, ok := s.users[nickCf]; !ok {
81+ s.users[nickCf] = User{Nick: nick}
82 }
83- c.Members[lNick] = ""
84+ c.Members[nickCf] = ""
85
86 t, ok := msg.Time()
87 if !ok {
88@@ -606,14 +606,14 @@ func (s *Session) handle(msg Message) (err error) {
89 }
90 case "PART":
91 nick, _, _ := FullMask(msg.Prefix)
92- lNick := strings.ToLower(nick)
93- channel := strings.ToLower(msg.Params[0])
94+ nickCf := strings.ToLower(nick)
95+ channelCf := strings.ToLower(msg.Params[0])
96
97- if lNick == s.lNick {
98- delete(s.channels, channel)
99+ if nickCf == s.nickCf {
100+ delete(s.channels, channelCf)
101 s.evts <- SelfPartEvent{Channel: msg.Params[0]}
102- } else if c, ok := s.channels[channel]; ok {
103- delete(c.Members, lNick)
104+ } else if c, ok := s.channels[channelCf]; ok {
105+ delete(c.Members, nickCf)
106
107 t, ok := msg.Time()
108 if !ok {
109@@ -628,7 +628,7 @@ func (s *Session) handle(msg Message) (err error) {
110 }
111 case "QUIT":
112 nick, _, _ := FullMask(msg.Prefix)
113- lNick := strings.ToLower(nick)
114+ nickCf := strings.ToLower(nick)
115
116 t, ok := msg.Time()
117 if !ok {
118@@ -638,7 +638,7 @@ func (s *Session) handle(msg Message) (err error) {
119 var channels []string
120
121 for _, c := range s.channels {
122- if _, ok := c.Members[lNick]; !ok {
123+ if _, ok := c.Members[nickCf]; !ok {
124 continue
125 }
126 channels = append(channels, c.Name)
127@@ -650,40 +650,41 @@ func (s *Session) handle(msg Message) (err error) {
128 Time: t,
129 }
130 case rplNamreply:
131- channel := strings.ToLower(msg.Params[2])
132+ channelCf := strings.ToLower(msg.Params[2])
133
134- if c, ok := s.channels[channel]; ok {
135+ if c, ok := s.channels[channelCf]; ok {
136 c.Secret = msg.Params[1] == "@"
137 names := TokenizeNames(msg.Params[3], "~&@%+") // TODO compute prefixes
138
139 for _, name := range names {
140 nick := name.Nick
141- lNick := strings.ToLower(nick)
142+ nickCf := strings.ToLower(nick)
143
144- if _, ok := s.users[lNick]; !ok {
145- s.users[lNick] = User{Nick: nick}
146+ if _, ok := s.users[nickCf]; !ok {
147+ s.users[nickCf] = User{Nick: nick}
148 }
149- c.Members[lNick] = name.PowerLevel
150+ c.Members[nickCf] = name.PowerLevel
151 }
152 }
153 case rplEndofnames:
154- channel := strings.ToLower(msg.Params[1])
155- if c, ok := s.channels[channel]; ok {
156+ channelCf := strings.ToLower(msg.Params[1])
157+ if c, ok := s.channels[channelCf]; ok {
158 s.evts <- SelfJoinEvent{Channel: c.Name}
159 }
160 case rplTopic:
161- channel := strings.ToLower(msg.Params[1])
162+ channelCf := strings.ToLower(msg.Params[1])
163
164- if c, ok := s.channels[channel]; ok {
165+ if c, ok := s.channels[channelCf]; ok {
166 c.Topic = msg.Params[2]
167 }
168 case "PRIVMSG", "NOTICE":
169 s.evts <- s.privmsgToEvent(msg)
170 case "TAGMSG":
171 nick, _, _ := FullMask(msg.Prefix)
172- target := strings.ToLower(msg.Params[0])
173+ nickCf := strings.ToLower(nick)
174+ targetCf := strings.ToLower(msg.Params[0])
175
176- if strings.ToLower(nick) == s.lNick {
177+ if nickCf == s.nickCf {
178 // TAGMSG from self
179 break
180 }
181@@ -705,19 +706,19 @@ func (s *Session) handle(msg Message) (err error) {
182 if !ok {
183 t = time.Now()
184 }
185- if target == s.lNick {
186+ if targetCf == s.nickCf {
187 // TAGMSG to self
188- s.evts <- QueryTypingEvent{
189- Nick: nick,
190- State: typing,
191- Time: t,
192- }
193- } else if c, ok := s.channels[target]; ok {
194- // TAGMSG to channel
195- s.evts <- ChannelTypingEvent{
196+ s.evts <- QueryTagEvent{
197+ Nick: nick,
198+ Typing: typing,
199+ Time: t,
200+ }
201+ } else if c, ok := s.channels[targetCf]; ok {
202+ // TAGMSG to channelCf
203+ s.evts <- ChannelTagEvent{
204 Nick: nick,
205 Channel: c.Name,
206- State: typing,
207+ Typing: typing,
208 Time: t,
209 }
210 }
211@@ -733,23 +734,23 @@ func (s *Session) handle(msg Message) (err error) {
212 }
213 case "NICK":
214 nick, _, _ := FullMask(msg.Prefix)
215- lNick := strings.ToLower(nick)
216+ nickCf := strings.ToLower(nick)
217 newNick := msg.Params[0]
218- lNewNick := strings.ToLower(newNick)
219+ newNickCf := strings.ToLower(newNick)
220
221 t, ok := msg.Time()
222 if !ok {
223 t = time.Now()
224 }
225
226- if lNick == s.lNick {
227+ if nickCf == s.nickCf {
228 s.evts <- SelfNickEvent{
229 FormerNick: s.nick,
230 NewNick: newNick,
231 Time: t,
232 }
233 s.nick = newNick
234- s.lNick = lNewNick
235+ s.nickCf = newNickCf
236 } else {
237 s.evts <- UserNickEvent{
238 FormerNick: nick,
239@@ -779,14 +780,14 @@ func (s *Session) handle(msg Message) (err error) {
240
241 func (s *Session) privmsgToEvent(msg Message) (ev Event) {
242 nick, _, _ := FullMask(msg.Prefix)
243- target := strings.ToLower(msg.Params[0])
244+ targetCf := strings.ToLower(msg.Params[0])
245
246 t, ok := msg.Time()
247 if !ok {
248 t = time.Now()
249 }
250
251- if !s.IsChannel(target) {
252+ if !s.IsChannel(targetCf) {
253 // PRIVMSG to self
254 ev = QueryMessageEvent{
255 Nick: nick,
256@@ -794,7 +795,7 @@ func (s *Session) privmsgToEvent(msg Message) (ev Event) {
257 Content: msg.Params[1],
258 Time: t,
259 }
260- } else if c, ok := s.channels[target]; ok {
261+ } else if c, ok := s.channels[targetCf]; ok {
262 // PRIVMSG to channel
263 ev = ChannelMessageEvent{
264 Nick: nick,