chatsync: fixed accepted chats returning to requests

pkg/connector/chatsync.go

@@ -89,14 +89,23 @@ func xchatInboxItemTrust(item *response.XChatInboxItem) *bool {
 }
 
 func applyXChatTrustToChatInfo(info *bridgev2.ChatInfo, trusted bool) {
-	info.MessageRequest = ptr.Ptr(!trusted)
 	info.ExtraUpdates = bridgev2.MergeExtraUpdaters(info.ExtraUpdates, func(_ context.Context, portal *bridgev2.Portal) bool {
 		meta, ok := portal.Metadata.(*PortalMetadata)
-		if !ok || meta == nil || (meta.XChatTrusted != nil && *meta.XChatTrusted == trusted) {
+		if !ok || meta == nil {
 			return false
 		}
-		meta.XChatTrusted = ptr.Ptr(trusted)
-		return true
+		effectiveTrusted := trusted
+		if meta.XChatTrusted != nil && *meta.XChatTrusted {
+			effectiveTrusted = true
+		}
+		messageRequest := !effectiveTrusted
+		changed := portal.MessageRequest != messageRequest
+		portal.MessageRequest = messageRequest
+		if meta.XChatTrusted == nil || *meta.XChatTrusted != effectiveTrusted {
+			meta.XChatTrusted = ptr.Ptr(effectiveTrusted)
+			changed = true
+		}
+		return changed
 	})
 }
 
@@ -120,8 +129,11 @@ func (tc *TwitterClient) syncXChatTrust(
 		return false
 	}
 	meta, _ := portal.Metadata.(*PortalMetadata)
-	messageRequest := !*trusted
-	if meta != nil && meta.XChatTrusted != nil && *meta.XChatTrusted == *trusted && portal.MessageRequest == messageRequest {
+	effectiveTrusted := *trusted
+	if meta != nil && meta.XChatTrusted != nil && *meta.XChatTrusted {
+		effectiveTrusted = true
+	}
+	if meta != nil && meta.XChatTrusted != nil && *meta.XChatTrusted == effectiveTrusted && portal.MessageRequest == !effectiveTrusted {
 		return true
 	}
 

pkg/connector/chatsync_test.go

@@ -38,13 +38,13 @@ func TestXChatItemTrustControlsMessageRequest(t *testing.T) {
 			}
 			return
 		}
-		if info.MessageRequest == nil || *info.MessageRequest == *trusted {
-			t.Fatalf("MessageRequest = %v", info.MessageRequest)
+		if info.MessageRequest != nil || info.ExtraUpdates == nil {
+			t.Fatalf("trust update was not deferred: MessageRequest = %v", info.MessageRequest)
 		}
 		meta := &PortalMetadata{}
 		portal := &bridgev2.Portal{Portal: &database.Portal{Metadata: meta}}
-		if !info.ExtraUpdates(t.Context(), portal) || meta.XChatTrusted == nil || *meta.XChatTrusted != *trusted {
-			t.Fatalf("XChatTrusted = %v", meta.XChatTrusted)
+		if !info.ExtraUpdates(t.Context(), portal) || meta.XChatTrusted == nil || *meta.XChatTrusted != *trusted || portal.MessageRequest == *trusted {
+			t.Fatalf("XChatTrusted = %v, MessageRequest = %t", meta.XChatTrusted, portal.MessageRequest)
 		}
 	}
 }

pkg/connector/handletwit.go

@@ -768,6 +768,7 @@ func (tc *TwitterClient) HandlePollingEvent(evt types.TwitterEvent, inbox *respo
 		if chatInfo == nil {
 			return false
 		}
+		applyXChatTrustToChatInfo(chatInfo, true)
 
 		return tc.userLogin.QueueRemoteEvent(&simplevent.ChatResync{
 			EventMeta: simplevent.EventMeta{