Skip to content

Commit 00059e6

Browse files
Other: Do not fail on label events
Do not treat unknown label creation/deletion/update or deletion in Bridge as an error as the Gluon cache still needs to receive these events to correct its internal state.
1 parent 031ed9c commit 00059e6

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

internal/user/events.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,11 +301,9 @@ func (user *User) handleCreateLabelEvent(_ context.Context, event proton.LabelEv
301301
}).Info("Handling label created event")
302302

303303
if _, ok := user.apiLabels[event.Label.ID]; ok {
304-
return fmt.Errorf("label %q already exists", event.ID)
304+
user.apiLabels[event.Label.ID] = event.Label
305305
}
306306

307-
user.apiLabels[event.Label.ID] = event.Label
308-
309307
for _, updateCh := range user.updateCh {
310308
updateCh.Enqueue(newMailboxCreatedUpdate(imap.MailboxID(event.ID), getMailboxName(event.Label)))
311309
}
@@ -328,11 +326,9 @@ func (user *User) handleUpdateLabelEvent(_ context.Context, event proton.LabelEv
328326
}).Info("Handling label updated event")
329327

330328
if _, ok := user.apiLabels[event.Label.ID]; !ok {
331-
return fmt.Errorf("label %q does not exist", event.ID)
329+
user.apiLabels[event.Label.ID] = event.Label
332330
}
333331

334-
user.apiLabels[event.Label.ID] = event.Label
335-
336332
for _, updateCh := range user.updateCh {
337333
updateCh.Enqueue(imap.NewMailboxUpdated(
338334
imap.MailboxID(event.ID),
@@ -356,11 +352,9 @@ func (user *User) handleDeleteLabelEvent(_ context.Context, event proton.LabelEv
356352

357353
label, ok := user.apiLabels[event.ID]
358354
if !ok {
359-
return fmt.Errorf("label %q does not exist", event.ID)
355+
delete(user.apiLabels, event.ID)
360356
}
361357

362-
delete(user.apiLabels, event.ID)
363-
364358
for _, updateCh := range user.updateCh {
365359
updateCh.Enqueue(imap.NewMailboxDeleted(imap.MailboxID(event.ID)))
366360
}

0 commit comments

Comments
 (0)