Show notifications and highlights in room list. Fixes #8

2 files changed, 21 insertions, 21 deletions

diff --git a/matrix/matrix.go b/matrix/matrix.go
index b72db7d..d706b95 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -22,13 +22,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gdamore/tcell"
 	"maunium.net/go/gomatrix"
 	"maunium.net/go/gomuks/config"
 	"maunium.net/go/gomuks/interface"
 	"maunium.net/go/gomuks/matrix/pushrules"
 	"maunium.net/go/gomuks/matrix/rooms"
-	"maunium.net/go/gomuks/notification"
 	"maunium.net/go/gomuks/ui/debug"
 	"maunium.net/go/gomuks/ui/widget"
 )
@@ -214,33 +212,18 @@ func (c *Container) Start() {
 	}
 }
 
-// NotifyMessage sends a desktop notification of the message with the given details.
-func (c *Container) NotifyMessage(room *rooms.Room, sender, text string, critical bool) {
-	if room.GetTitle() != sender {
-		sender = fmt.Sprintf("%s (%s)", sender, room.GetTitle())
-	}
-	notification.Send(sender, text, critical)
-}
-
 // HandleMessage is the event handler for the m.room.message timeline event.
 func (c *Container) HandleMessage(evt *gomatrix.Event) {
-	roomView := c.ui.MainView().GetRoom(evt.RoomID)
+	mainView := c.ui.MainView()
+	roomView := mainView.GetRoom(evt.RoomID)
 	if roomView == nil {
 		return
 	}
 
-	message := c.ui.MainView().ProcessMessageEvent(roomView, evt)
+	message := mainView.ProcessMessageEvent(roomView, evt)
 	if message != nil {
 		pushRules := c.PushRules().GetActions(roomView.Room, evt).Should()
-		if (pushRules.Notify || !pushRules.NotifySpecified) && evt.Sender != c.config.Session.UserID {
-			c.NotifyMessage(roomView.Room, message.Sender, message.Text, pushRules.Highlight)
-		}
-		if pushRules.Highlight {
-			message.TextColor = tcell.ColorYellow
-		}
-		if pushRules.PlaySound {
-			// TODO play sound
-		}
+		mainView.NotifyMessage(roomView.Room, message, pushRules)
 		roomView.AddMessage(message, widget.AppendMessage)
 		c.ui.Render()
 	}
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index c24b6db..7dd2af4 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -32,6 +32,16 @@ type Room struct {
 	PrevBatch string
 	// The MXID of the user whose session this room was created for.
 	SessionUserID string
+
+	// The number of unread messages that were notified about.
+	UnreadMessages int
+	// Whether or not any of the unread messages were highlights.
+	Highlighted bool
+	// Whether or not the room contains any new messages.
+	// This can be true even when UnreadMessages is zero if there's
+	// a notificationless message like bot notices.
+	HasNewMessages bool
+
 	// MXID -> Member cache calculated from membership events.
 	memberCache map[string]*Member
 	// The first non-SessionUserID member in the room. Calculated at
@@ -65,6 +75,13 @@ func (room *Room) UnlockHistory() {
 	}
 }
 
+// MarkRead clears the new message statuses on this room.
+func (room *Room) MarkRead() {
+	room.UnreadMessages = 0
+	room.Highlighted = false
+	room.HasNewMessages = false
+}
+
 // UpdateState updates the room's current state with the given Event. This will clobber events based
 // on the type/state_key combination.
 func (room *Room) UpdateState(event *gomatrix.Event) {