From f1b0526977de0c8f9953093d756e41dbc32617f5 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 15 Mar 2018 21:38:43 +0200 Subject: Merge branch 'asdfasjkfdlas/alkdjf' into sdkjfls-final --- view-main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'view-main.go') diff --git a/view-main.go b/view-main.go index 21e209f..3c536c9 100644 --- a/view-main.go +++ b/view-main.go @@ -18,6 +18,7 @@ package main import ( "strings" + "time" "github.com/gdamore/tcell" "maunium.net/go/gomatrix" @@ -123,7 +124,7 @@ func (view *MainView) HandleCommand(room, command string, args []string) { view.matrix.client.LeaveRoom(room) case "/join": if len(args) == 0 { - view.Append(room, "*", "Usage: /join ") + view.AddMessage(room, "*", "Usage: /join ", time.Now()) break } mxid := args[0] @@ -206,10 +207,10 @@ func (view *MainView) SetTyping(room string, users []string) { } } -func (view *MainView) Append(room, sender, message string) { +func (view *MainView) AddMessage(room, sender, message string, timestamp time.Time) { roomView, ok := view.rooms[room] if ok { - roomView.AddMessage(sender, message) + roomView.AddMessage(sender, message, timestamp) view.parent.Render() } } -- cgit v1.2.3