It compiles. Ship it!

interface/matrix.go

@@ -34,8 +34,8 @@ type MatrixContainer interface {
 	Logout()
 
 	SendPreferencesToMatrix()
-	SendMessage(roomID string, msgtype mautrix.MessageType, message string) (string, error)
-	SendMarkdownMessage(roomID string, msgtype mautrix.MessageType, message string) (string, error)
+	PrepareMarkdownMessage(roomID string, msgtype mautrix.MessageType, message string) *mautrix.Event
+	SendEvent(event *mautrix.Event) (string, error)
 	SendTyping(roomID string, typing bool)
 	MarkRead(roomID, eventID string)
 	JoinRoom(roomID, server string) (*rooms.Room, error)

interface/ui.go

@@ -53,14 +53,6 @@ type MainView interface {
 	InitialSyncDone()
 }
 
-type MessageDirection int
-
-const (
-	AppendMessage MessageDirection = iota
-	PrependMessage
-	IgnoreMessage
-)
-
 type RoomView interface {
 	MxRoom() *rooms.Room
 
@@ -69,8 +61,7 @@ type RoomView interface {
 	UpdateUserList()
 
 	ParseEvent(evt *mautrix.Event) Message
-	AppendMessage(message Message)
-	MarkMessageFailed(message Message)
+	AddMessage(message Message)
 	AddServiceMessage(message string)
 }
 
@@ -81,4 +72,8 @@ type Message interface {
 	Timestamp() time.Time
 	NotificationSenderName() string
 	NotificationContent() string
+
+	SetState(state mautrix.OutgoingEventState)
+	SetIsHighlight(highlight bool)
+	SetID(id string)
 }