Remove duplicate message server ID tracking

SessionMessagingKit/Database/Storage+OpenGroups.swift

@@ -192,18 +192,6 @@ extension Storage {
     public func setUserCount(to newValue: UInt64, forV2OpenGroupWithID openGroupID: String, using transaction: Any) {
         (transaction as! YapDatabaseReadWriteTransaction).setObject(newValue, forKey: openGroupID, inCollection: Storage.openGroupUserCountCollection)
     }
-
-    public func getIDForMessage(withServerID serverID: UInt64) -> String? {
-        var result: String? = nil
-        Storage.read { transaction in
-            result = transaction.object(forKey: String(serverID), inCollection: Storage.openGroupMessageIDCollection) as? String
-        }
-        return result
-    }
-    
-    public func setIDForMessage(withServerID serverID: UInt64, to messageID: String, using transaction: Any) {
-        (transaction as! YapDatabaseReadWriteTransaction).setObject(messageID, forKey: String(serverID), inCollection: Storage.openGroupMessageIDCollection)
-    }
     
     public func setLastProfilePictureUploadDate(_ date: Date)  {
         UserDefaults.standard[.lastProfilePictureUpload] = date

SessionMessagingKit/Sending & Receiving/MessageReceiver+Handling.swift

@@ -294,8 +294,9 @@ extension MessageReceiver {
             cancelTypingIndicatorsIfNeeded(for: message.sender!)
         }
         // Keep track of the open group server message ID ↔ message ID relationship
-        if let serverID = message.openGroupServerMessageID {
-            storage.setIDForMessage(withServerID: serverID, to: tsMessageID, using: transaction)
+        if let serverID = message.openGroupServerMessageID, let tsMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) {
+            tsMessage.openGroupServerMessageID = serverID
+            tsMessage.save(with: transaction)
         }
         // Notify the user if needed
         guard (isMainAppAndActive || isBackgroundPoll), let tsIncomingMessage = TSMessage.fetch(uniqueId: tsMessageID, transaction: transaction) as? TSIncomingMessage,

SessionMessagingKit/Sending & Receiving/MessageSender.swift

@@ -350,7 +350,6 @@ public final class MessageSender : NSObject {
 
     // MARK: Success & Failure Handling
     public static func handleSuccessfulMessageSend(_ message: Message, to destination: Message.Destination, isSyncMessage: Bool = false, using transaction: Any) {
-        let storage = SNMessagingKitConfiguration.shared.storage
         let transaction = transaction as! YapDatabaseReadWriteTransaction
         // Ignore future self-sends
         Storage.shared.addReceivedMessageTimestamp(message.sentTimestamp!, using: transaction)
@@ -359,9 +358,6 @@ public final class MessageSender : NSObject {
             // Track the open group server message ID
             tsMessage.openGroupServerMessageID = message.openGroupServerMessageID ?? 0
             tsMessage.save(with: transaction)
-            if let serverID = message.openGroupServerMessageID {
-                storage.setIDForMessage(withServerID: serverID, to: tsMessage.uniqueId!, using: transaction)
-            }
             // Mark the message as sent
             var recipients = [ message.recipient! ]
             if case .closedGroup(_) = destination, let threadID = message.threadID, // threadID should always be set at this point