yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Only send to necessary update channel

Browse Source
This commit is contained in:
James Houlahan
2022-11-30 13:53:20 +01:00
parent f355cb4d38
commit 71ad1e9939
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/user/events.go
View File

@ -29,7 +29,9 @@ import (
"github.com/ProtonMail/proton-bridge/v3/internal/logging"
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
"github.com/ProtonMail/proton-bridge/v3/internal/vault"
"github.com/bradenaw/juniper/xslices"
"github.com/sirupsen/logrus"
"golang.org/x/exp/maps"
)
// handleAPIEvent handles the given proton.Event.
@ -305,7 +307,7 @@ func (user *User) handleCreateLabelEvent(_ context.Context, event proton.LabelEv
user.apiLabels[event.Label.ID] = event.Label
for _, updateCh := range user.updateCh {
for _, updateCh := range xslices.Unique(maps.Values(user.updateCh)) {
updateCh.Enqueue(newMailboxCreatedUpdate(imap.MailboxID(event.ID), getMailboxName(event.Label)))
}
@ -332,7 +334,7 @@ func (user *User) handleUpdateLabelEvent(_ context.Context, event proton.LabelEv
user.apiLabels[event.Label.ID] = event.Label
for _, updateCh := range user.updateCh {
for _, updateCh := range xslices.Unique(maps.Values(user.updateCh)) {
updateCh.Enqueue(imap.NewMailboxUpdated(
imap.MailboxID(event.ID),
getMailboxName(event.Label),
@ -360,7 +362,7 @@ func (user *User) handleDeleteLabelEvent(_ context.Context, event proton.LabelEv
delete(user.apiLabels, event.ID)
for _, updateCh := range user.updateCh {
for _, updateCh := range xslices.Unique(maps.Values(user.updateCh)) {
updateCh.Enqueue(imap.NewMailboxDeleted(imap.MailboxID(event.ID)))
}
@ -470,7 +472,7 @@ func (user *User) handleDeleteMessageEvent(ctx context.Context, event proton.Mes
return safe.RLockRet(func() error {
user.log.WithField("messageID", event.ID).Info("Handling message deleted event")
for _, updateCh := range user.updateCh {
for _, updateCh := range xslices.Unique(maps.Values(user.updateCh)) {
updateCh.Enqueue(imap.NewMessagesDeleted(imap.MessageID(event.ID)))
}

2
internal/user/user.go
View File

@ -564,7 +564,7 @@ func (user *User) doEventPoll(ctx context.Context) error {
// Wait for all events to be applied.
safe.RLock(func() {
for _, updateCh := range user.updateCh {
for _, updateCh := range xslices.Unique(maps.Values(user.updateCh)) {
update := imap.NewNoop()
defer update.WaitContext(ctx)