From 0e8e81a6078a98803f1012882f8c176fd3b5204e Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 27 Apr 2020 00:38:04 +0300 Subject: Add support for decrypting messages --- matrix/sync.go | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) (limited to 'matrix/sync.go') diff --git a/matrix/sync.go b/matrix/sync.go index 85de68c..415748e 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -83,9 +83,11 @@ func (es EventSource) String() string { } type EventHandler func(source EventSource, event *event.Event) +type SyncHandler func(resp *mautrix.RespSync) type GomuksSyncer struct { rooms *rooms.RoomCache + globalListeners []SyncHandler listeners map[event.Type][]EventHandler // event type to listeners array FirstSyncDone bool InitDoneCallback func() @@ -96,10 +98,11 @@ type GomuksSyncer struct { // NewGomuksSyncer returns an instantiated GomuksSyncer func NewGomuksSyncer(rooms *rooms.RoomCache) *GomuksSyncer { return &GomuksSyncer{ - rooms: rooms, - listeners: make(map[event.Type][]EventHandler), - FirstSyncDone: false, - Progress: StubSyncingModal{}, + rooms: rooms, + globalListeners: []SyncHandler{}, + listeners: make(map[event.Type][]EventHandler), + FirstSyncDone: false, + Progress: StubSyncingModal{}, } } @@ -109,23 +112,26 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err s.rooms.DisableUnloading() } debug.Print("Received sync response") + s.Progress.SetMessage("Processing sync response") steps := len(res.Rooms.Join) + len(res.Rooms.Invite) + len(res.Rooms.Leave) - s.Progress.SetSteps(steps + 2) - s.Progress.SetMessage("Processing global events") - s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence) - s.Progress.Step() - s.processSyncEvents(nil, res.AccountData.Events, EventSourceAccountData) - s.Progress.Step() + s.Progress.SetSteps(steps + 2 + len(s.globalListeners)) wait := &sync.WaitGroup{} - - wait.Add(steps) callback := func() { wait.Done() s.Progress.Step() } + wait.Add(len(s.globalListeners)) + s.notifyGlobalListeners(res, callback) + wait.Wait() + + s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence) + s.Progress.Step() + s.processSyncEvents(nil, res.AccountData.Events, EventSourceAccountData) + s.Progress.Step() + + wait.Add(steps) - s.Progress.SetMessage("Processing room events") for roomID, roomData := range res.Rooms.Join { go s.processJoinedRoom(roomID, roomData, callback) } @@ -152,6 +158,15 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err return } +func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, callback func()) { + for _, listener := range s.globalListeners { + go func(listener SyncHandler) { + listener(res) + callback() + }(listener) + } +} + func (s *GomuksSyncer) processJoinedRoom(roomID id.RoomID, roomData mautrix.SyncJoinedRoom, callback func()) { defer debug.Recover() room := s.rooms.GetOrCreate(roomID) @@ -239,6 +254,10 @@ func (s *GomuksSyncer) OnEventType(eventType event.Type, callback EventHandler) s.listeners[eventType] = append(s.listeners[eventType], callback) } +func (s *GomuksSyncer) OnSync(callback SyncHandler) { + s.globalListeners = append(s.globalListeners, callback) +} + func (s *GomuksSyncer) notifyListeners(source EventSource, evt *event.Event) { listeners, exists := s.listeners[evt.Type] if !exists { -- cgit v1.2.3 From 7d0d701c5014be43f993d34a52e122f41eedc18d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 28 Apr 2020 00:58:26 +0300 Subject: Add initial support for encrypting messages --- matrix/sync.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'matrix/sync.go') diff --git a/matrix/sync.go b/matrix/sync.go index 415748e..2136088 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -83,7 +83,7 @@ func (es EventSource) String() string { } type EventHandler func(source EventSource, event *event.Event) -type SyncHandler func(resp *mautrix.RespSync) +type SyncHandler func(resp *mautrix.RespSync, since string) type GomuksSyncer struct { rooms *rooms.RoomCache @@ -122,7 +122,7 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err s.Progress.Step() } wait.Add(len(s.globalListeners)) - s.notifyGlobalListeners(res, callback) + s.notifyGlobalListeners(res, since, callback) wait.Wait() s.processSyncEvents(nil, res.Presence.Events, EventSourcePresence) @@ -158,10 +158,10 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err return } -func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, callback func()) { +func (s *GomuksSyncer) notifyGlobalListeners(res *mautrix.RespSync, since string, callback func()) { for _, listener := range s.globalListeners { go func(listener SyncHandler) { - listener(res) + listener(res, since) callback() }(listener) } @@ -288,6 +288,7 @@ func (s *GomuksSyncer) GetFilterJSON(_ id.UserID) *mautrix.Filter { event.StateCanonicalAlias, event.StatePowerLevels, event.StateTombstone, + event.StateEncryption, }, }, Timeline: mautrix.FilterPart{ -- cgit v1.2.3