From c477f46af8d756720fb66a0cdefba0a8a397d772 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 15 Feb 2023 14:33:53 +0200
Subject: [PATCH] Fix syncing DMs in sync space command

---
 database/portal.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/database/portal.go b/database/portal.go
index d6de78c..304d535 100644
--- a/database/portal.go
+++ b/database/portal.go
@@ -96,9 +96,12 @@ func (pq *PortalQuery) FindPrivateChatsNotInSpace(receiver types.JID) (keys []Po
 	rows, err := pq.db.Query(`
 		SELECT jid FROM portal
 		    LEFT JOIN user_portal ON portal.jid=user_portal.portal_jid AND portal.receiver=user_portal.portal_receiver
-		WHERE mxid<>'' AND receiver=$1 AND (in_space=false OR in_space IS NULL)
+		WHERE mxid<>'' AND receiver=$1 AND (user_portal.in_space=false OR user_portal.in_space IS NULL)
 	`, receiver)
-	if err != nil || rows == nil {
+	if err != nil {
+		pq.log.Errorfln("Failed to find private chats not in space for %s: %v", receiver, err)
+		return
+	} else if rows == nil {
 		return
 	}
 	for rows.Next() {