Updated cell configurations

Sources/ChatFeature/Controllers/MembersController.swift

 import UIKit
 import Models
 import Shared
+import XXModels
 
 final class MembersController: UIViewController {
     lazy private var stackView = UIStackView()
@@ -33,8 +34,8 @@ final class MembersController: UIViewController {
 
         for member in members {
             let memberView = MemberView()
-            memberView.titleLabel.text = member.username
-            memberView.avatarView.setupProfile(title: member.username, image: member.photo, size: .small)
+//            memberView.titleLabel.text = member.username
+//            memberView.avatarView.setupProfile(title: member.username, image: member.photo, size: .small)
             stackView.addArrangedSubview(memberView)
         }
     }

Sources/ChatFeature/Controllers/SingleChatController.swift

 import HUD
-import DrawerFeature
 import UIKit
 import Theme
 import Models
@@ -7,8 +6,10 @@ import Shared
 import Combine
 import XXLogger
 import QuickLook
+import XXModels
 import Voxophone
 import ChatLayout
+import DrawerFeature
 import DifferenceKit
 import ChatInputFeature
 import DependencyInjection

Sources/ChatFeature/Coordinator/ChatCoordinator.swift

@@ -4,6 +4,7 @@ import Shared
 import QuickLook
 import Permissions
 import Presentation
+import XXModels
 
 public protocol ChatCoordinating {
     func toCamera(from: UIViewController)

Sources/ChatFeature/Helpers/BubbleBuilder.swift

@@ -9,20 +9,20 @@ final class Bubbler {
         audioBubble.dateLabel.text = item.date.asHoursAndMinutes()
 
         switch item.status {
-        case .received, .read:
+        case .received:
             audioBubble.lockerImageView.removeFromSuperview()
             audioBubble.backgroundColor = Asset.neutralWhite.color
             audioBubble.dateLabel.textColor = Asset.neutralDisabled.color
             audioBubble.progressLabel.textColor = Asset.neutralDisabled.color
-        case .receivingAttachment:
+        case .receiving:
             audioBubble.backgroundColor = Asset.neutralWhite.color
             audioBubble.dateLabel.textColor = Asset.neutralDisabled.color
             audioBubble.progressLabel.textColor = Asset.neutralDisabled.color
-        case .timedOut:
+        case .sendingTimedOut:
             audioBubble.backgroundColor = Asset.accentWarning.color
             audioBubble.dateLabel.textColor = Asset.neutralWhite.color
             audioBubble.progressLabel.textColor = Asset.neutralWhite.color
-        case .failedToSend:
+        case .sendingFailed:
             audioBubble.backgroundColor = Asset.accentDanger.color
             audioBubble.dateLabel.textColor = Asset.neutralWhite.color
             audioBubble.progressLabel.textColor = Asset.neutralWhite.color
@@ -30,10 +30,12 @@ final class Bubbler {
             audioBubble.backgroundColor = Asset.brandBubble.color
             audioBubble.dateLabel.textColor = Asset.neutralWhite.color
             audioBubble.progressLabel.textColor = Asset.neutralWhite.color
-        case .sending, .sendingAttachment:
+        case .sending:
             audioBubble.backgroundColor = Asset.brandBubble.color
             audioBubble.dateLabel.textColor = Asset.neutralWhite.color
             audioBubble.progressLabel.textColor = Asset.neutralWhite.color
+        case .receivingFailed:
+            fatalError()
         }
     }
 
@@ -46,20 +48,20 @@ final class Bubbler {
         imageBubble.dateLabel.text = item.date.asHoursAndMinutes()
 
         switch item.status {
-        case .received, .read:
+        case .received:
             imageBubble.lockerImageView.removeFromSuperview()
             imageBubble.backgroundColor = Asset.neutralWhite.color
             imageBubble.dateLabel.textColor = Asset.neutralDisabled.color
             imageBubble.progressLabel.textColor = Asset.neutralDisabled.color
-        case .receivingAttachment:
+        case .receiving:
             imageBubble.backgroundColor = Asset.neutralWhite.color
             imageBubble.dateLabel.textColor = Asset.neutralDisabled.color
             imageBubble.progressLabel.textColor = Asset.neutralDisabled.color
-        case .failedToSend:
+        case .sendingFailed:
             imageBubble.backgroundColor = Asset.accentDanger.color
             imageBubble.dateLabel.textColor = Asset.neutralWhite.color
             imageBubble.progressLabel.textColor = Asset.neutralWhite.color
-        case .timedOut:
+        case .sendingTimedOut:
             imageBubble.backgroundColor = Asset.accentWarning.color
             imageBubble.dateLabel.textColor = Asset.neutralWhite.color
             imageBubble.progressLabel.textColor = Asset.neutralWhite.color
@@ -67,10 +69,12 @@ final class Bubbler {
             imageBubble.backgroundColor = Asset.brandBubble.color
             imageBubble.dateLabel.textColor = Asset.neutralWhite.color
             imageBubble.progressLabel.textColor = Asset.neutralWhite.color
-        case .sending, .sendingAttachment:
+        case .sending:
             imageBubble.backgroundColor = Asset.brandBubble.color
             imageBubble.dateLabel.textColor = Asset.neutralWhite.color
             imageBubble.progressLabel.textColor = Asset.neutralWhite.color
+        case .receivingFailed:
+            fatalError()
         }
     }
 
@@ -85,19 +89,19 @@ final class Bubbler {
         let roundButtonColor: UIColor
 
         switch item.status {
-        case .received, .read, .receivingAttachment:
+        case .received, .receiving:
             bubble.lockerImageView.removeFromSuperview()
             bubble.backgroundColor = Asset.neutralWhite.color
             bubble.textView.textColor = Asset.neutralActive.color
             bubble.dateLabel.textColor = Asset.neutralDisabled.color
             roundButtonColor = Asset.neutralDisabled.color
             bubble.revertBottomStackOrder()
-        case .timedOut:
+        case .sendingTimedOut:
             bubble.backgroundColor = Asset.accentWarning.color
             bubble.textView.textColor = Asset.neutralWhite.color
             bubble.dateLabel.textColor = Asset.neutralWhite.color
             roundButtonColor = Asset.neutralWhite.color
-        case .failedToSend:
+        case .sendingFailed:
             bubble.backgroundColor = Asset.accentDanger.color
             bubble.textView.textColor = Asset.neutralWhite.color
             bubble.dateLabel.textColor = Asset.neutralWhite.color
@@ -107,11 +111,13 @@ final class Bubbler {
             bubble.textView.textColor = Asset.neutralWhite.color
             bubble.dateLabel.textColor = Asset.neutralWhite.color
             roundButtonColor = Asset.neutralWhite.color
-        case .sending, .sendingAttachment:
+        case .sending:
             bubble.backgroundColor = Asset.brandBubble.color
             bubble.textView.textColor = Asset.neutralWhite.color
             bubble.dateLabel.textColor = Asset.neutralWhite.color
             roundButtonColor = Asset.neutralWhite.color
+        case .receivingFailed:
+            fatalError()
         }
 
         let attrString = NSAttributedString(
@@ -187,7 +193,7 @@ final class Bubbler {
         let roundButtonColor: UIColor
 
         switch item.status {
-        case .received, .read, .receivingAttachment:
+        case .received, .receiving:
             bubble.senderLabel.removeFromSuperview()
             bubble.backgroundColor = Asset.neutralWhite.color
             bubble.textView.textColor = Asset.neutralActive.color
@@ -196,7 +202,7 @@ final class Bubbler {
             bubble.replyView.container.backgroundColor = Asset.brandDefault.color
             bubble.replyView.space.backgroundColor = Asset.brandPrimary.color
             bubble.revertBottomStackOrder()
-        case .timedOut:
+        case .sendingTimedOut:
             bubble.senderLabel.removeFromSuperview()
             bubble.backgroundColor = Asset.accentWarning.color
             bubble.textView.textColor = Asset.neutralWhite.color
@@ -204,7 +210,7 @@ final class Bubbler {
             roundButtonColor = Asset.neutralWhite.color
             bubble.replyView.space.backgroundColor = Asset.neutralWhite.color
             bubble.replyView.container.backgroundColor = Asset.brandLight.color
-        case .failedToSend:
+        case .sendingFailed:
             bubble.senderLabel.removeFromSuperview()
             bubble.backgroundColor = Asset.accentDanger.color
             bubble.textView.textColor = Asset.neutralWhite.color
@@ -212,7 +218,7 @@ final class Bubbler {
             roundButtonColor = Asset.neutralWhite.color
             bubble.replyView.space.backgroundColor = Asset.neutralWhite.color
             bubble.replyView.container.backgroundColor = Asset.brandLight.color
-        case .sent, .sending, .sendingAttachment:
+        case .sent, .sending:
             bubble.senderLabel.removeFromSuperview()
             bubble.textView.textColor = Asset.neutralWhite.color
             bubble.backgroundColor = Asset.brandBubble.color
@@ -220,6 +226,8 @@ final class Bubbler {
             roundButtonColor = Asset.neutralWhite.color
             bubble.replyView.space.backgroundColor = Asset.neutralWhite.color
             bubble.replyView.container.backgroundColor = Asset.brandLight.color
+        case .receivingFailed:
+            fatalError()
         }
 
         let attrString = NSAttributedString(

Sources/ChatFeature/Helpers/CellConfigurator.swift

@@ -43,7 +43,7 @@ extension CellFactory {
     ) -> Self {
         .init(
             canBuild: { item in
-                (item.status == .received || item.status == .read || item.status == .receivingAttachment)
+                (item.status == .received || item.status == .receiving)
                 && item.payload.reply == nil
                 && item.payload.attachment != nil
                 && item.payload.attachment?._extension == .audio
@@ -65,7 +65,7 @@ extension CellFactory {
                 )
 
                 cell.leftView.setup(with: model)
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = {}
 
                 Bubbler.build(audioBubble: cell.leftView, with: item)
@@ -87,13 +87,13 @@ extension CellFactory {
                     }.store(in: &cell.leftView.cancellables)
 
                 cell.leftView.didTapRight = {
-                    guard item.status != .receivingAttachment else { return }
+                    guard item.status != .receiving else { return }
 
                     voxophone.toggleLoudspeaker()
                 }
 
                 cell.leftView.didTapLeft = {
-                    guard item.status != .receivingAttachment else { return }
+                    guard item.status != .receiving else { return }
 
                     if case .playing(url, _, _, _) = voxophone.state {
                         voxophone.reset()
@@ -114,9 +114,9 @@ extension CellFactory {
         .init(
             canBuild: { item in
                 (item.status == .sent ||
-                 item.status == .failedToSend ||
-                 item.status == .sendingAttachment ||
-                 item.status == .timedOut)
+                 item.status == .sending ||
+                 item.status == .sendingFailed ||
+                 item.status == .sendingTimedOut)
                 && item.payload.reply == nil
                 && item.payload.attachment != nil
                 && item.payload.attachment?._extension == .audio
@@ -137,7 +137,7 @@ extension CellFactory {
                 )
 
                 cell.rightView.setup(with: model)
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = {}
 
                 Bubbler.build(audioBubble: cell.rightView, with: item)
@@ -182,9 +182,9 @@ extension CellFactory {
         .init(
             canBuild: { item in
                 (item.status == .sent ||
-                 item.status == .failedToSend ||
-                 item.status == .sendingAttachment ||
-                 item.status == .timedOut)
+                 item.status == .sending ||
+                 item.status == .sendingFailed ||
+                 item.status == .sendingTimedOut)
                 && item.payload.reply == nil
                 && item.payload.attachment != nil
                 && item.payload.attachment?._extension == .image
@@ -196,7 +196,7 @@ extension CellFactory {
 
                 Bubbler.build(imageBubble: cell.rightView, with: item)
 
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = {}
 
                 if let image = UIImage(data: attachment.data!) {
@@ -211,7 +211,7 @@ extension CellFactory {
     static func incomingImage() -> Self {
         .init(
             canBuild: { item in
-                (item.status == .received || item.status == .read || item.status == .receivingAttachment)
+                (item.status == .received || item.status == .receiving)
                 && item.payload.reply == nil
                 && item.payload.attachment != nil
                 && item.payload.attachment?._extension == .image
@@ -222,7 +222,7 @@ extension CellFactory {
                 let cell: IncomingImageCell = collectionView.dequeueReusableCell(forIndexPath: indexPath)
 
                 Bubbler.build(imageBubble: cell.leftView, with: item)
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = {}
                 cell.leftView.imageView.image = UIImage(data: attachment.data!)
                 return cell
@@ -256,7 +256,7 @@ extension CellFactory {
                     )
                 )
 
-                cell.canReply = item.status.canReply
+                cell.canReply = item.status == .sent
                 cell.performReply = performReply
                 cell.rightView.didTapShowRound = { showRound(item.roundURL) }
                 return cell
@@ -272,7 +272,7 @@ extension CellFactory {
     ) -> Self {
         .init(
             canBuild: { item in
-                (item.status == .received || item.status == .read)
+                item.status == .received
                 && item.payload.reply != nil
                 && item.payload.attachment == nil
 
@@ -287,7 +287,7 @@ extension CellFactory {
                         sender: name(item.payload.reply!.senderId)
                     )
                 )
-                cell.canReply = item.status.canReply
+                cell.canReply = item.status == .received
                 cell.performReply = performReply
                 cell.leftView.didTapShowRound = { showRound(item.roundURL) }
                 cell.leftView.revertBottomStackOrder()
@@ -303,7 +303,7 @@ extension CellFactory {
     ) -> Self {
         .init(
             canBuild: { item in
-                (item.status == .failedToSend || item.status == .timedOut)
+                (item.status == .sendingFailed || item.status == .sendingTimedOut)
                 && item.payload.reply != nil
                 && item.payload.attachment == nil
 
@@ -319,7 +319,7 @@ extension CellFactory {
                     )
                 )
 
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = performReply
                 return cell
             }
@@ -334,7 +334,7 @@ extension CellFactory {
     ) -> Self {
         .init(
             canBuild: { item in
-                (item.status == .received || item.status == .read)
+                item.status == .received
                 && item.payload.reply == nil
                 && item.payload.attachment == nil
 
@@ -342,7 +342,7 @@ extension CellFactory {
                 let cell: IncomingTextCell = collectionView.dequeueReusableCell(forIndexPath: indexPath)
 
                 Bubbler.build(bubble: cell.leftView, with: item)
-                cell.canReply = item.status.canReply
+                cell.canReply = item.status == .received
                 cell.performReply = performReply
                 cell.leftView.didTapShowRound = { showRound(item.roundURL) }
                 cell.leftView.revertBottomStackOrder()
@@ -365,7 +365,7 @@ extension CellFactory {
                 let cell: OutgoingTextCell = collectionView.dequeueReusableCell(forIndexPath: indexPath)
 
                 Bubbler.build(bubble: cell.rightView, with: item)
-                cell.canReply = item.status.canReply
+                cell.canReply = item.status == .sent
                 cell.performReply = performReply
                 cell.rightView.didTapShowRound = { showRound(item.roundURL) }
 
@@ -377,7 +377,7 @@ extension CellFactory {
     static func outgoingFailedText(performReply: @escaping () -> Void) -> Self {
         .init(
             canBuild: { item in
-                (item.status == .failedToSend || item.status == .timedOut)
+                (item.status == .sendingFailed || item.status == .sendingTimedOut)
                 && item.payload.reply == nil
                 && item.payload.attachment == nil
 
@@ -385,7 +385,7 @@ extension CellFactory {
                 let cell: OutgoingFailedTextCell = collectionView.dequeueReusableCell(forIndexPath: indexPath)
 
                 Bubbler.build(bubble: cell.rightView, with: item)
-                cell.canReply = item.status.canReply
+                cell.canReply = false
                 cell.performReply = performReply
                 return cell
             }
@@ -425,9 +425,9 @@ struct ActionFactory {
 
         switch action {
         case .reply:
-            guard item.status == .read || item.status == .received || item.status == .sent else { return nil }
+            guard item.status == .received || item.status == .sent else { return nil }
         case .retry:
-            guard item.status == .failedToSend || item.status == .timedOut else { return nil }
+            guard item.status == .sendingFailed || item.status == .sendingTimedOut else { return nil }
         case .delete, .copy:
             break
         }

Sources/ChatFeature/Models/ChatItem.swift

 import Models
+import XXModels
 import Foundation
 import DifferenceKit
 

Sources/ChatFeature/ViewModels/SingleChatViewModel.swift

@@ -4,6 +4,7 @@ import Models
 import Shared
 import Combine
 import XXLogger
+import XXModels
 import Foundation
 import Integration
 import Permissions

Sources/Integration/Session/SessionType.swift

@@ -10,6 +10,8 @@ public protocol SessionType {
     var hasRunningTasks: Bool { get }
     var isOnline: AnyPublisher<Bool, Never> { get }
 
+    var dbManager: Database { get }
+
     func deleteMyself() throws
     func getId(from: Data) -> Data?
 

Sources/LaunchFeature/LaunchCoordinator.swift

 import UIKit
 import Models
+import XXModels
 import Presentation
 
 public protocol LaunchCoordinating {

Sources/LaunchFeature/LaunchViewModel.swift

 import HUD
 import Shared
 import Models
+
 import Combine
 import Defaults
+import XXModels
 import Foundation
 import Integration
 import Permissions
@@ -118,21 +120,23 @@ final class LaunchViewModel {
     }
 
     func getContactWith(userId: Data) -> Contact? {
-        guard let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
-              let contact = session.getContactWith(userId: userId) else {
-            return nil
-        }
-
-        return contact
+        fatalError()
+//        guard let session = try? DependencyInjection.Container.shared.resolve() as SessionType,
+//              let contact = session.getContactWith(userId: userId) else {
+//            return nil
+//        }
+//
+//        return contact
     }
 
     func getGroupInfoWith(groupId: Data) -> GroupChatInfo? {
-        guard let session: SessionType = try? DependencyInjection.Container.shared.resolve(),
-              let info = session.getGroupChatInfoWith(groupId: groupId) else {
-            return nil
-        }
-
-        return info
+        fatalError()
+//        guard let session: SessionType = try? DependencyInjection.Container.shared.resolve(),
+//              let info = session.getGroupChatInfoWith(groupId: groupId) else {
+//            return nil
+//        }
+//
+//        return info
     }
 
     private func versionFailed(error: Error) {

Sources/MenuFeature/ViewModels/MenuViewModel.swift

 import Combine
+import XXModels
 import Defaults
 import Foundation
 import Integration
@@ -11,24 +12,21 @@ final class MenuViewModel {
     @KeyObject(.username, defaultValue: "") var username: String
 
     var requestCount: AnyPublisher<Int, Never> {
-        Publishers.CombineLatest(
-            session.contacts(.received),
-            session.groups(.pending)
-        ).map { (contacts, groups) in
-            let contactRequests = contacts.filter {
-                $0.status == .verified ||
-                $0.status == .confirming ||
-                $0.status == .confirmationFailed ||
-                $0.status == .verificationFailed ||
-                $0.status == .verificationInProgress
-            }
-
-            let groupRequests = groups.filter {
-                $0.status == .pending
-            }
-
-            return contactRequests.count + groupRequests.count
-        }.eraseToAnyPublisher()
+        let groupQuery = Group.Query(authStatus: [.pending])
+        let contactsQuery = Contact.Query(authStatus: [
+            .verified,
+            .confirming,
+            .confirmationFailed,
+            .verificationFailed,
+            .verificationInProgress
+        ])
+
+        return Publishers.CombineLatest(
+            session.dbManager.fetchContactsPublisher(contactsQuery).catch { _ in Just([]) },
+            session.dbManager.fetchGroupsPublisher(groupQuery).catch { _ in Just([]) }
+        )
+        .map { $0.0.count + $0.1.count }
+        .eraseToAnyPublisher()
     }
 
     var xxdk: String {