From ba387764ca1590625d349e74eb8a8a64d1849b67 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Nov 2018 00:00:35 +0200 Subject: Fix things --- interface/matrix.go | 10 +++++----- interface/ui.go | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'interface') diff --git a/interface/matrix.go b/interface/matrix.go index 0538df9..01f224e 100644 --- a/interface/matrix.go +++ b/interface/matrix.go @@ -17,12 +17,12 @@ package ifc import ( - "maunium.net/go/gomatrix" + "maunium.net/go/mautrix" "maunium.net/go/gomuks/matrix/rooms" ) type MatrixContainer interface { - Client() *gomatrix.Client + Client() *mautrix.Client InitClient() error Initialized() bool @@ -33,14 +33,14 @@ type MatrixContainer interface { Logout() SendPreferencesToMatrix() - SendMessage(roomID string, msgtype gomatrix.MessageType, message string) (string, error) - SendMarkdownMessage(roomID string, msgtype gomatrix.MessageType, message string) (string, error) + SendMessage(roomID string, msgtype mautrix.MessageType, message string) (string, error) + SendMarkdownMessage(roomID string, msgtype mautrix.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) ([]*mautrix.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 929dc65..39473f5 100644 --- a/interface/ui.go +++ b/interface/ui.go @@ -19,7 +19,7 @@ package ifc import ( "time" - "maunium.net/go/gomatrix" + "maunium.net/go/mautrix" "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/tcell" @@ -50,7 +50,7 @@ type MainView interface { UpdateTags(room *rooms.Room) SetTyping(roomID string, users []string) - ParseEvent(roomView RoomView, evt *gomatrix.Event) Message + ParseEvent(roomView RoomView, evt *mautrix.Event) Message NotifyMessage(room *rooms.Room, message Message, should pushrules.PushActionArrayShould) InitialSyncDone() @@ -73,8 +73,8 @@ type RoomView interface { SetTyping(users []string) UpdateUserList() - NewMessage(id, sender string, msgtype gomatrix.MessageType, text string, timestamp time.Time) Message - NewTempMessage(msgtype gomatrix.MessageType, text string) Message + NewMessage(id, sender string, msgtype mautrix.MessageType, text string, timestamp time.Time) Message + NewTempMessage(msgtype mautrix.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 gomatrix.MessageType) - Type() gomatrix.MessageType + SetType(msgtype mautrix.MessageType) + Type() mautrix.MessageType NotificationContent() string -- cgit v1.2.3