diff options
| author | Tulir Asokan <tulir@maunium.net> | 2019-06-16 15:18:25 +0300 |
|---|---|---|
| committer | Tulir Asokan <tulir@maunium.net> | 2019-06-16 15:18:25 +0300 |
| commit | 8b87809ac1cae1263d3591a1b9b5b88c944034d8 (patch) | |
| tree | 25c6421dc5da1b96d2d7804eccad94ed8a2ee1a1 /interface | |
| parent | d3c18788dda5c2205a858c99afc75acc46c7ed33 (diff) | |
| parent | 1ea6ba026aab8b9d3e66681c97043b5806ef4971 (diff) | |
Merge branch 'break-things-again'
Diffstat (limited to 'interface')
| -rw-r--r-- | interface/gomuks.go | 2 | ||||
| -rw-r--r-- | interface/matrix.go | 1 | ||||
| -rw-r--r-- | interface/ui.go | 9 |
3 files changed, 5 insertions, 7 deletions
diff --git a/interface/gomuks.go b/interface/gomuks.go index f2565fb..5937a6b 100644 --- a/interface/gomuks.go +++ b/interface/gomuks.go @@ -27,5 +27,5 @@ type Gomuks interface { Config() *config.Config Start() - Stop() + Stop(save bool) } diff --git a/interface/matrix.go b/interface/matrix.go index f312df1..6a1a977 100644 --- a/interface/matrix.go +++ b/interface/matrix.go @@ -45,6 +45,7 @@ type MatrixContainer interface { GetHistory(room *rooms.Room, limit int) ([]*mautrix.Event, error) GetEvent(room *rooms.Room, eventID string) (*mautrix.Event, error) GetRoom(roomID string) *rooms.Room + GetOrCreateRoom(roomID string) *rooms.Room Download(mxcURL string) ([]byte, string, string, error) GetDownloadURL(homeserver, fileID string) string diff --git a/interface/ui.go b/interface/ui.go index 781f803..ad2458a 100644 --- a/interface/ui.go +++ b/interface/ui.go @@ -43,14 +43,14 @@ type MainView interface { GetRoom(roomID string) RoomView AddRoom(room *rooms.Room) RemoveRoom(room *rooms.Room) - SetRooms(rooms map[string]*rooms.Room) + SetRooms(rooms *rooms.RoomCache) + Bump(room *rooms.Room) UpdateTags(room *rooms.Room) SetTyping(roomID string, users []string) NotifyMessage(room *rooms.Room, message Message, should pushrules.PushActionArrayShould) - InitialSyncDone() } type RoomView interface { @@ -68,13 +68,10 @@ type RoomView interface { type Message interface { ID() string - TxnID() string - SenderID() string - Timestamp() time.Time + Time() time.Time NotificationSenderName() string NotificationContent() string - SetState(state mautrix.OutgoingEventState) SetIsHighlight(highlight bool) SetID(id string) } |