From 93f136c0c1da9b213fa259b2428a70340cedfec0 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Thu, 2 May 2024 16:19:06 +1000 Subject: [PATCH] Fixed an issue where reactions wouldn't appear --- Session.xcodeproj/project.pbxproj | 4 ++-- SessionMessagingKit/Shared Models/MessageViewModel.swift | 2 +- .../Database/Types/PagedDatabaseObserver.swift | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 626b34def..9efa0daef 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -7977,7 +7977,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 442; + CURRENT_PROJECT_VERSION = 443; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -8055,7 +8055,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 442; + CURRENT_PROJECT_VERSION = 443; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/SessionMessagingKit/Shared Models/MessageViewModel.swift b/SessionMessagingKit/Shared Models/MessageViewModel.swift index 2f00f73f8..1022cf881 100644 --- a/SessionMessagingKit/Shared Models/MessageViewModel.swift +++ b/SessionMessagingKit/Shared Models/MessageViewModel.swift @@ -557,7 +557,7 @@ public extension MessageViewModel { struct ReactionInfo: FetchableRecordWithRowId, Decodable, Identifiable, Equatable, Comparable, Hashable, Differentiable, ColumnExpressible { public typealias Columns = CodingKeys public enum CodingKeys: String, CodingKey, ColumnExpression, CaseIterable { - case rowId = "rowid" + case rowId case reaction case profile } diff --git a/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift b/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift index eef297065..7fa6df7e0 100644 --- a/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift +++ b/SessionUtilitiesKit/Database/Types/PagedDatabaseObserver.swift @@ -1389,7 +1389,8 @@ public class AssociatedRecord: ErasedAssociatedRecord where T: Fet guard !rowIds.isEmpty else { return hasOtherChanges } // Fetch the inserted/updated rows - let additionalFilters: SQL = SQL(rowIds.contains(Column.rowID)) + let alias: TableAlias = TableAlias(name: databaseTableName) + let additionalFilters: SQL = SQL(rowIds.contains(alias[Column.rowID])) do { let updatedItems: [T] = try dataQuery(additionalFilters)