From fcd9a932cb5542ed8980fc1daba7ee1f0041a3f2 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 24 Apr 2018 02:11:32 +0300 Subject: Initial move to initial sync. Everything broke :( --- matrix/matrix.go | 6 +++++- matrix/sync.go | 18 ++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index d58ce20..5345c40 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -191,7 +191,7 @@ func (c *Container) OnLogin() { c.syncer.OnEventType("m.tag", c.HandleTag) c.client.Syncer = c.syncer - c.UpdateRoomList() + //c.UpdateRoomList() } // Start moves the UI to the main view, calls OnLogin() and runs the syncer forever until stopped with Stop() @@ -296,6 +296,10 @@ func (c *Container) HandleMembership(evt *gomatrix.Event) { c.processOwnMembershipChange(evt) } + if !c.config.Session.InitialSyncDone && evt.Timestamp < time.Now().Add(-1*time.Hour).Unix() { + return + } + mainView := c.ui.MainView() roomView := mainView.GetRoom(evt.RoomID) if roomView == nil { diff --git a/matrix/sync.go b/matrix/sync.go index f3966cb..ec1c34e 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -20,16 +20,16 @@ package matrix import ( "encoding/json" - "fmt" - "runtime/debug" "time" "maunium.net/go/gomatrix" + "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/rooms" ) type SyncerSession interface { GetRoom(id string) *rooms.Room + SetInitialSyncDone() GetUserID() string } @@ -53,16 +53,7 @@ func NewGomuksSyncer(session SyncerSession) *GomuksSyncer { // ProcessResponse processes a Matrix sync response. func (s *GomuksSyncer) ProcessResponse(res *gomatrix.RespSync, since string) (err error) { - if len(since) == 0 { - return - } - // debug.Print("Processing sync response", since, res) - - defer func() { - if r := recover(); r != nil { - err = fmt.Errorf("ProcessResponse for %s since %s panicked: %s\n%s", s.Session.GetUserID(), since, r, debug.Stack()) - } - }() + debug.Print("Processing sync response", since, res) s.processSyncEvents(nil, res.Presence.Events, false, false) s.processSyncEvents(nil, res.AccountData.Events, false, false) @@ -93,6 +84,9 @@ func (s *GomuksSyncer) ProcessResponse(res *gomatrix.RespSync, since string) (er } } + if since == "" { + s.Session.SetInitialSyncDone() + } s.FirstSyncDone = true return -- cgit v1.2.3 From e64df67ec397795b8c6ebd06b391d953afe5a766 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 24 Apr 2018 16:51:40 +0300 Subject: Everything is no longer broken --- matrix/matrix.go | 53 ++++++++++++++++++++++++++-------------------------- matrix/rooms/room.go | 10 ++++++++++ matrix/sync.go | 11 +++++++---- 3 files changed, 44 insertions(+), 30 deletions(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index 5345c40..530612c 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -129,6 +129,7 @@ func (c *Container) Login(user, password string) error { // Stop stops the Matrix syncer. func (c *Container) Stop() { if c.running { + debug.Print("Stopping Matrix container...") c.stop <- true c.client.StopSync() } @@ -157,22 +158,6 @@ func (c *Container) PushRules() *pushrules.PushRuleset { return c.config.Session.PushRules } -// UpdateRoomList fetches the list of rooms the user has joined and sends them to the UI. -func (c *Container) UpdateRoomList() { - resp, err := c.client.JoinedRooms() - if err != nil { - respErr, _ := err.(gomatrix.HTTPError).WrappedError.(gomatrix.RespError) - if respErr.ErrCode == "M_UNKNOWN_TOKEN" { - c.OnLogout() - return - } - debug.Print("Error fetching room list:", err) - return - } - - c.ui.MainView().SetRooms(resp.JoinedRooms) -} - // OnLogout stops the syncer and moves the UI back to the login view. func (c *Container) OnLogout() { c.Stop() @@ -183,6 +168,7 @@ func (c *Container) OnLogout() { func (c *Container) OnLogin() { c.client.Store = c.config.Session + debug.Print("Initializing syncer") c.syncer = NewGomuksSyncer(c.config.Session) c.syncer.OnEventType("m.room.message", c.HandleMessage) c.syncer.OnEventType("m.room.member", c.HandleMembership) @@ -191,7 +177,10 @@ func (c *Container) OnLogin() { c.syncer.OnEventType("m.tag", c.HandleTag) c.client.Syncer = c.syncer - //c.UpdateRoomList() + debug.Print("Setting existing rooms") + c.ui.MainView().SetRooms(c.config.Session.Rooms) + + debug.Print("OnLogin() done.") } // Start moves the UI to the main view, calls OnLogin() and runs the syncer forever until stopped with Stop() @@ -226,19 +215,24 @@ func (c *Container) Start() { // HandleMessage is the event handler for the m.room.message timeline event. func (c *Container) HandleMessage(evt *gomatrix.Event) { mainView := c.ui.MainView() + roomView := mainView.GetRoom(evt.RoomID) if roomView == nil { + debug.Printf("Failed to handle event %v: No room view found.", evt) return } message := mainView.ParseEvent(roomView, evt) if message != nil { + debug.Print("Adding message", message.ID(), c.syncer.FirstSyncDone, c.config.Session.InitialSyncDone) + roomView.AddMessage(message, ifc.AppendMessage) if c.syncer.FirstSyncDone { pushRules := c.PushRules().GetActions(roomView.MxRoom(), evt).Should() mainView.NotifyMessage(roomView.MxRoom(), message, pushRules) + c.ui.Render() } - roomView.AddMessage(message, ifc.AppendMessage) - c.ui.Render() + } else { + debug.Printf("Parsing event %v failed (ParseEvent() returned nil).", evt) } } @@ -279,6 +273,7 @@ func (c *Container) processOwnMembershipChange(evt *gomatrix.Event) { if evt.Unsigned.PrevContent != nil { prevMembership, _ = evt.Unsigned.PrevContent["membership"].(string) } + debug.Printf("Processing own membership change: %s->%s in %s", membership, prevMembership, evt.RoomID) if membership == prevMembership { return } @@ -287,6 +282,9 @@ func (c *Container) processOwnMembershipChange(evt *gomatrix.Event) { c.ui.MainView().AddRoom(evt.RoomID) case "leave": c.ui.MainView().RemoveRoom(evt.RoomID) + case "invite": + // TODO handle + debug.Printf("%s invited the user to %s", evt.Sender, evt.RoomID) } } @@ -296,7 +294,8 @@ func (c *Container) HandleMembership(evt *gomatrix.Event) { c.processOwnMembershipChange(evt) } - if !c.config.Session.InitialSyncDone && evt.Timestamp < time.Now().Add(-1*time.Hour).Unix() { + if !c.config.Session.InitialSyncDone /*&& evt.Timestamp < time.Now().Add(-1*time.Hour).Unix()*/ { + // We don't care about other users' membership events in the initial sync. return } @@ -308,17 +307,19 @@ func (c *Container) HandleMembership(evt *gomatrix.Event) { message := mainView.ParseEvent(roomView, evt) if message != nil { + debug.Print("Adding membership event", message.ID(), c.syncer.FirstSyncDone, c.config.Session.InitialSyncDone) // TODO this shouldn't be necessary - roomView.MxRoom().UpdateState(evt) + //roomView.MxRoom().UpdateState(evt) // TODO This should probably also be in a different place - roomView.UpdateUserList() + //roomView.UpdateUserList() + roomView.AddMessage(message, ifc.AppendMessage) + // We don't want notifications at startup. if c.syncer.FirstSyncDone { pushRules := c.PushRules().GetActions(roomView.MxRoom(), evt).Should() mainView.NotifyMessage(roomView.MxRoom(), message, pushRules) + c.ui.Render() } - roomView.AddMessage(message, ifc.AppendMessage) - c.ui.Render() } } @@ -475,12 +476,12 @@ func (c *Container) GetHistory(roomID, prevBatch string, limit int) ([]gomatrix. func (c *Container) GetRoom(roomID string) *rooms.Room { room := c.config.Session.GetRoom(roomID) if room != nil && len(room.State) == 0 { - events := c.getState(room.ID) + /*events := c.getState(room.ID) if events != nil { for _, event := range events { room.UpdateState(event) } - } + }*/ } return room } diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go index 44a386b..9aae5ea 100644 --- a/matrix/rooms/room.go +++ b/matrix/rooms/room.go @@ -23,6 +23,7 @@ import ( "time" "maunium.net/go/gomatrix" + "maunium.net/go/gomuks/debug" ) type RoomNameSource int @@ -148,6 +149,15 @@ func (room *Room) UpdateState(event *gomatrix.Event) { case "m.room.topic": room.topicCache = "" } + + stateKey := "" + if event.StateKey != nil { + stateKey = *event.StateKey + } + if event.Type != "m.room.member" { + debug.Printf("[ROOM] Updating state %s#%s for %s", event.Type, stateKey, room.ID) + } + if event.StateKey == nil { room.State[event.Type][""] = event } else { diff --git a/matrix/sync.go b/matrix/sync.go index ec1c34e..d0e1e69 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -23,7 +23,6 @@ import ( "time" "maunium.net/go/gomatrix" - "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/rooms" ) @@ -53,8 +52,6 @@ func NewGomuksSyncer(session SyncerSession) *GomuksSyncer { // ProcessResponse processes a Matrix sync response. func (s *GomuksSyncer) ProcessResponse(res *gomatrix.RespSync, since string) (err error) { - debug.Print("Processing sync response", since, res) - s.processSyncEvents(nil, res.Presence.Events, false, false) s.processSyncEvents(nil, res.AccountData.Events, false, false) @@ -141,7 +138,13 @@ func (s *GomuksSyncer) GetFilterJSON(userID string) json.RawMessage { "room": { "include_leave": true, "state": { - "types": ["m.room.member"] + "types": [ + "m.room.member", + "m.room.name", + "m.room.topic", + "m.room.canonical_alias", + "m.room.aliases" + ] }, "timeline": { "types": ["m.room.message"], -- cgit v1.2.3 From 28c65275440b3f7371540b49733db8b6b170a64d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 24 Apr 2018 17:12:08 +0300 Subject: Fix/break/change things --- matrix/matrix.go | 6 ++++-- matrix/rooms/room.go | 2 +- matrix/sync.go | 12 ++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index 530612c..f2b8bf3 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -175,6 +175,10 @@ func (c *Container) OnLogin() { c.syncer.OnEventType("m.typing", c.HandleTyping) c.syncer.OnEventType("m.push_rules", c.HandlePushRules) c.syncer.OnEventType("m.tag", c.HandleTag) + c.syncer.InitDoneCallback = func() { + c.config.Session.InitialSyncDone = true + c.ui.Render() + } c.client.Syncer = c.syncer debug.Print("Setting existing rooms") @@ -224,7 +228,6 @@ func (c *Container) HandleMessage(evt *gomatrix.Event) { message := mainView.ParseEvent(roomView, evt) if message != nil { - debug.Print("Adding message", message.ID(), c.syncer.FirstSyncDone, c.config.Session.InitialSyncDone) roomView.AddMessage(message, ifc.AppendMessage) if c.syncer.FirstSyncDone { pushRules := c.PushRules().GetActions(roomView.MxRoom(), evt).Should() @@ -307,7 +310,6 @@ func (c *Container) HandleMembership(evt *gomatrix.Event) { message := mainView.ParseEvent(roomView, evt) if message != nil { - debug.Print("Adding membership event", message.ID(), c.syncer.FirstSyncDone, c.config.Session.InitialSyncDone) // TODO this shouldn't be necessary //roomView.MxRoom().UpdateState(evt) // TODO This should probably also be in a different place diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go index 9aae5ea..95349c3 100644 --- a/matrix/rooms/room.go +++ b/matrix/rooms/room.go @@ -155,7 +155,7 @@ func (room *Room) UpdateState(event *gomatrix.Event) { stateKey = *event.StateKey } if event.Type != "m.room.member" { - debug.Printf("[ROOM] Updating state %s#%s for %s", event.Type, stateKey, room.ID) + debug.Printf("Updating state %s#%s for %s", event.Type, stateKey, room.ID) } if event.StateKey == nil { diff --git a/matrix/sync.go b/matrix/sync.go index d0e1e69..8ad7ad5 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -28,7 +28,6 @@ import ( type SyncerSession interface { GetRoom(id string) *rooms.Room - SetInitialSyncDone() GetUserID() string } @@ -36,9 +35,10 @@ type SyncerSession interface { // replace parts of this default syncer (e.g. the ProcessResponse method). The default syncer uses the observer // pattern to notify callers about incoming events. See GomuksSyncer.OnEventType for more information. type GomuksSyncer struct { - Session SyncerSession - listeners map[string][]gomatrix.OnEventListener // event type to listeners array - FirstSyncDone bool + Session SyncerSession + listeners map[string][]gomatrix.OnEventListener // event type to listeners array + FirstSyncDone bool + InitDoneCallback func() } // NewGomuksSyncer returns an instantiated GomuksSyncer @@ -81,8 +81,8 @@ func (s *GomuksSyncer) ProcessResponse(res *gomatrix.RespSync, since string) (er } } - if since == "" { - s.Session.SetInitialSyncDone() + if since == "" && s.InitDoneCallback != nil { + s.InitDoneCallback() } s.FirstSyncDone = true -- cgit v1.2.3 From 9ccceb48b98a999eb31de113bd0b994844ce7dc3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 24 Apr 2018 22:08:09 +0300 Subject: Disable initial history fetch (comes with initial sync) --- matrix/matrix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index f2b8bf3..2e97ef4 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -276,7 +276,7 @@ func (c *Container) processOwnMembershipChange(evt *gomatrix.Event) { if evt.Unsigned.PrevContent != nil { prevMembership, _ = evt.Unsigned.PrevContent["membership"].(string) } - debug.Printf("Processing own membership change: %s->%s in %s", membership, prevMembership, evt.RoomID) + debug.Printf("Processing own membership change: %s->%s in %s", prevMembership, membership, evt.RoomID) if membership == prevMembership { return } -- cgit v1.2.3