From dcb320ca91a5cda65d7a533adb183392aa44983d Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 25 Nov 2024 17:00:52 +1100 Subject: [PATCH] Fixed a couple of incorrect queries from a previous optimisation --- .../LibSession/Config Handling/LibSession+Contacts.swift | 4 ++-- .../MessageReceiver+MessageRequests.swift | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift index 331931be3..c1fb69cfe 100644 --- a/SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift +++ b/SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift @@ -203,8 +203,8 @@ internal extension LibSession { .filter(SessionThread.Columns.variant == SessionThread.Variant.contact) .filter( /// Only want to include include standard contact conversations (not blinded conversations) - ClosedGroup.Columns.threadId > SessionId.Prefix.standard.rawValue && - ClosedGroup.Columns.threadId < SessionId.Prefix.standard.endOfRangeString + SessionThread.Columns.id > SessionId.Prefix.standard.rawValue && + SessionThread.Columns.id < SessionId.Prefix.standard.endOfRangeString ) .select(.id) .asRequest(of: String.self) diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift index c9d240fbf..63dbeb838 100644 --- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift +++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift @@ -60,12 +60,12 @@ extension MessageReceiver { .filter(SessionThread.Columns.variant == SessionThread.Variant.contact) .filter( ( - ClosedGroup.Columns.threadId > SessionId.Prefix.blinded15.rawValue && - ClosedGroup.Columns.threadId < SessionId.Prefix.blinded15.endOfRangeString + SessionThread.Columns.id > SessionId.Prefix.blinded15.rawValue && + SessionThread.Columns.id < SessionId.Prefix.blinded15.endOfRangeString ) || ( - ClosedGroup.Columns.threadId > SessionId.Prefix.blinded25.rawValue && - ClosedGroup.Columns.threadId < SessionId.Prefix.blinded25.endOfRangeString + SessionThread.Columns.id > SessionId.Prefix.blinded25.rawValue && + SessionThread.Columns.id < SessionId.Prefix.blinded25.endOfRangeString ) ) .asRequest(of: String.self)