commit 5103ded

Hubert Hirtz  ·  2020-08-15 15:08:58 +0000 UTC
parent 3567b35
Fill events with original channel case
1 files changed,  +10, -7
+10, -7
 1@@ -601,7 +601,7 @@ func (s *Session) handleInner(msg Message) (err error) {
 2 			}
 3 
 4 			s.evts <- UserJoinEvent{
 5-				Channel: msg.Params[0],
 6+				Channel: c.Name,
 7 				Nick:    nick,
 8 				Time:    t,
 9 			}
10@@ -623,7 +623,7 @@ func (s *Session) handleInner(msg Message) (err error) {
11 			}
12 
13 			s.evts <- UserPartEvent{
14-				Channels: msg.Params[:1],
15+				Channels: []string{c.Name},
16 				Nick:     nick,
17 				Time:     t,
18 			}
19@@ -669,7 +669,10 @@ func (s *Session) handleInner(msg Message) (err error) {
20 			}
21 		}
22 	case rplEndofnames:
23-		s.evts <- SelfJoinEvent{Channel: msg.Params[1]}
24+		channel := strings.ToLower(msg.Params[1])
25+		if c, ok := s.channels[channel]; ok {
26+			s.evts <- SelfJoinEvent{Channel: c.Name}
27+		}
28 	case rplTopic:
29 		channel := strings.ToLower(msg.Params[1])
30 
31@@ -711,11 +714,11 @@ func (s *Session) handleInner(msg Message) (err error) {
32 				State: typing,
33 				Time:  t,
34 			}
35-		} else if _, ok := s.channels[target]; ok {
36+		} else if c, ok := s.channels[target]; ok {
37 			// TAGMSG to channel
38 			s.evts <- ChannelTypingEvent{
39 				Nick:    nick,
40-				Channel: msg.Params[0],
41+				Channel: c.Name,
42 				State:   typing,
43 				Time:    t,
44 			}
45@@ -793,11 +796,11 @@ func (s *Session) privmsgToEvent(msg Message) (ev Event) {
46 			Content: msg.Params[1],
47 			Time:    t,
48 		}
49-	} else if _, ok := s.channels[target]; ok {
50+	} else if c, ok := s.channels[target]; ok {
51 		// PRIVMSG to channel
52 		ev = ChannelMessageEvent{
53 			Nick:    nick,
54-			Channel: msg.Params[0],
55+			Channel: c.Name,
56 			Command: msg.Command,
57 			Content: msg.Params[1],
58 			Time:    t,