handlematrix: allow resyncing DM portals on viewing chat event

Author: tulir

pkg/connector/client.go

@@ -423,7 +423,7 @@ func (wa *WhatsAppClient) HandleMatrixViewingChat(ctx context.Context, msg *brid
 	// Reset, but don't save, portal last sync time for immediate sync now
 	msg.Portal.Metadata.(*waid.PortalMetadata).LastSync.Time = time.Time{}
 	// Enqueue for the sync, don't block on it completing
-	wa.EnqueuePortalResync(msg.Portal)
+	wa.EnqueuePortalResync(msg.Portal, true)
 
 	if msg.Portal.OtherUserID != "" {
 		// If this is a DM, also sync the ghost of the other user immediately

pkg/connector/events.go

@@ -263,7 +263,7 @@ func (evt *WAMessageEvent) HandleExisting(ctx context.Context, portal *bridgev2.
 }
 
 func (evt *WAMessageEvent) ConvertMessage(ctx context.Context, portal *bridgev2.Portal, intent bridgev2.MatrixAPI) (*bridgev2.ConvertedMessage, error) {
-	evt.wa.EnqueuePortalResync(portal)
+	evt.wa.EnqueuePortalResync(portal, false)
 	converted := evt.wa.Main.MsgConv.ToMatrix(
 		ctx, portal, evt.wa.Client, intent, evt.Message, evt.MsgEvent.RawMessage, &evt.Info, evt.isViewOnce(), false, nil,
 	)

pkg/connector/userinfo.go

@@ -48,9 +48,11 @@ func (wa *WhatsAppClient) EnqueueGhostResync(ghost *bridgev2.Ghost) {
 	wa.resyncQueueLock.Unlock()
 }
 
-func (wa *WhatsAppClient) EnqueuePortalResync(portal *bridgev2.Portal) {
+func (wa *WhatsAppClient) EnqueuePortalResync(portal *bridgev2.Portal, allowDM bool) {
 	jid, _ := waid.ParsePortalID(portal.ID)
-	if jid.Server != types.GroupServer || portal.Metadata.(*waid.PortalMetadata).LastSync.Add(ResyncMinInterval).After(time.Now()) {
+	if portal.Metadata.(*waid.PortalMetadata).LastSync.Add(ResyncMinInterval).After(time.Now()) {
+		return
+	} else if !allowDM && jid.Server != types.GroupServer {
 		return
 	}
 	wa.resyncQueueLock.Lock()