From cfb2cc057c32330be0ca0a68cfbd245cb2b8e31b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 5 Sep 2018 10:55:48 +0300 Subject: Update to latest gomatrix. Things are broken --- interface/matrix.go | 6 +++--- interface/ui.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'interface') diff --git a/interface/matrix.go b/interface/matrix.go index 08b3d61..0538df9 100644 --- a/interface/matrix.go +++ b/interface/matrix.go @@ -33,14 +33,14 @@ type MatrixContainer interface { Logout() SendPreferencesToMatrix() - SendMessage(roomID, msgtype, message string) (string, error) - SendMarkdownMessage(roomID, msgtype, message string) (string, error) + SendMessage(roomID string, msgtype gomatrix.MessageType, message string) (string, error) + SendMarkdownMessage(roomID string, msgtype gomatrix.MessageType, message string) (string, error) SendTyping(roomID string, typing bool) MarkRead(roomID, eventID string) JoinRoom(roomID, server string) (*rooms.Room, error) LeaveRoom(roomID string) error - GetHistory(roomID, prevBatch string, limit int) ([]gomatrix.Event, string, error) + GetHistory(roomID, prevBatch string, limit int) ([]*gomatrix.Event, string, error) GetRoom(roomID string) *rooms.Room Download(mxcURL string) ([]byte, string, string, error) diff --git a/interface/ui.go b/interface/ui.go index b106229..929dc65 100644 --- a/interface/ui.go +++ b/interface/ui.go @@ -73,8 +73,8 @@ type RoomView interface { SetTyping(users []string) UpdateUserList() - NewMessage(id, sender, msgtype, text string, timestamp time.Time) Message - NewTempMessage(msgtype, text string) Message + NewMessage(id, sender string, msgtype gomatrix.MessageType, text string, timestamp time.Time) Message + NewTempMessage(msgtype gomatrix.MessageType, text string) Message AddMessage(message Message, direction MessageDirection) AddServiceMessage(message string) } @@ -111,8 +111,8 @@ type Message interface { SetID(id string) ID() string - SetType(msgtype string) - Type() string + SetType(msgtype gomatrix.MessageType) + Type() gomatrix.MessageType NotificationContent() string -- cgit v1.2.3