From 376a2e5d84fb873fde40339feb4c1a9da150d5ff Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 23 Jun 2020 21:43:25 +0300 Subject: [PATCH] Update mautrix-go --- go.mod | 2 +- go.sum | 2 ++ ui/messages/parser.go | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 789d2b6..6ee04f9 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( golang.org/x/net v0.0.0-20200602114024-627f9648deb9 gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 gopkg.in/yaml.v2 v2.3.0 - maunium.net/go/mautrix v0.5.1 + maunium.net/go/mautrix v0.5.3 maunium.net/go/mauview v0.1.1 maunium.net/go/tcell v0.2.0 ) diff --git a/go.sum b/go.sum index 6646df4..14ecf26 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ maunium.net/go/mautrix v0.4.10 h1:MAQPDXsKpwFtRX0+DXYLGLwdHlui/kzi1lgh1EilEJI= maunium.net/go/mautrix v0.4.10/go.mod h1:LnkFnB1yjCbb8V+upoEHDGvI/F38NHSTWYCe2RRJgSY= maunium.net/go/mautrix v0.5.1 h1:2B2CrpDKwagITveUgfEUkXVQioH8HGUHO8nGCDL3IDw= maunium.net/go/mautrix v0.5.1/go.mod h1:LnkFnB1yjCbb8V+upoEHDGvI/F38NHSTWYCe2RRJgSY= +maunium.net/go/mautrix v0.5.3 h1:Lu4PGZvKZwhXmdDnBdLwmiImNM3jNGwJI9Sk78P+Gys= +maunium.net/go/mautrix v0.5.3/go.mod h1:LnkFnB1yjCbb8V+upoEHDGvI/F38NHSTWYCe2RRJgSY= maunium.net/go/mauview v0.1.1 h1:wfTXyPx3LGAGpTskh+UbBv/QItUWnEpaneHmywoYnfY= maunium.net/go/mauview v0.1.1/go.mod h1:3QBUiuLct9moP1LgDhCGIg0Ovxn38Bd2sGndnUOuj4o= maunium.net/go/tcell v0.2.0 h1:1Q0kN3wCOGAIGu1r3QHADsjSUOPDylKREvCv3EzJpVg= diff --git a/ui/messages/parser.go b/ui/messages/parser.go index 0f92f11..80bfa40 100644 --- a/ui/messages/parser.go +++ b/ui/messages/parser.go @@ -93,7 +93,7 @@ func directParseEvent(matrix ifc.MatrixContainer, room *rooms.Room, evt *muksevt } } -func findAltAliasDifference(newList, oldList []string) (addedStr, removedStr tstring.TString) { +func findAltAliasDifference(newList, oldList []id.RoomAlias) (addedStr, removedStr tstring.TString) { var addedList, removedList []tstring.TString OldLoop: for _, oldAlias := range oldList { @@ -102,7 +102,7 @@ OldLoop: continue OldLoop } } - removedList = append(removedList, tstring.NewStyleTString(oldAlias, tcell.StyleDefault.Foreground(widget.GetHashColor(oldAlias)).Underline(true))) + removedList = append(removedList, tstring.NewStyleTString(string(oldAlias), tcell.StyleDefault.Foreground(widget.GetHashColor(oldAlias)).Underline(true))) } NewLoop: for _, newAlias := range newList { @@ -111,7 +111,7 @@ NewLoop: continue NewLoop } } - addedList = append(addedList, tstring.NewStyleTString(newAlias, tcell.StyleDefault.Foreground(widget.GetHashColor(newAlias)).Underline(true))) + addedList = append(addedList, tstring.NewStyleTString(string(newAlias), tcell.StyleDefault.Foreground(widget.GetHashColor(newAlias)).Underline(true))) } if len(addedList) == 1 { addedStr = tstring.NewColorTString("added alternative address ", tcell.ColorGreen).AppendTString(addedList[0])