Fixed a bunch of issues found by QA

• Updated the GroupMembers handling to updated the current users entry if they have the admin key and their current state is not correct
• Updated the "groups have been upgraded" banner to be visible for non-admins
• Updated the code to prevent changes from being able to be made on group configs without the admin key (was crashing previously)
• Added the new "deleted" group state and copy
• Fixed a layout issue on the settings screen when the editable text is too long
• Fixed a case sensitive contact sorting issue
• Fixed an issue where the groups v2 min version banner was appearing on legacy groups screens
• Fixed a bug where profile information may not be updated due to a timestamp resolution issue
• Fixed a bug where the group name would incorrectly be used in the block modal for group message requests
• Fixed a bug where the block button wasn't appearing within the group message request screen
• Fixed a bug where there was an incorrect timestamp conversion when checking whether to drop a message that was sent earlier than the 'deleteBefore' timestamp
• Fixed an issue where the "you left the group" message wouldn't be visible if you rejoined a group
• Fixed an issue where crashing during the initial creation of a group could result in it's state never loading
• Fixed an issue where deleting before a timestamp wasn't correctly using the network-offset timestamp
• Fixed an issue where the submodule was pointing at the wrong repo
• Removed some duplicate code

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "LibSession-Util"]
 	path = LibSession-Util
-	url = git@github.com:session-foundation/libsession-util.git
+	url = https://github.com/session-foundation/libsession-util.git

LibSession-Util

@@ -1 +1 @@
-Subproject commit 4f5a4a81816f4d1d95a7b42e28db4ee19b5983c1
+Subproject commit 50585142beaa65cfb80c1dee353c5271cb46c974

Session.xcodeproj/project.pbxproj

@@ -7873,7 +7873,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 497;
+				CURRENT_PROJECT_VERSION = 498;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7949,7 +7949,7 @@
 				CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 497;
+				CURRENT_PROJECT_VERSION = 498;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Session/Closed Groups/EditGroupViewModel.swift

@@ -93,7 +93,13 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
     
     let title: String = "groupEdit".localized()
     
-    var bannerInfo: AnyPublisher<InfoBanner.Info?, Never> { Just(EditGroupViewModel.minVersionBannerInfo).eraseToAnyPublisher() }
+    var bannerInfo: AnyPublisher<InfoBanner.Info?, Never> {
+        guard (try? SessionId.Prefix(from: threadId)) == .group else {
+            return Just(nil).eraseToAnyPublisher()
+        }
+        
+        return Just(EditGroupViewModel.minVersionBannerInfo).eraseToAnyPublisher()
+    }
     
     lazy var observation: TargetObservation = ObservationBuilder
         .databaseObservation(self) { [dependencies, threadId, userSessionId] db -> State in
@@ -419,7 +425,9 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Editabl
             SessionTableViewController(
                 viewModel: UserListViewModel<Contact>(
                     title: "membersInvite".localized(),
-                    infoBanner: EditGroupViewModel.minVersionBannerInfo,
+                    infoBanner: ((try? SessionId.Prefix(from: threadId)) != .group ? nil :
+                        EditGroupViewModel.minVersionBannerInfo
+                    ),
                     emptyState: "contactNone".localized(),
                     showProfileIcons: true,
                     request: SQLRequest("""

Session/Conversations/ConversationVC+Interaction.swift

@@ -2629,7 +2629,7 @@ extension ConversationVC {
                         }
                         
                         /// Actually trigger the approval
-                        try ClosedGroup.approveGroup(
+                        try ClosedGroup.approveGroupIfNeeded(
                             db,
                             group: group,
                             calledFromConfig: nil,

Session/Conversations/ConversationVC.swift

@@ -249,10 +249,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                 onTap: { [weak self] in self?.openUrl(Features.legacyGroupDepricationUrl) }
             )
         )
-        result.isHidden = (
-            self.viewModel.threadData.threadVariant != .legacyGroup ||
-            self.viewModel.threadData.currentUserIsClosedGroupAdmin != true
-        )
+        result.isHidden = (self.viewModel.threadData.threadVariant != .legacyGroup)
         
         return result
     }()
@@ -342,6 +339,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
         canWrite: self.viewModel.threadData.canWrite(using: self.viewModel.dependencies),
         threadIsMessageRequest: (self.viewModel.threadData.threadIsMessageRequest == true),
         threadRequiresApproval: (self.viewModel.threadData.threadRequiresApproval == true),
+        closedGroupAdminProfile: self.viewModel.threadData.closedGroupAdminProfile,
         onBlock: { [weak self] in self?.blockMessageRequest() },
         onAccept: { [weak self] in self?.acceptMessageRequest() },
         onDecline: { [weak self] in self?.declineMessageRequest() }
@@ -751,7 +749,8 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
             viewModel.threadData.canWrite(using: viewModel.dependencies) != updatedThreadData.canWrite(using: viewModel.dependencies) ||
             viewModel.threadData.threadVariant != updatedThreadData.threadVariant ||
             viewModel.threadData.threadIsMessageRequest != updatedThreadData.threadIsMessageRequest ||
-            viewModel.threadData.threadRequiresApproval != updatedThreadData.threadRequiresApproval
+            viewModel.threadData.threadRequiresApproval != updatedThreadData.threadRequiresApproval ||
+            viewModel.threadData.closedGroupAdminProfile != updatedThreadData.closedGroupAdminProfile
         {
             if updatedThreadData.canWrite(using: viewModel.dependencies) {
                 self.showInputAccessoryView()
@@ -766,7 +765,8 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                     threadVariant: updatedThreadData.threadVariant,
                     canWrite: updatedThreadData.canWrite(using: dependencies),
                     threadIsMessageRequest: (updatedThreadData.threadIsMessageRequest == true),
-                    threadRequiresApproval: (updatedThreadData.threadRequiresApproval == true)
+                    threadRequiresApproval: (updatedThreadData.threadRequiresApproval == true),
+                    closedGroupAdminProfile: updatedThreadData.closedGroupAdminProfile
                 )
                 self?.scrollButtonMessageRequestsBottomConstraint?.isActive = (
                     self?.messageRequestFooterView.isHidden == false
@@ -806,10 +806,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
             viewModel.threadData.threadVariant != updatedThreadData.threadVariant ||
             viewModel.threadData.currentUserIsClosedGroupAdmin != updatedThreadData.currentUserIsClosedGroupAdmin
         {
-            legacyGroupsBanner.isHidden = (
-                updatedThreadData.threadVariant != .legacyGroup ||
-                updatedThreadData.currentUserIsClosedGroupAdmin != true
-            )
+            legacyGroupsBanner.isHidden = (updatedThreadData.threadVariant != .legacyGroup)
         }
         
         if initialLoad || viewModel.threadData.threadIsBlocked != updatedThreadData.threadIsBlocked {

Session/Conversations/ConversationViewModel.swift

@@ -93,6 +93,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             initialUnreadInteractionInfo: Interaction.TimestampInfo?,
             threadIsBlocked: Bool,
             threadIsMessageRequest: Bool,
+            closedGroupAdminProfile: Profile?,
             currentUserIsClosedGroupMember: Bool?,
             currentUserIsClosedGroupAdmin: Bool?,
             openGroupPermissions: OpenGroup.Permissions?,
@@ -147,6 +148,16 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                     default: return false
                 }
             }()
+            
+            let closedGroupAdminProfile: Profile? = (threadVariant != .group ? nil :
+                try Profile
+                    .joining(
+                        required: Profile.groupMembers
+                            .filter(GroupMember.Columns.groupId == threadId)
+                            .filter(GroupMember.Columns.role == GroupMember.Role.admin)
+                    )
+                    .fetchOne(db)
+            )
             let currentUserIsClosedGroupAdmin: Bool? = (![.legacyGroup, .group].contains(threadVariant) ? nil :
                 GroupMember
                     .filter(groupMember[.groupId] == threadId)
@@ -191,6 +202,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                 initialUnreadInteractionInfo,
                 threadIsBlocked,
                 threadIsMessageRequest,
+                closedGroupAdminProfile,
                 currentUserIsClosedGroupMember,
                 currentUserIsClosedGroupAdmin,
                 openGroupPermissions,
@@ -211,6 +223,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                 threadIsNoteToSelf: (initialData?.userSessionId.hexString == threadId),
                 threadIsMessageRequest: initialData?.threadIsMessageRequest,
                 threadIsBlocked: initialData?.threadIsBlocked,
+                closedGroupAdminProfile: initialData?.closedGroupAdminProfile,
                 currentUserIsClosedGroupMember: initialData?.currentUserIsClosedGroupMember,
                 currentUserIsClosedGroupAdmin: initialData?.currentUserIsClosedGroupAdmin,
                 openGroupPermissions: initialData?.openGroupPermissions,
@@ -222,6 +235,10 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                     threadVariant == .group &&
                     LibSession.wasKickedFromGroup(groupSessionId: SessionId(.group, hex: threadId), using: dependencies)
                 ),
+                groupIsDestroyed: (
+                    threadVariant == .group &&
+                    LibSession.groupIsDestroyed(groupSessionId: SessionId(.group, hex: threadId), using: dependencies)
+                ),
                 using: dependencies
             )
         )
@@ -288,17 +305,27 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
                 return threadViewModel
                     .map { $0.with(recentReactionEmoji: recentReactionEmoji) }
                     .map { viewModel -> SessionThreadViewModel in
-                        viewModel.populatingCurrentUserBlindedIds(
+                        let wasKickedFromGroup: Bool = (
+                            viewModel.threadVariant == .group &&
+                            LibSession.wasKickedFromGroup(
+                                groupSessionId: SessionId(.group, hex: viewModel.threadId),
+                                using: dependencies
+                            )
+                        )
+                        let groupIsDestroyed: Bool = (
+                            viewModel.threadVariant == .group &&
+                            LibSession.groupIsDestroyed(
+                                groupSessionId: SessionId(.group, hex: viewModel.threadId),
+                                using: dependencies
+                            )
+                        )
+                        
+                        return viewModel.populatingCurrentUserBlindedIds(
                             db,
                             currentUserBlinded15SessionIdForThisThread: self?.threadData.currentUserBlinded15SessionId,
                             currentUserBlinded25SessionIdForThisThread: self?.threadData.currentUserBlinded25SessionId,
-                            wasKickedFromGroup: (
-                                viewModel.threadVariant == .group &&
-                                LibSession.wasKickedFromGroup(
-                                    groupSessionId: SessionId(.group, hex: viewModel.threadId),
-                                    using: dependencies
-                                )
-                            ),
+                            wasKickedFromGroup: wasKickedFromGroup,
+                            groupIsDestroyed: groupIsDestroyed,
                             using: dependencies
                         )
                     }
@@ -344,20 +371,29 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             threadData.threadVariant == .group &&
             LibSession.wasKickedFromGroup(groupSessionId: SessionId(.group, hex: threadData.threadId), using: dependencies)
         )
+        let groupIsDestroyed: Bool = (
+            threadData.threadVariant == .group &&
+            LibSession.groupIsDestroyed(groupSessionId: SessionId(.group, hex: threadData.threadId), using: dependencies)
+        )
         
-        switch (threadData.threadIsNoteToSelf, threadData.canWrite(using: dependencies), blocksCommunityMessageRequests, wasKickedFromGroup) {
-            case (true, _, _, _): return "noteToSelfEmpty".localized()
-            case (_, false, true, _):
+        switch (threadData.threadIsNoteToSelf, threadData.canWrite(using: dependencies), blocksCommunityMessageRequests, wasKickedFromGroup, groupIsDestroyed) {
+            case (true, _, _, _, _): return "noteToSelfEmpty".localized()
+            case (_, false, true, _, _):
                 return "messageRequestsTurnedOff"
                     .put(key: "name", value: threadData.displayName)
                     .localized()
+            
+            case (_, _, _, _, true):
+                return "groupDeletedMemberDescription"
+                    .put(key: "group_name", value: threadData.displayName)
+                    .localized()
                 
-            case (_, _, _, true):
+            case (_, _, _, true, _):
                 return "groupRemovedYou"
                     .put(key: "group_name", value: threadData.displayName)
                     .localized()
                 
-            case (_, false, false, _):
+            case (_, false, false, _, _):
                 return "conversationsEmpty"
                     .put(key: "conversation_name", value: threadData.displayName)
                     .localized()

Session/Conversations/Settings/ThreadSettingsViewModel.swift

@@ -1442,7 +1442,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
             try LibSession.deleteMessagesBefore(
                 db,
                 groupSessionId: SessionId(.group, hex: threadId),
-                timestamp: dependencies.dateNow.timeIntervalSince1970,
+                timestamp: (dependencies[cache: .snodeAPI].currentOffsetTimestampMs() / 1000),
                 using: dependencies
             )
         }
@@ -1455,7 +1455,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigatableStateHolder, Ob
             try LibSession.deleteAttachmentsBefore(
                 db,
                 groupSessionId: SessionId(.group, hex: threadId),
-                timestamp: dependencies.dateNow.timeIntervalSince1970,
+                timestamp: (dependencies[cache: .snodeAPI].currentOffsetTimestampMs() / 1000),
                 using: dependencies
             )
         }

Session/Conversations/Views & Modals/MessageRequestFooterView.swift

@@ -99,6 +99,7 @@ class MessageRequestFooterView: UIView {
         canWrite: Bool,
         threadIsMessageRequest: Bool,
         threadRequiresApproval: Bool,
+        closedGroupAdminProfile: Profile?,
         onBlock: @escaping () -> (),
         onAccept: @escaping () -> (),
         onDecline: @escaping () -> ()
@@ -114,7 +115,8 @@ class MessageRequestFooterView: UIView {
             threadVariant: threadVariant,
             canWrite: canWrite,
             threadIsMessageRequest: threadIsMessageRequest,
-            threadRequiresApproval: threadRequiresApproval
+            threadRequiresApproval: threadRequiresApproval,
+            closedGroupAdminProfile: closedGroupAdminProfile
         )
         setupLayout()
     }
@@ -155,13 +157,16 @@ class MessageRequestFooterView: UIView {
         threadVariant: SessionThread.Variant,
         canWrite: Bool,
         threadIsMessageRequest: Bool,
-        threadRequiresApproval: Bool
+        threadRequiresApproval: Bool,
+        closedGroupAdminProfile: Profile?
     ) {
         self.isHidden = (!canWrite || (!threadIsMessageRequest && !threadRequiresApproval))
-        self.blockButton.isHidden = (
-            threadVariant != .contact ||
-            threadRequiresApproval
-        )
+        
+        switch threadVariant {
+            case .contact: self.blockButton.isHidden = threadRequiresApproval
+            case .group: self.blockButton.isHidden = (closedGroupAdminProfile != nil)
+            default: self.blockButton.isHidden = true
+        }
         switch (threadVariant, threadRequiresApproval) {
             case (.contact, false): self.descriptionLabel.text = "messageRequestsAcceptDescription".localized()
             case (.contact, true): self.descriptionLabel.text = "messageRequestPendingDescription".localized()

Session/Home/HomeViewModel.swift

@@ -369,6 +369,13 @@ public class HomeViewModel: NavigatableStateHolder {
                                         using: dependencies
                                     )
                                 ),
+                                groupIsDestroyed: (
+                                    viewModel.threadVariant == .group &&
+                                    LibSession.groupIsDestroyed(
+                                        groupSessionId: SessionId(.group, hex: viewModel.threadId),
+                                        using: dependencies
+                                    )
+                                ),
                                 using: dependencies
                             )
                         }

Session/Home/Message Requests/MessageRequestsViewModel.swift

@@ -161,6 +161,13 @@ class MessageRequestsViewModel: SessionTableViewModel, NavigatableStateHolder, O
                                             using: dependencies
                                         )
                                     ),
+                                    groupIsDestroyed: (
+                                        viewModel.threadVariant == .group &&
+                                        LibSession.groupIsDestroyed(
+                                            groupSessionId: SessionId(.group, hex: viewModel.threadId),
+                                            using: dependencies
+                                        )
+                                    ),
                                     using: dependencies
                                 ),
                                 accessibility: Accessibility(

Session/Shared/FullConversationCell.swift

@@ -590,6 +590,13 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC
         textColor: UIColor,
         using dependencies: Dependencies
     ) -> NSAttributedString {
+        guard cellViewModel.groupIsDestroyed != true else {
+            return NSAttributedString(
+                string: "groupDeletedMemberDescription"
+                    .put(key: "group_name", value: cellViewModel.displayName)
+                    .localizedDeformatted()
+            )
+        }
         guard cellViewModel.wasKickedFromGroup != true else {
             return NSAttributedString(
                 string: "groupRemovedYou"

Session/Shared/Types/SessionCell+Accessory.swift

@@ -204,8 +204,6 @@ public extension SessionCell.AccessoryConfig {
         public let customTint: ThemeValue?
         public let shouldFill: Bool
         
-        override public var shouldFitToEdge: Bool { shouldFill }
-        
         fileprivate init(
             image: UIImage?,
             iconSize: IconSize,
@@ -252,8 +250,6 @@ public extension SessionCell.AccessoryConfig {
         public let shouldFill: Bool
         public let setter: (UIImageView) -> Void
         
-        override public var shouldFitToEdge: Bool { shouldFill }
-        
         fileprivate init(
             iconSize: IconSize,
             customTint: ThemeValue?,

Session/Shared/Views/SessionCell.swift

@@ -32,6 +32,7 @@ public class SessionCell: UITableViewCell {
     private lazy var contentStackViewTrailingConstraint: NSLayoutConstraint = contentStackView.pin(.trailing, to: .trailing, of: cellBackgroundView)
     private lazy var contentStackViewBottomConstraint: NSLayoutConstraint = contentStackView.pin(.bottom, to: .bottom, of: cellBackgroundView)
     private lazy var contentStackViewHorizontalCenterConstraint: NSLayoutConstraint = contentStackView.center(.horizontal, in: cellBackgroundView)
+    private lazy var contentStackViewWidthConstraint: NSLayoutConstraint = contentStackView.set(.width, lessThanOrEqualTo: .width, of: cellBackgroundView)
     private lazy var leadingAccessoryFillConstraint: NSLayoutConstraint = contentStackView.set(.height, to: .height, of: leadingAccessoryView)
     private lazy var titleTextFieldLeadingConstraint: NSLayoutConstraint = titleTextField.pin(.leading, to: .leading, of: cellBackgroundView)
     private lazy var titleTextFieldTrailingConstraint: NSLayoutConstraint = titleTextField.pin(.trailing, to: .trailing, of: cellBackgroundView)
@@ -294,6 +295,7 @@ public class SessionCell: UITableViewCell {
         contentStackViewLeadingConstraint.isActive = false
         contentStackViewTrailingConstraint.isActive = false
         contentStackViewHorizontalCenterConstraint.isActive = false
+        contentStackViewWidthConstraint.isActive = false
         titleMinHeightConstraint.isActive = false
         leadingAccessoryView.prepareForReuse()
         leadingAccessoryView.alpha = 1
@@ -383,6 +385,8 @@ public class SessionCell: UITableViewCell {
         contentStackViewTrailingConstraint.isActive = (info.styling.alignment == .leading)
         contentStackViewHorizontalCenterConstraint.constant = ((info.styling.customPadding?.leading ?? 0) + (info.styling.customPadding?.trailing ?? 0))
         contentStackViewHorizontalCenterConstraint.isActive = (info.styling.alignment == .centerHugging)
+        contentStackViewWidthConstraint.constant = -(abs((info.styling.customPadding?.leading ?? 0) + (info.styling.customPadding?.trailing ?? 0)) * 2) // Double the center offset to keep within bounds
+        contentStackViewWidthConstraint.isActive = (info.styling.alignment == .centerHugging)
         leadingAccessoryFillConstraint.isActive = leadingFitToEdge
         trailingAccessoryFillConstraint.isActive = trailingFitToEdge
         accessoryWidthMatchConstraint.isActive = {

Session/Utilities/UIContextualAction+Utilities.swift

@@ -69,7 +69,7 @@ public extension UIContextualAction {
         
         return targetActions
             .enumerated()
-            .map { index, action -> UIContextualAction in
+            .compactMap { index, action -> UIContextualAction? in
                 // Even though we have to reverse the actions above, the indexes in the view hierarchy
                 // are in the expected order
                 let targetIndex: Int = (side == .trailing ? (targetActions.count - index) : index)
@@ -313,6 +313,36 @@ public extension UIContextualAction {
                     // MARK: -- block
                         
                     case .block:
+                        /// If we don't have the `profileInfo` then we can't actually block so don't offer the block option in that case
+                        guard
+                            let profileInfo: (id: String, profile: Profile?) = dependencies[singleton: .storage]
+                                .read({ db in
+                                switch threadViewModel.threadVariant {
+                                    case .contact:
+                                        return (
+                                            threadViewModel.threadId,
+                                            try Profile.fetchOne(db, id: threadViewModel.threadId)
+                                        )
+                                        
+                                    case .group:
+                                        let firstAdmin: GroupMember? = try GroupMember
+                                            .filter(GroupMember.Columns.groupId == threadViewModel.threadId)
+                                            .filter(GroupMember.Columns.role == GroupMember.Role.admin)
+                                            .fetchOne(db)
+                                        
+                                        return try firstAdmin
+                                            .map { admin in
+                                                (
+                                                    admin.profileId,
+                                                    try Profile.fetchOne(db, id: admin.profileId)
+                                                )
+                                            }
+                                        
+                                    default: return nil
+                                }
+                            })
+                        else { return nil }
+                        
                         return UIContextualAction(
                             title: (threadViewModel.threadIsBlocked == true ?
                                 "blockUnblock".localized() :
@@ -339,31 +369,6 @@ public extension UIContextualAction {
                                 (!threadIsMessageRequest ? nil : Contact.Columns.didApproveMe.set(to: true)),
                                 (!threadIsMessageRequest ? nil : Contact.Columns.isApproved.set(to: false))
                             ].compactMap { $0 }
-                            let profileInfo: (id: String, profile: Profile?)? = dependencies[singleton: .storage].read { db in
-                                switch threadViewModel.threadVariant {
-                                    case .contact:
-                                        return (
-                                            threadViewModel.threadId,
-                                            try Profile.fetchOne(db, id: threadViewModel.threadId)
-                                        )
-                                        
-                                    case .group:
-                                        let firstAdmin: GroupMember? = try GroupMember
-                                            .filter(GroupMember.Columns.groupId == threadViewModel.threadId)
-                                            .filter(GroupMember.Columns.role == GroupMember.Role.admin)
-                                            .fetchOne(db)
-                                        
-                                        return try firstAdmin
-                                            .map { admin in
-                                                (
-                                                    admin.profileId,
-                                                    try Profile.fetchOne(db, id: admin.profileId)
-                                                )
-                                            }
-                                        
-                                    default: return nil
-                                }
-                            }
                             
                             let performBlock: (UIViewController?) -> () = { viewController in
                                 (tableView.cellForRow(at: indexPath) as? SwipeActionOptimisticCell)?
@@ -377,8 +382,8 @@ public extension UIContextualAction {
                                     dependencies[singleton: .storage]
                                         .writePublisher { db in
                                             // Create the contact if it doesn't exist
-                                            switch (threadViewModel.threadVariant, profileInfo?.id) {
-                                                case (.contact, _):
+                                            switch threadViewModel.threadVariant {
+                                                case .contact:
                                                     try Contact
                                                         .fetchOrCreate(db, id: threadViewModel.threadId, using: dependencies)
                                                         .upsert(db)
@@ -391,12 +396,12 @@ public extension UIContextualAction {
                                                             using: dependencies
                                                         )
                                                     
-                                                case (.group, .some(let contactId)):
+                                                case .group:
                                                     try Contact
-                                                        .fetchOrCreate(db, id: contactId, using: dependencies)
+                                                        .fetchOrCreate(db, id: profileInfo.id, using: dependencies)
                                                         .upsert(db)
                                                     try Contact
-                                                        .filter(id: contactId)
+                                                        .filter(id: profileInfo.id)
                                                         .updateAllAndConfig(
                                                             db,
                                                             contactChanges,
@@ -427,12 +432,27 @@ public extension UIContextualAction {
                             switch threadIsMessageRequest {
                                 case false: performBlock(nil)
                                 case true:
+                                    let nameToUse: String = {
+                                        switch threadViewModel.threadVariant {
+                                            case .group:
+                                                return Profile.displayName(
+                                                    for: .contact,
+                                                    id: profileInfo.id,
+                                                    name: profileInfo.profile?.name,
+                                                    nickname: profileInfo.profile?.nickname,
+                                                    suppressId: false
+                                                )
+                                                
+                                            default: return threadViewModel.displayName
+                                        }
+                                    }()
+                                    
                                     let confirmationModal: ConfirmationModal = ConfirmationModal(
                                         info: ConfirmationModal.Info(
                                             title: "block".localized(),
                                             body: .attributedText(
                                                 "blockDescription"
-                                                    .put(key: "name", value: threadViewModel.displayName)
+                                                    .put(key: "name", value: nameToUse)
                                                     .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
                                             ),
                                             confirmTitle: "block".localized(),

SessionMessagingKit/Database/Models/ClosedGroup.swift

@@ -182,8 +182,7 @@ public extension ClosedGroup {
         case userGroup
     }
     
-    /// Approves the group and returns the `Poller.receivedPollResult` publisher for the group
-    static func approveGroup(
+    static func approveGroupIfNeeded(
         _ db: Database,
         group: ClosedGroup,
         calledFromConfig configTriggeringChange: ConfigDump.Variant?,
@@ -206,16 +205,24 @@ public extension ClosedGroup {
                 )
         }
         
-        /// Wait until after the transaction completes before creating the group state (this is needed as it's possible that
+        /// Wait until after the transaction completes before creating the group state if needed (this is needed as it's possible that
         /// we are already mutating the `libSessionCache` when this function gets called)
         db.afterNextTransaction { db in
-            _ = try? LibSession.createGroupState(
-                groupSessionId: SessionId(.group, hex: group.id),
-                userED25519KeyPair: userED25519KeyPair,
-                groupIdentityPrivateKey: group.groupIdentityPrivateKey,
-                shouldLoadState: true,
-                using: dependencies
-            )
+            dependencies.mutate(cache: .libSession) { cache in
+                let groupSessionId: SessionId = .init(.group, hex: group.id)
+                
+                guard
+                    !cache.hasConfig(for: .groupKeys, sessionId: groupSessionId) ||
+                    !cache.hasConfig(for: .groupInfo, sessionId: groupSessionId) ||
+                    !cache.hasConfig(for: .groupMembers, sessionId: groupSessionId)
+                else { return }
+                
+                _ = try? cache.createAndLoadGroupState(
+                    groupSessionId: groupSessionId,
+                    userED25519KeyPair: userED25519KeyPair,
+                    groupIdentityPrivateKey: group.groupIdentityPrivateKey
+                )
+            }
         }
         
         /// Update the `USER_GROUPS` config
@@ -364,13 +371,10 @@ public extension ClosedGroup {
             /// re-invited to the group with historic access (these are repeatable records so won't cause issues if we re-run them)
             try ControlMessageProcessRecord
                 .filter(threadIds.contains(ControlMessageProcessRecord.Columns.threadId))
-                .filter([
-                    ControlMessageProcessRecord.Variant.visibleMessageDedupe,
-                    ControlMessageProcessRecord.Variant.groupUpdateInfoChange,
-                    ControlMessageProcessRecord.Variant.groupUpdateMemberChange,
-                    ControlMessageProcessRecord.Variant.groupUpdateMemberLeft,
-                    ControlMessageProcessRecord.Variant.groupUpdateDeleteMemberContent
-                ].contains(ControlMessageProcessRecord.Columns.variant))
+                .filter(
+                    ControlMessageProcessRecord.Variant.variantsToBeReprocessedAfterLeavingAndRejoiningConversation
+                        .contains(ControlMessageProcessRecord.Columns.variant)
+                )
                 .deleteAll(db)
             
             /// Also want to delete the `SnodeReceivedMessageInfo` so if the member gets re-invited to the group with

SessionMessagingKit/Database/Models/Contact.swift

@@ -99,6 +99,6 @@ extension Contact: ProfileAssociated {
         let rhsDisplayName: String = (rhs.profile?.displayName(for: .contact))
             .defaulting(to: Profile.truncated(id: rhs.profileId, threadVariant: .contact))
         
-        return (lhsDisplayName < rhsDisplayName)
+        return (lhsDisplayName.lowercased() < rhsDisplayName.lowercased())
     }
 }

SessionMessagingKit/Database/Models/ControlMessageProcessRecord.swift

@@ -56,6 +56,12 @@ public struct ControlMessageProcessRecord: Codable, FetchableRecord, Persistable
         case groupUpdateMemberLeftNotification = 16
         case groupUpdateInviteResponse = 17
         case groupUpdateDeleteMemberContent = 18
+        
+        internal static let variantsToBeReprocessedAfterLeavingAndRejoiningConversation: Set<Variant> = [
+            .legacyGroupControlMessage, .dataExtractionNotification, .expirationTimerUpdate, .unsendRequest,
+            .messageRequestResponse, .call, .visibleMessageDedupe, .groupUpdateInfoChange, .groupUpdateMemberChange,
+            .groupUpdateMemberLeftNotification, .groupUpdateDeleteMemberContent
+        ]
     }
     
     /// The id for the thread the control message is associated to

SessionMessagingKit/Database/Models/GroupMember.swift

@@ -147,7 +147,7 @@ extension GroupMember: ProfileAssociated {
                 default:
                     guard lhs.value.role == rhs.value.role else { return lhs.value.role < rhs.value.role }
                     
-                    return (lhsDisplayName < rhsDisplayName)
+                    return (lhsDisplayName.lowercased() < rhsDisplayName.lowercased())
             }
         }
         
@@ -169,8 +169,8 @@ extension GroupMember: ProfileAssociated {
                 case (_, userSessionId.hexString, _, _): return false
                 case (_, _, .none, .some): return true
                 case (_, _, .some, .none): return false
-                case (_, _, .none, .none): return (lhsDisplayName < rhsDisplayName)
-                case (_, _, .some, .some): return (lhsDisplayName < rhsDisplayName)
+                case (_, _, .none, .none): return (lhsDisplayName.lowercased() < rhsDisplayName.lowercased())
+                case (_, _, .some, .some): return (lhsDisplayName.lowercased() < rhsDisplayName.lowercased())
             }
         }
         

SessionMessagingKit/LibSession/Config Handling/LibSession+GroupInfo.swift

@@ -46,7 +46,7 @@ internal extension LibSessionCacheType {
         // the group data (want to keep the group itself around because the UX of conversations randomly
         // disappearing isn't great) - no other changes matter and this can't be reversed
         guard !groups_info_is_destroyed(conf) else {
-            try markAsKicked(db, groupSessionIds: [groupSessionId.hexString], using: dependencies)
+            try markAsDestroyed(db, groupSessionIds: [groupSessionId.hexString], using: dependencies)
             
             try ClosedGroup.removeData(
                 db,
@@ -414,17 +414,6 @@ public extension LibSession {
             }
         }
     }
-    
-    static func groupIsDestroyed(
-        groupSessionId: SessionId,
-        using dependencies: Dependencies
-    ) -> Bool {
-        return dependencies.mutate(cache: .libSession) { cache in
-            guard case .object(let conf) = cache.config(for: .groupInfo, sessionId: groupSessionId) else { return false }
-            
-            return groups_info_is_destroyed(conf)
-        }
-    }
 }
 
 // MARK: - Direct Values

SessionMessagingKit/LibSession/Config Handling/LibSession+GroupMembers.swift

@@ -82,19 +82,31 @@ internal extension LibSessionCacheType {
             )
         }
         
-        // If the current user is an admin but doesn't have the 'accepted' status then update it now
-        let currentMemberIsNewAdmin: Bool = updatedMembers.contains { member in
-            member.profileId == userSessionId.hexString &&
-            member.role == .admin &&
-            member.roleStatus != .accepted
-        }
-        if currentMemberIsNewAdmin {
+        // If the current user is an admin but doesn't have the correct member state then update it now
+        let maybeCurrentMember: GroupMember? = updatedMembers
+            .first { member in member.profileId == userSessionId.hexString }
+        let currentMemberHasAdminKey: Bool = isAdmin(groupSessionId: groupSessionId)
+        
+        if
+            let currentMember: GroupMember = maybeCurrentMember,
+            currentMemberHasAdminKey && (
+                currentMember.role != .admin ||
+                currentMember.roleStatus != .accepted
+            )
+        {
             try GroupMember
                 .filter(GroupMember.Columns.profileId == userSessionId.hexString)
                 .filter(GroupMember.Columns.groupId == groupSessionId.hexString)
                 .updateAllAndConfig(
                     db,
-                    GroupMember.Columns.roleStatus.set(to: GroupMember.RoleStatus.accepted),
+                    [
+                        (currentMember.role == .admin ? nil :
+                            GroupMember.Columns.role.set(to: GroupMember.Role.admin)
+                        ),
+                        (currentMember.roleStatus == .accepted ? nil :
+                            GroupMember.Columns.roleStatus.set(to: GroupMember.RoleStatus.accepted)
+                        ),
+                    ].compactMap { $0 },
                     calledFromConfig: .groupMembers,
                     using: dependencies
                 )
@@ -250,21 +262,20 @@ internal extension LibSession {
         
         // Only update members if they already exist in the group
         var cMemberId: [CChar] = try memberId.cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }()
-        var groupMember: config_group_member = config_group_member()
         
-        // If the member doesn't exist then do nothing
-        guard groups_members_get(conf, &groupMember, &cMemberId) else { return }
-        
-        switch role {
-            case .standard: groupMember.invited = status.libSessionValue
-            case .admin:
-                groupMember.admin = (groupMember.admin || status == .accepted)
-                groupMember.promoted = status.libSessionValue
-                
-            default: break
+        // Update the role and status to match
+        switch (role, status) {
+            case (.admin, .accepted): groups_members_set_promotion_accepted(conf, &cMemberId)
+            case (.admin, .failed): groups_members_set_promotion_failed(conf, &cMemberId)
+            case (.admin, .pending): groups_members_set_promotion_sent(conf, &cMemberId)
+            case (.admin, .notSentYet): groups_members_set_promoted(conf, &cMemberId)
+            
+            case (_, .accepted): groups_members_set_invite_accepted(conf, &cMemberId)
+            case (_, .failed): groups_members_set_invite_failed(conf, &cMemberId)
+            case (_, .pending): groups_members_set_invite_sent(conf, &cMemberId)
+            case (_, .notSentYet): break    // Default state (can't return to this after creation)
         }
         
-        groups_members_set(conf, &groupMember)
         try LibSessionError.throwIfNeeded(conf)
     }
     
@@ -370,27 +381,12 @@ internal extension LibSession {
         try targetMembers.forEach { member in
             try dependencies.mutate(cache: .libSession) { cache in
                 try cache.performAndPushChange(db, for: .groupMembers, sessionId: groupSessionId) { config in
-                    guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
-                    
-                    // Only update members if they already exist in the group
-                    var cMemberId: [CChar] = try member.profileId.cString(using: .utf8) ?? {
-                        throw LibSessionError.invalidCConversion
-                    }()
-                    
-                    // Update the role and status to match
-                    switch (member.role, member.roleStatus) {
-                        case (.admin, .accepted): groups_members_set_promotion_accepted(conf, &cMemberId)
-                        case (.admin, .failed): groups_members_set_promotion_failed(conf, &cMemberId)
-                        case (.admin, .pending): groups_members_set_promotion_sent(conf, &cMemberId)
-                        case (.admin, .notSentYet): groups_members_set_promoted(conf, &cMemberId)
-                        
-                        case (_, .accepted): groups_members_set_invite_accepted(conf, &cMemberId)
-                        case (_, .failed): groups_members_set_invite_failed(conf, &cMemberId)
-                        case (_, .pending): groups_members_set_invite_sent(conf, &cMemberId)
-                        case (_, .notSentYet): break    // Default state (can't return to this after creation)
-                    }
-                    
-                    try LibSessionError.throwIfNeeded(conf)
+                    try LibSession.updateMemberStatus(
+                        memberId: member.profileId,
+                        role: member.role,
+                        status: member.roleStatus,
+                        in: config
+                    )
                 }
             }
         }

SessionMessagingKit/LibSession/Config Handling/LibSession+SharedGroup.swift

@@ -15,6 +15,31 @@ public extension LibSession.Crypto.Domain {
 
 // MARK: - Convenience
 
+internal extension LibSessionCacheType {
+    @discardableResult func createAndLoadGroupState(
+        groupSessionId: SessionId,
+        userED25519KeyPair: KeyPair,
+        groupIdentityPrivateKey: Data?
+    ) throws -> [ConfigDump.Variant: LibSession.Config] {
+        let groupState: [ConfigDump.Variant: LibSession.Config] = try LibSession.createGroupState(
+            groupSessionId: groupSessionId,
+            userED25519KeyPair: userED25519KeyPair,
+            groupIdentityPrivateKey: groupIdentityPrivateKey
+        )
+        
+        guard groupState[.groupKeys] != nil && groupState[.groupInfo] != nil && groupState[.groupMembers] != nil else {
+            Log.error(.libSession, "Group config objects were null")
+            throw LibSessionError.unableToCreateConfigObject
+        }
+        
+        groupState.forEach { variant, config in
+            setConfig(for: variant, sessionId: groupSessionId, to: config)
+        }
+        
+        return groupState
+    }
+}
+
 internal extension LibSession {
     typealias CreatedGroupInfo = (
         groupSessionId: SessionId,
@@ -49,9 +74,7 @@ internal extension LibSession {
         let groupState: [ConfigDump.Variant: Config] = try createGroupState(
             groupSessionId: groupSessionId,
             userED25519KeyPair: userED25519KeyPair,
-            groupIdentityPrivateKey: Data(groupIdentityKeyPair.secretKey),
-            shouldLoadState: false, // We manually load the state after populating the configs
-            using: dependencies
+            groupIdentityPrivateKey: Data(groupIdentityKeyPair.secretKey)
         )
         
         // Extract the conf objects from the state to load in the initial data
@@ -169,58 +192,11 @@ internal extension LibSession {
         )
     }
     
-    static func removeGroupStateIfNeeded(
-        _ db: Database,
-        groupSessionId: SessionId,
-        using dependencies: Dependencies
-    ) {
-        dependencies.mutate(cache: .libSession) { cache in
-            cache.removeConfigs(for: groupSessionId)
-        }
-        
-        _ = try? ConfigDump
-            .filter(ConfigDump.Columns.sessionId == groupSessionId.hexString)
-            .deleteAll(db)
-    }
-    
-    static func saveCreatedGroup(
-        _ db: Database,
-        group: ClosedGroup,
-        groupState: [ConfigDump.Variant: Config],
-        using dependencies: Dependencies
-    ) throws {
-        // Create and save dumps for the configs
-        try dependencies.mutate(cache: .libSession) { cache in
-            try groupState.forEach { variant, config in
-                try cache.createDump(
-                    config: config,
-                    for: variant,
-                    sessionId: SessionId(.group, hex: group.id),
-                    timestampMs: Int64(floor(group.formationTimestamp * 1000))
-                )?.upsert(db)
-            }
-        }
-        
-        // Add the new group to the USER_GROUPS config message
-        try LibSession.add(
-            db,
-            groupSessionId: group.id,
-            groupIdentityPrivateKey: group.groupIdentityPrivateKey,
-            name: group.name,
-            authData: group.authData,
-            joinedAt: group.formationTimestamp,
-            invited: (group.invited == true),
-            using: dependencies
-        )
-    }
-    
-    @discardableResult static func createGroupState(
+    static func createGroupState(
         groupSessionId: SessionId,
         userED25519KeyPair: KeyPair,
-        groupIdentityPrivateKey: Data?,
-        shouldLoadState: Bool,
-        using dependencies: Dependencies
-    ) throws -> [ConfigDump.Variant: Config] {
+        groupIdentityPrivateKey: Data?
+    ) throws -> [ConfigDump.Variant: LibSession.Config] {
         var secretKey: [UInt8] = userED25519KeyPair.secretKey
         var groupIdentityPublicKey: [UInt8] = groupSessionId.publicKey
         
@@ -306,24 +282,58 @@ internal extension LibSession {
         }
         
         // Define the config state map and load it into memory
-        let groupState: [ConfigDump.Variant: Config] = [
+        let groupState: [ConfigDump.Variant: LibSession.Config] = [
             .groupKeys: .groupKeys(keysConf, info: infoConf, members: membersConf),
             .groupInfo: .object(infoConf),
             .groupMembers: .object(membersConf),
         ]
         
-        // Only load the state if specified (during initial group creation we want to
-        // load the state after populating the different configs incase invalid data
-        // was provided)
-        if shouldLoadState {
-            dependencies.mutate(cache: .libSession) { cache in
-                groupState.forEach { variant, config in
-                    cache.setConfig(for: variant, sessionId: groupSessionId, to: config)
-                }
+        return groupState
+    }
+    
+    static func removeGroupStateIfNeeded(
+        _ db: Database,
+        groupSessionId: SessionId,
+        using dependencies: Dependencies
+    ) {
+        dependencies.mutate(cache: .libSession) { cache in
+            cache.removeConfigs(for: groupSessionId)
+        }
+        
+        _ = try? ConfigDump
+            .filter(ConfigDump.Columns.sessionId == groupSessionId.hexString)
+            .deleteAll(db)
+    }
+    
+    static func saveCreatedGroup(
+        _ db: Database,
+        group: ClosedGroup,
+        groupState: [ConfigDump.Variant: Config],
+        using dependencies: Dependencies
+    ) throws {
+        // Create and save dumps for the configs
+        try dependencies.mutate(cache: .libSession) { cache in
+            try groupState.forEach { variant, config in
+                try cache.createDump(
+                    config: config,
+                    for: variant,
+                    sessionId: SessionId(.group, hex: group.id),
+                    timestampMs: Int64(floor(group.formationTimestamp * 1000))
+                )?.upsert(db)
             }
         }
         
-        return groupState
+        // Add the new group to the USER_GROUPS config message
+        try LibSession.add(
+            db,
+            groupSessionId: group.id,
+            groupIdentityPrivateKey: group.groupIdentityPrivateKey,
+            name: group.name,
+            authData: group.authData,
+            joinedAt: group.formationTimestamp,
+            invited: (group.invited == true),
+            using: dependencies
+        )
     }
     
     static func isAdmin(
@@ -331,11 +341,7 @@ internal extension LibSession {
         using dependencies: Dependencies
     ) -> Bool {
         return dependencies.mutate(cache: .libSession) { cache in
-            guard case .groupKeys(let conf, _, _) = cache.config(for: .groupKeys, sessionId: groupSessionId) else {
-                return false
-            }
-            
-            return groups_keys_is_admin(conf)
+            return cache.isAdmin(groupSessionId: groupSessionId)
         }
     }
 }

SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift

@@ -439,7 +439,7 @@ internal extension LibSessionCacheType {
                         authData: group.authData,
                         joinedAt: group.joinedAt,
                         invited: group.invited,
-                        hasAlreadyBeenKicked: group.wasKickedFromGroup,
+                        wasKickedFromGroup: group.wasKickedFromGroup,
                         calledFromConfig: .userGroups,
                         using: dependencies
                     )
@@ -518,7 +518,7 @@ internal extension LibSessionCacheType {
                         // If the group changed to no longer be in the invited state then we need to trigger the
                         // group approval process
                         if !group.invited && existingGroup.invited != group.invited {
-                            try ClosedGroup.approveGroup(
+                            try ClosedGroup.approveGroupIfNeeded(
                                 db,
                                 group: existingGroup,
                                 calledFromConfig: .userGroups,
@@ -579,6 +579,26 @@ internal extension LibSessionCacheType {
         return ugroups_group_is_kicked(&userGroup)
     }
     
+    func markAsInvited(
+        _ db: Database,
+        groupSessionIds: [String],
+        using dependencies: Dependencies
+    ) throws {
+        try performAndPushChange(db, for: .userGroups, sessionId: dependencies[cache: .general].sessionId) { config in
+            guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
+            
+            try groupSessionIds.forEach { groupId in
+                var cGroupId: [CChar] = try groupId.cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }()
+                var userGroup: ugroups_group_info = ugroups_group_info()
+                
+                guard user_groups_get_group(conf, &userGroup, &cGroupId) else { return }
+                
+                ugroups_group_set_invited(&userGroup)
+                user_groups_set_group(conf, &userGroup)
+            }
+        }
+    }
+    
     func markAsKicked(
         _ db: Database,
         groupSessionIds: [String],
@@ -598,6 +618,26 @@ internal extension LibSessionCacheType {
             }
         }
     }
+    
+    func markAsDestroyed(
+        _ db: Database,
+        groupSessionIds: [String],
+        using dependencies: Dependencies
+    ) throws {
+        try performAndPushChange(db, for: .userGroups, sessionId: dependencies[cache: .general].sessionId) { config in
+            guard case .object(let conf) = config else { throw LibSessionError.invalidConfigObject }
+            
+            try groupSessionIds.forEach { groupId in
+                var cGroupId: [CChar] = try groupId.cString(using: .utf8) ?? { throw LibSessionError.invalidCConversion }()
+                var userGroup: ugroups_group_info = ugroups_group_info()
+                
+                guard user_groups_get_group(conf, &userGroup, &cGroupId) else { return }
+                
+                ugroups_group_set_destroyed(&userGroup)
+                user_groups_set_group(conf, &userGroup)
+            }
+        }
+    }
 }
 
 internal extension LibSession {
@@ -1168,6 +1208,25 @@ public extension LibSession {
         }
     }
     
+    static func groupIsDestroyed(
+        groupSessionId: SessionId,
+        using dependencies: Dependencies
+    ) -> Bool {
+        return dependencies.mutate(cache: .libSession) { cache in
+            guard
+                case .object(let conf) = cache.config(for: .userGroups, sessionId: dependencies[cache: .general].sessionId),
+                var cGroupId: [CChar] = groupSessionId.hexString.cString(using: .utf8)
+            else { return false }
+            
+            var userGroup: ugroups_group_info = ugroups_group_info()
+            
+            // If the group doesn't exist then assume the user hasn't been kicked
+            guard user_groups_get_group(conf, &userGroup, &cGroupId) else { return false }
+            
+            return ugroups_group_is_destroyed(&userGroup)
+        }
+    }
+    
     static func remove(
         _ db: Database,
         groupSessionIds: [SessionId],

SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift

@@ -195,7 +195,7 @@ public extension LibSession {
                 )
             }
             
-            /// It's possible for there to not be dumps for all of the user configs so we load any missing ones to ensure funcitonality
+            /// It's possible for there to not be dumps for all of the configs so we load any missing ones to ensure functionality
             /// works smoothly
             ///
             /// It's also possible for a group to get created but for a dump to not be created (eg. when a crash happens at the right time), to
@@ -231,12 +231,10 @@ public extension LibSession {
             groups
                 .filter { $0.invited != true }
                 .forEach { group in
-                    _ = try? LibSession.createGroupState(
+                    _ = try? createAndLoadGroupState(
                         groupSessionId: SessionId(.group, hex: group.id),
                         userED25519KeyPair: userEd25519KeyPair,
-                        groupIdentityPrivateKey: group.groupIdentityPrivateKey,
-                        shouldLoadState: true,
-                        using: dependencies
+                        groupIdentityPrivateKey: group.groupIdentityPrivateKey
                     )
                 }
         }
@@ -439,6 +437,19 @@ public extension LibSession {
             sessionId: SessionId,
             change: (Config?) throws -> ()
         ) throws {
+            // To prevent crashes by trying to make an invalid change due to incorrect state being
+            // provided by a client, if we want to change one of the group configs then check if we
+            // are a group admin first
+            switch variant {
+                case .groupInfo, .groupMembers, .groupKeys:
+                    guard isAdmin(groupSessionId: sessionId) else {
+                        throw LibSessionError.attemptedToModifyGroupWithoutAdminKey
+                    }
+
+                    
+                default: break
+            }
+            
             guard let config: Config = configStore[sessionId, variant] else { return }
             
             do {
@@ -695,6 +706,16 @@ public extension LibSession {
                     _ = try configStore[sessionId, variant]?.merge(message)
                 }
         }
+        
+        // MARK: - Value Access
+        
+        public func isAdmin(groupSessionId: SessionId) -> Bool {
+            guard case .groupKeys(let conf, _, _) = configStore[groupSessionId, .groupKeys] else {
+                return false
+            }
+            
+            return groups_keys_is_admin(conf)
+        }
     }
 }
 
@@ -772,6 +793,10 @@ public protocol LibSessionCacheType: LibSessionImmutableCacheType, MutableCacheT
         swarmPublicKey: String,
         messages: [ConfigMessageReceiveJob.Details.MessageInfo]
     ) throws
+    
+    // MARK: - Value Access
+    
+    func isAdmin(groupSessionId: SessionId) -> Bool
 }
 
 private final class NoopLibSessionCache: LibSessionCacheType {
@@ -836,6 +861,10 @@ private final class NoopLibSessionCache: LibSessionCacheType {
         swarmPublicKey: String,
         messages: [ConfigMessageReceiveJob.Details.MessageInfo]
     ) throws {}
+    
+    // MARK: - Value Access
+    
+    func isAdmin(groupSessionId: SessionId) -> Bool { return false }
 }
 
 // MARK: - Convenience

SessionMessagingKit/Messages/Control Messages/Group Update Messages/GroupUpdateMemberLeftNotificationMessage.swift

@@ -16,7 +16,9 @@ public final class GroupUpdateMemberLeftNotificationMessage: ControlMessage {
     /// to having the same keys
     private let memberLeftCodableId: UUID = UUID()
     
-    override public var processWithBlockedSender: Bool { true }
+    public override var isSelfSendValid: Bool { true }
+    
+    public override var processWithBlockedSender: Bool { true }
     
     // MARK: - Proto Conversion
     

SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Groups.swift

@@ -161,7 +161,7 @@ extension MessageReceiver {
         authData: Data?,
         joinedAt: TimeInterval,
         invited: Bool,
-        hasAlreadyBeenKicked: Bool,
+        wasKickedFromGroup: Bool,
         calledFromConfig configTriggeringChange: ConfigDump.Variant?,
         using dependencies: Dependencies
     ) throws {
@@ -175,8 +175,6 @@ extension MessageReceiver {
             calledFromConfig: configTriggeringChange,
             using: dependencies
         )
-        let groupAlreadyApproved: Bool = ((try? ClosedGroup.fetchOne(db, id: groupSessionId))?.invited == false)
-        let groupInvitedState: Bool = (!groupAlreadyApproved && invited)
         let closedGroup: ClosedGroup = try ClosedGroup(
             threadId: groupSessionId,
             name: name,
@@ -184,10 +182,22 @@ extension MessageReceiver {
             shouldPoll: false,  // Always false here - will be updated in `approveGroup`
             groupIdentityPrivateKey: groupIdentityPrivateKey,
             authData: authData,
-            invited: groupInvitedState
+            invited: invited
         ).upserted(db)
         
         if configTriggeringChange != .userGroups {
+            // If we had previously been kicked from a group then we need to update the flag in UserGroups
+            // so that we don't consider ourselves as kicked anymore
+            if wasKickedFromGroup {
+                dependencies.mutate(cache: .libSession) { cache in
+                    try? cache.markAsInvited(
+                        db,
+                        groupSessionIds: [groupSessionId],
+                        using: dependencies
+                    )
+                }
+            }
+            
             // Update libSession
             try? LibSession.add(
                 db,
@@ -196,15 +206,15 @@ extension MessageReceiver {
                 name: name,
                 authData: authData,
                 joinedAt: joinedAt,
-                invited: groupInvitedState,
+                invited: invited,
                 using: dependencies
             )
         }
         
         /// If the group wasn't already approved, is not in the invite state and the user hasn't been kicked from it then handle the approval process
-        guard !groupAlreadyApproved && !invited && !hasAlreadyBeenKicked else { return }
+        guard !invited else { return }
         
-        try ClosedGroup.approveGroup(
+        try ClosedGroup.approveGroupIfNeeded(
             db,
             group: closedGroup,
             calledFromConfig: configTriggeringChange,
@@ -476,11 +486,7 @@ extension MessageReceiver {
         guard
             let sender: String = message.sender,
             let sentTimestampMs: UInt64 = message.sentTimestampMs,
-            (try? ClosedGroup
-                .filter(id: groupSessionId.hexString)
-                .select(.groupIdentityPrivateKey)
-                .asRequest(of: Data.self)
-                .fetchOne(db)) != nil
+            LibSession.isAdmin(groupSessionId: groupSessionId, using: dependencies)
         else { throw MessageReceiverError.invalidMessage }
         
         // Trigger this removal in a separate process because it requires a number of requests to be made
@@ -848,7 +854,7 @@ extension MessageReceiver {
             authData: memberAuthData,
             joinedAt: TimeInterval(Double(sentTimestampMs) / 1000),
             invited: !inviteSenderIsApproved,
-            hasAlreadyBeenKicked: wasKickedFromGroup,
+            wasKickedFromGroup: wasKickedFromGroup,
             calledFromConfig: nil,
             using: dependencies
         )
@@ -1029,15 +1035,17 @@ extension MessageReceiver {
                         calledFromConfig: nil,
                         using: dependencies
                     )
-                try LibSession.updateMemberProfile(
-                    db,
-                    groupSessionId: groupSessionId,
-                    memberId: senderSessionId,
-                    profile: profile,
-                    using: dependencies
-                )
                 
             default: break  // Invalid cases
         }
+        
+        // Update the member profile information in the GroupMembers config
+        try LibSession.updateMemberProfile(
+            db,
+            groupSessionId: groupSessionId,
+            memberId: senderSessionId,
+            profile: profile,
+            using: dependencies
+        )
     }
 }

SessionMessagingKit/Sending & Receiving/MessageReceiver.swift

@@ -595,12 +595,12 @@ public enum MessageReceiver {
             switch message {
                 case is GroupUpdateInviteResponseMessage: return false
                 case is GroupUpdateDeleteMemberContentMessage: return false
-                    // TODO: Add the 'memberLeft' (non UI based one) here
+                case is GroupUpdateMemberLeftMessage: return false
                 default: break
             }
             
             // Note: 'sentTimestamp' is in milliseconds so convert it
-            let messageSentTimestamp: TimeInterval = TimeInterval((message.sentTimestampMs ?? 0) * 1000)
+            let messageSentTimestamp: TimeInterval = TimeInterval((message.sentTimestampMs ?? 0) / 1000)
             let deletionInfo: (deleteBefore: TimeInterval, deleteAttachmentsBefore: TimeInterval) = dependencies.mutate(cache: .libSession) { cache in
                 let config: LibSession.Config? = cache.config(for: .groupInfo, sessionId: SessionId(.group, hex: threadId))
                 

SessionMessagingKit/Shared Models/SessionThreadViewModel.swift

@@ -51,6 +51,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
         case closedGroupProfileFront
         case closedGroupProfileBack
         case closedGroupProfileBackFallback
+        case closedGroupAdminProfile
         case closedGroupName
         case closedGroupDescription
         case closedGroupUserCount
@@ -84,6 +85,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
         case currentUserBlinded25SessionId
         case recentReactionEmoji
         case wasKickedFromGroup
+        case groupIsDestroyed
     }
     
     public var differenceIdentifier: String { threadId }
@@ -132,6 +134,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
                 )
                 
             case .group:
+                guard groupIsDestroyed != true else { return false }
                 guard wasKickedFromGroup != true else { return false }
                 guard threadIsMessageRequest == false else { return true }
                 
@@ -155,6 +158,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
     private let closedGroupProfileFront: Profile?
     private let closedGroupProfileBack: Profile?
     private let closedGroupProfileBackFallback: Profile?
+    public let closedGroupAdminProfile: Profile?
     public let closedGroupName: String?
     private let closedGroupDescription: String?
     private let closedGroupUserCount: Int?
@@ -188,6 +192,7 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat
     public let currentUserBlinded25SessionId: String?
     public let recentReactionEmoji: [String]?
     public let wasKickedFromGroup: Bool?
+    public let groupIsDestroyed: Bool?
     
     // UI specific logic
     
@@ -396,6 +401,7 @@ public extension SessionThreadViewModel {
         threadIsMessageRequest: Bool? = nil,
         threadIsBlocked: Bool? = nil,
         contactProfile: Profile? = nil,
+        closedGroupAdminProfile: Profile? = nil,
         currentUserIsClosedGroupMember: Bool? = nil,
         currentUserIsClosedGroupAdmin: Bool? = nil,
         openGroupPermissions: OpenGroup.Permissions? = nil,
@@ -437,6 +443,7 @@ public extension SessionThreadViewModel {
         self.closedGroupProfileFront = nil
         self.closedGroupProfileBack = nil
         self.closedGroupProfileBackFallback = nil
+        self.closedGroupAdminProfile = closedGroupAdminProfile
         self.closedGroupName = nil
         self.closedGroupDescription = nil
         self.closedGroupUserCount = nil
@@ -470,6 +477,7 @@ public extension SessionThreadViewModel {
         self.currentUserBlinded25SessionId = nil
         self.recentReactionEmoji = nil
         self.wasKickedFromGroup = false
+        self.groupIsDestroyed = false
     }
 }
 
@@ -507,6 +515,7 @@ public extension SessionThreadViewModel {
             closedGroupProfileFront: self.closedGroupProfileFront,
             closedGroupProfileBack: self.closedGroupProfileBack,
             closedGroupProfileBackFallback: self.closedGroupProfileBackFallback,
+            closedGroupAdminProfile: self.closedGroupAdminProfile,
             closedGroupName: self.closedGroupName,
             closedGroupDescription: self.closedGroupDescription,
             closedGroupUserCount: self.closedGroupUserCount,
@@ -535,7 +544,8 @@ public extension SessionThreadViewModel {
             currentUserBlinded15SessionId: self.currentUserBlinded15SessionId,
             currentUserBlinded25SessionId: self.currentUserBlinded25SessionId,
             recentReactionEmoji: (recentReactionEmoji ?? self.recentReactionEmoji),
-            wasKickedFromGroup: self.wasKickedFromGroup
+            wasKickedFromGroup: self.wasKickedFromGroup,
+            groupIsDestroyed: self.groupIsDestroyed
         )
     }
     
@@ -544,6 +554,7 @@ public extension SessionThreadViewModel {
         currentUserBlinded15SessionIdForThisThread: String?,
         currentUserBlinded25SessionIdForThisThread: String?,
         wasKickedFromGroup: Bool,
+        groupIsDestroyed: Bool,
         using dependencies: Dependencies
     ) -> SessionThreadViewModel {
         return SessionThreadViewModel(
@@ -574,6 +585,7 @@ public extension SessionThreadViewModel {
             closedGroupProfileFront: self.closedGroupProfileFront,
             closedGroupProfileBack: self.closedGroupProfileBack,
             closedGroupProfileBackFallback: self.closedGroupProfileBackFallback,
+            closedGroupAdminProfile: self.closedGroupAdminProfile,
             closedGroupName: self.closedGroupName,
             closedGroupDescription: self.closedGroupDescription,
             closedGroupUserCount: self.closedGroupUserCount,
@@ -620,7 +632,8 @@ public extension SessionThreadViewModel {
                 )?.hexString
             ),
             recentReactionEmoji: self.recentReactionEmoji,
-            wasKickedFromGroup: wasKickedFromGroup
+            wasKickedFromGroup: wasKickedFromGroup,
+            groupIsDestroyed: groupIsDestroyed
         )
     }
 }
@@ -700,6 +713,7 @@ public extension SessionThreadViewModel {
             let closedGroupProfileFront: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileFront)
             let closedGroupProfileBack: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBack)
             let closedGroupProfileBackFallback: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBackFallback)
+            let closedGroupAdminProfile: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupAdminProfile)
             let groupMember: TypedTableAlias<GroupMember> = TypedTableAlias()
             let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
             
@@ -739,6 +753,7 @@ public extension SessionThreadViewModel {
                     \(closedGroupProfileFront.allColumns),
                     \(closedGroupProfileBack.allColumns),
                     \(closedGroupProfileBackFallback.allColumns),
+                    \(closedGroupAdminProfile.allColumns),
                     \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
 
                     EXISTS (
@@ -861,6 +876,17 @@ public extension SessionThreadViewModel {
                     \(closedGroupProfileBack[.id]) IS NULL AND
                     \(closedGroupProfileBackFallback[.id]) = \(SQL("\(userSessionId.hexString)"))
                 )
+                LEFT JOIN \(closedGroupAdminProfile) ON (
+                    \(closedGroupAdminProfile[.id]) = (
+                        SELECT MIN(\(groupMember[.profileId]))
+                        FROM \(GroupMember.self)
+                        JOIN \(Profile.self) ON \(profile[.id]) = \(groupMember[.profileId])
+                        WHERE (
+                            \(groupMember[.groupId]) = \(closedGroup[.threadId]) AND
+                            \(SQL("\(groupMember[.role]) = \(GroupMember.Role.admin)"))
+                        )
+                    )
+                )
 
                 WHERE \(thread[.rowId]) IN \(rowIds)
                 \(groupSQL)
@@ -874,6 +900,7 @@ public extension SessionThreadViewModel {
                     Profile.numberOfSelectedColumns(db),
                     Profile.numberOfSelectedColumns(db),
                     Profile.numberOfSelectedColumns(db),
+                    Profile.numberOfSelectedColumns(db),
                     numColumnsBetweenProfilesAndAttachmentInfo,
                     Attachment.DescriptionInfo.numberOfSelectedColumns()
                 ])
@@ -883,7 +910,8 @@ public extension SessionThreadViewModel {
                     .closedGroupProfileFront: adapters[2],
                     .closedGroupProfileBack: adapters[3],
                     .closedGroupProfileBackFallback: adapters[4],
-                    .interactionAttachmentDescriptionInfo: adapters[6]
+                    .closedGroupAdminProfile: adapters[5],
+                    .interactionAttachmentDescriptionInfo: adapters[7]
                 ])
             }
         }
@@ -1128,6 +1156,7 @@ public extension SessionThreadViewModel {
         let closedGroupProfileFront: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileFront)
         let closedGroupProfileBack: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBack)
         let closedGroupProfileBackFallback: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBackFallback)
+        let closedGroupAdminProfile: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupAdminProfile)
         let groupMember: TypedTableAlias<GroupMember> = TypedTableAlias()
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
         let profile: TypedTableAlias<Profile> = TypedTableAlias()
@@ -1155,6 +1184,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileFront.allColumns),
                 \(closedGroupProfileBack.allColumns),
                 \(closedGroupProfileBackFallback.allColumns),
+                \(closedGroupAdminProfile.allColumns),
         
                 \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
                 \(closedGroup[.groupDescription]) AS \(ViewModel.Columns.closedGroupDescription),
@@ -1228,7 +1258,8 @@ public extension SessionThreadViewModel {
                 \(closedGroup[.threadId]) IS NOT NULL AND
                 \(closedGroupProfileBack[.id]) IS NULL AND
                 \(closedGroupProfileBackFallback[.id]) = \(SQL("\(userSessionId.hexString)"))
-            )
+            )            
+            LEFT JOIN \(closedGroupAdminProfile.never)
             
             WHERE \(SQL("\(thread[.id]) = \(threadId)"))
         """
@@ -1239,6 +1270,7 @@ public extension SessionThreadViewModel {
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
+                Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db)
             ])
             
@@ -1246,7 +1278,8 @@ public extension SessionThreadViewModel {
                 .contactProfile: adapters[1],
                 .closedGroupProfileFront: adapters[2],
                 .closedGroupProfileBack: adapters[3],
-                .closedGroupProfileBackFallback: adapters[4]
+                .closedGroupProfileBackFallback: adapters[4],
+                .closedGroupAdminProfile: adapters[5]
             ])
         }
     }
@@ -1339,6 +1372,7 @@ public extension SessionThreadViewModel {
         let closedGroupProfileFront: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileFront)
         let closedGroupProfileBack: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBack)
         let closedGroupProfileBackFallback: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBackFallback)
+        let closedGroupAdminProfile: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupAdminProfile)
         let groupMember: TypedTableAlias<GroupMember> = TypedTableAlias()
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
         let interactionFullTextSearch: TypedTableAlias<Interaction.FullTextSearch> = TypedTableAlias(name: Interaction.fullTextSearchTableName)
@@ -1363,6 +1397,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileFront.allColumns),
                 \(closedGroupProfileBack.allColumns),
                 \(closedGroupProfileBackFallback.allColumns),
+                \(closedGroupAdminProfile.allColumns),
                 \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
                 \(openGroup[.name]) AS \(ViewModel.Columns.openGroupName),
         
@@ -1421,7 +1456,8 @@ public extension SessionThreadViewModel {
                 \(closedGroup[.threadId]) IS NOT NULL AND
                 \(closedGroupProfileBack[.id]) IS NULL AND
                 \(closedGroupProfileBackFallback[.id]) = \(userSessionId.hexString)
-            )
+            )            
+            LEFT JOIN \(closedGroupAdminProfile.never)
         
             ORDER BY \(Column.rank), \(interaction[.timestampMs].desc)
             LIMIT \(SQL("\(SessionThreadViewModel.searchResultsLimit)"))
@@ -1433,6 +1469,7 @@ public extension SessionThreadViewModel {
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
+                Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db)
             ])
             
@@ -1440,7 +1477,8 @@ public extension SessionThreadViewModel {
                 .contactProfile: adapters[1],
                 .closedGroupProfileFront: adapters[2],
                 .closedGroupProfileBack: adapters[3],
-                .closedGroupProfileBackFallback: adapters[4]
+                .closedGroupProfileBackFallback: adapters[4],
+                .closedGroupAdminProfile: adapters[5]
             ])
         }
     }
@@ -1468,6 +1506,7 @@ public extension SessionThreadViewModel {
         let closedGroupProfileFront: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileFront)
         let closedGroupProfileBack: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBack)
         let closedGroupProfileBackFallback: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBackFallback)
+        let closedGroupAdminProfile: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupAdminProfile)
         let groupMember: TypedTableAlias<GroupMember> = TypedTableAlias()
         let groupMemberProfile: TypedTableAlias<Profile> = TypedTableAlias(name: "groupMemberProfile")
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
@@ -1506,6 +1545,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileFront.allColumns),
                 \(closedGroupProfileBack.allColumns),
                 \(closedGroupProfileBackFallback.allColumns),
+                \(closedGroupAdminProfile.allColumns),
                 \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
                 \(openGroup[.name]) AS \(ViewModel.Columns.openGroupName),
         
@@ -1527,6 +1567,7 @@ public extension SessionThreadViewModel {
             LEFT JOIN \(closedGroupProfileFront.never)
             LEFT JOIN \(closedGroupProfileBack.never)
             LEFT JOIN \(closedGroupProfileBackFallback.never)
+            LEFT JOIN \(closedGroupAdminProfile.never)
             LEFT JOIN \(closedGroup.never)
             LEFT JOIN \(openGroup.never)
             LEFT JOIN \(groupMemberInfo.never)
@@ -1607,6 +1648,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileBack[.id]) IS NULL AND
                 \(closedGroupProfileBackFallback[.id]) = \(userSessionId.hexString)
             )
+            LEFT JOIN \(closedGroupAdminProfile.never)
         
             LEFT JOIN \(contactProfile.never)
             LEFT JOIN \(openGroup.never)
@@ -1683,6 +1725,7 @@ public extension SessionThreadViewModel {
             LEFT JOIN \(closedGroupProfileFront.never)
             LEFT JOIN \(closedGroupProfileBack.never)
             LEFT JOIN \(closedGroupProfileBackFallback.never)
+            LEFT JOIN \(closedGroupAdminProfile.never)
             LEFT JOIN \(closedGroup.never)
             LEFT JOIN \(groupMemberInfo.never)
         
@@ -1698,6 +1741,7 @@ public extension SessionThreadViewModel {
             LEFT JOIN \(closedGroupProfileFront.never)
             LEFT JOIN \(closedGroupProfileBack.never)
             LEFT JOIN \(closedGroupProfileBackFallback.never)
+            LEFT JOIN \(closedGroupAdminProfile.never)
             LEFT JOIN \(openGroup.never)
             LEFT JOIN \(closedGroup.never)
             LEFT JOIN \(groupMemberInfo.never)
@@ -1781,6 +1825,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileFront.allColumns),
                 \(closedGroupProfileBack.allColumns),
                 \(closedGroupProfileBackFallback.allColumns),
+                \(closedGroupAdminProfile.allColumns),
                 \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
                 \(openGroup[.name]) AS \(ViewModel.Columns.openGroupName),
                 
@@ -1800,6 +1845,7 @@ public extension SessionThreadViewModel {
             LEFT JOIN \(closedGroupProfileFront.never)
             LEFT JOIN \(closedGroupProfileBack.never)
             LEFT JOIN \(closedGroupProfileBackFallback.never)
+            LEFT JOIN \(closedGroupAdminProfile.never)
             LEFT JOIN \(closedGroup.never)
             LEFT JOIN \(openGroup.never)
             LEFT JOIN \(groupMemberInfo.never)
@@ -1882,6 +1928,7 @@ public extension SessionThreadViewModel {
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
+                Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db)
             ])
 
@@ -1889,7 +1936,8 @@ public extension SessionThreadViewModel {
                 .contactProfile: adapters[1],
                 .closedGroupProfileFront: adapters[2],
                 .closedGroupProfileBack: adapters[3],
-                .closedGroupProfileBackFallback: adapters[4]
+                .closedGroupProfileBackFallback: adapters[4],
+                .closedGroupAdminProfile: adapters[5]
             ])
         }
     }
@@ -1995,6 +2043,7 @@ public extension SessionThreadViewModel {
         let closedGroupProfileFront: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileFront)
         let closedGroupProfileBack: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBack)
         let closedGroupProfileBackFallback: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupProfileBackFallback)
+        let closedGroupAdminProfile: TypedTableAlias<Profile> = TypedTableAlias(ViewModel.self, column: .closedGroupAdminProfile)
         let groupMember: TypedTableAlias<GroupMember> = TypedTableAlias()
         let openGroup: TypedTableAlias<OpenGroup> = TypedTableAlias()
         let profile: TypedTableAlias<Profile> = TypedTableAlias()
@@ -2030,6 +2079,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileFront.allColumns),
                 \(closedGroupProfileBack.allColumns),
                 \(closedGroupProfileBackFallback.allColumns),
+                \(closedGroupAdminProfile.allColumns),
                 \(closedGroup[.name]) AS \(ViewModel.Columns.closedGroupName),
         
                 EXISTS (
@@ -2109,6 +2159,7 @@ public extension SessionThreadViewModel {
                 \(closedGroupProfileBack[.id]) IS NULL AND
                 \(closedGroupProfileBackFallback[.id]) = \(SQL("\(userSessionId.hexString)"))
             )
+            LEFT JOIN \(closedGroupAdminProfile.never)
             
             WHERE (
                 \(thread[.shouldBeVisible]) = true AND
@@ -2133,6 +2184,7 @@ public extension SessionThreadViewModel {
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db),
+                Profile.numberOfSelectedColumns(db),
                 Profile.numberOfSelectedColumns(db)
             ])
             
@@ -2140,7 +2192,8 @@ public extension SessionThreadViewModel {
                 .contactProfile: adapters[1],
                 .closedGroupProfileFront: adapters[2],
                 .closedGroupProfileBack: adapters[3],
-                .closedGroupProfileBackFallback: adapters[4]
+                .closedGroupProfileBackFallback: adapters[4],
+                .closedGroupAdminProfile: adapters[5]
             ])
         }
     }

SessionMessagingKit/Utilities/Profile+CurrentUser.swift

@@ -131,9 +131,23 @@ public extension Profile {
         let profile: Profile = Profile.fetchOrCreate(db, id: publicKey)
         var profileChanges: [ConfigColumnAssignment] = []
         
+        /// There were some bugs (somewhere) where some of these timestamps valid could be in seconds or milliseconds so we need to try to
+        /// detect this and convert it to proper seconds (if we don't then we will never update the profile)
+        func convertToSections(_ maybeValue: Double?) -> TimeInterval {
+            guard let value: Double = maybeValue else { return 0 }
+            
+            if value > 9_000_000_000_000 {  // Microseconds
+                return (value / 1_000_000)
+            } else if value > 9_000_000_000 {  // Milliseconds
+                return (value / 1000)
+            }
+            
+            return TimeInterval(value)  // Seconds
+        }
+        
         // Name
         // FIXME: This 'lastNameUpdate' approach is buggy - we should have a timestamp on the ConvoInfoVolatile
-        switch (displayNameUpdate, isCurrentUser, (sentTimestamp > (profile.lastNameUpdate ?? 0))) {
+        switch (displayNameUpdate, isCurrentUser, (sentTimestamp > convertToSections(profile.lastNameUpdate))) {
             case (.none, _, _): break
             case (.currentUserUpdate(let name), true, _), (.contactUpdate(let name), false, true):
                 guard let name: String = name, !name.isEmpty, name != profile.name else { break }
@@ -146,7 +160,7 @@ public extension Profile {
         }
         
         // Blocks community message requests flag
-        if let blocksCommunityMessageRequests: Bool = blocksCommunityMessageRequests, sentTimestamp > (profile.lastBlocksCommunityMessageRequests ?? 0) {
+        if let blocksCommunityMessageRequests: Bool = blocksCommunityMessageRequests, sentTimestamp > convertToSections(profile.lastBlocksCommunityMessageRequests) {
             profileChanges.append(Profile.Columns.blocksCommunityMessageRequests.set(to: blocksCommunityMessageRequests))
             profileChanges.append(Profile.Columns.lastBlocksCommunityMessageRequests.set(to: sentTimestamp))
         }

SessionMessagingKitTests/LibSession/LibSessionGroupMembersSpec.swift

@@ -87,6 +87,7 @@ class LibSessionGroupMembersSpec: QuickSpec {
                     .thenReturn(createGroupOutput.groupState[.groupMembers])
                 cache.when { $0.config(for: .groupKeys, sessionId: .any) }
                     .thenReturn(createGroupOutput.groupState[.groupKeys])
+                cache.when { $0.isAdmin(groupSessionId: .any) }.thenReturn(true)
             }
         )
         

SessionMessagingKitTests/Sending & Receiving/MessageReceiverGroupsSpec.swift

@@ -185,6 +185,7 @@ class MessageReceiverGroupsSpec: QuickSpec {
                 
                 cache.when { $0.setConfig(for: .any, sessionId: .any, to: .any) }.thenReturn(())
                 cache.when { $0.removeConfigs(for: .any) }.thenReturn(())
+                cache.when { $0.hasConfig(for: .any, sessionId: .any) }.thenReturn(true)
                 cache
                     .when { $0.config(for: .userGroups, sessionId: userSessionId) }
                     .thenReturn(userGroupsConfig)
@@ -216,6 +217,7 @@ class MessageReceiverGroupsSpec: QuickSpec {
                         }
                     }
                     .thenReturn(())
+                cache.when { $0.isAdmin(groupSessionId: .any) }.thenReturn(true)
             }
         )
         @TestState(cache: .snodeAPI, in: dependencies) var mockSnodeAPICache: MockSnodeAPICache! = MockSnodeAPICache(
@@ -701,6 +703,9 @@ class MessageReceiverGroupsSpec: QuickSpec {
                     
                     // MARK: ------ creates the group state
                     it("creates the group state") {
+                        mockLibSessionCache
+                            .when { $0.hasConfig(for: .any, sessionId: .any) }
+                            .thenReturn(false)
                         mockStorage.write { db in
                             try MessageReceiver.handleGroupUpdateMessage(
                                 db,

SessionMessagingKitTests/_TestUtilities/MockLibSessionCache.swift

@@ -98,4 +98,10 @@ class MockLibSessionCache: Mock<LibSessionCacheType>, LibSessionCacheType {
     ) throws {
         try mockThrowingNoReturn(args: [swarmPublicKey, messages])
     }
+    
+    // MARK: - Value Access
+    
+    func isAdmin(groupSessionId: SessionId) -> Bool {
+        return mock(args: [groupSessionId])
+    }
 }

SessionUtilitiesKit/LibSession/LibSessionError.swift

@@ -18,6 +18,7 @@ public enum LibSessionError: Error, CustomStringConvertible {
     case failedToMakeSubAccountInGroup
     case invalidCConversion
     case unableToGeneratePushData
+    case attemptedToModifyGroupWithoutAdminKey
     
     case libSessionError(String)
     
@@ -124,6 +125,8 @@ public enum LibSessionError: Error, CustomStringConvertible {
             case .failedToMakeSubAccountInGroup: return "Failed to make subaccount in group (LibSessionError.failedToMakeSubAccountInGroup)."
             case .invalidCConversion: return "Invalid conversation to C type (LibSessionError.invalidCConversion)."
             case .unableToGeneratePushData: return "Unable to generate push data (LibSessionError.unableToGeneratePushData)."
+            case .attemptedToModifyGroupWithoutAdminKey:
+                return "Attempted to modify group without admin key (LibSessionError.attemptedToModifyGroupWithoutAdminKey)."
             
             case .libSessionError(let error): return "\(error)"
         }