commit 9421ec8

Hubert Hirtz  ·  2020-08-24 10:23:46 +0000 UTC
parent a033d00
Improve query display

- Print outgoing messages as "-> target" instead of self nick
- Don't highlight messages
3 files changed,  +16, -4
M app.go
M app.go
+14, -4
 1@@ -132,11 +132,20 @@ func (app *App) handleIRCEvent(ev irc.Event) {
 2 		}
 3 	case irc.QueryMessageEvent:
 4 		if ev.Command == "PRIVMSG" {
 5-			l := ui.LineFromIRCMessage(ev.Time, ev.Nick, ev.Content, false, true)
 6+			isHighlight := true
 7+			head := ev.Nick
 8+			if app.s.NickCf() == strings.ToLower(ev.Nick) {
 9+				isHighlight = false
10+				head = "\u2192 " + ev.Target
11+			} else {
12+				app.lastQuery = ev.Nick
13+			}
14+			l := ui.LineFromIRCMessage(ev.Time, head, ev.Content, false, false)
15 			app.win.AddLine(ui.Home, l)
16 			app.win.TypingStop(ui.Home, ev.Nick)
17-			app.lastQuery = ev.Nick
18-			app.notifyHighlight(ui.Home, ev.Nick, ev.Content)
19+			if isHighlight {
20+				app.notifyHighlight(ui.Home, ev.Nick, ev.Content)
21+			}
22 		} else if ev.Command == "NOTICE" {
23 			l := ui.LineFromIRCMessage(ev.Time, ev.Nick, ev.Content, true, false)
24 			app.win.AddLine("", l)
25@@ -431,7 +440,8 @@ func (app *App) handleInput(buffer, content string) {
26 
27 		app.s.PrivMsg(app.lastQuery, args)
28 		if !app.s.HasCapability("echo-message") {
29-			line := ui.LineFromIRCMessage(time.Now(), app.s.Nick(), args, false, false)
30+			head := "\u2192 " + app.lastQuery
31+			line := ui.LineFromIRCMessage(time.Now(), head, args, false, false)
32 			app.win.AddLine(ui.Home, line)
33 		}
34 	}
+1, -0
1@@ -48,6 +48,7 @@ type UserPartEvent struct {
2 
3 type QueryMessageEvent struct {
4 	Nick    string
5+	Target  string
6 	Command string
7 	Content string
8 	Time    time.Time
+1, -0
1@@ -847,6 +847,7 @@ func (s *Session) privmsgToEvent(msg Message) (ev Event) {
2 		// PRIVMSG to self
3 		ev = QueryMessageEvent{
4 			Nick:    nick,
5+			Target:  msg.Params[0],
6 			Command: msg.Command,
7 			Content: msg.Params[1],
8 			Time:    t,