mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
use isDM from the SDK to determine if a spaceRoom, a joinedRoom or a notificationItem are from a dm room.
This commit is contained in:
@@ -13383,6 +13383,11 @@ class NotificationItemProxyMock: NotificationItemProxyProtocol, @unchecked Senda
|
||||
set(value) { underlyingIsRoomPrivate = value }
|
||||
}
|
||||
var underlyingIsRoomPrivate: Bool!
|
||||
var isDM: Bool {
|
||||
get { return underlyingIsDM }
|
||||
set(value) { underlyingIsDM = value }
|
||||
}
|
||||
var underlyingIsDM: Bool!
|
||||
var isNoisy: Bool {
|
||||
get { return underlyingIsNoisy }
|
||||
set(value) { underlyingIsNoisy = value }
|
||||
@@ -15349,6 +15354,11 @@ class RoomInfoProxyMock: RoomInfoProxyProtocol, @unchecked Sendable {
|
||||
set(value) { underlyingIsDirect = value }
|
||||
}
|
||||
var underlyingIsDirect: Bool!
|
||||
var isDM: Bool {
|
||||
get { return underlyingIsDM }
|
||||
set(value) { underlyingIsDM = value }
|
||||
}
|
||||
var underlyingIsDM: Bool!
|
||||
var isSpace: Bool {
|
||||
get { return underlyingIsSpace }
|
||||
set(value) { underlyingIsSpace = value }
|
||||
@@ -15469,6 +15479,11 @@ class RoomMemberProxyMock: RoomMemberProxyProtocol, @unchecked Sendable {
|
||||
set(value) { underlyingPowerLevel = value }
|
||||
}
|
||||
var underlyingPowerLevel: RoomPowerLevel!
|
||||
var isServiceMember: Bool {
|
||||
get { return underlyingIsServiceMember }
|
||||
set(value) { underlyingIsServiceMember = value }
|
||||
}
|
||||
var underlyingIsServiceMember: Bool!
|
||||
|
||||
}
|
||||
class RoomMembershipDetailsProxyMock: RoomMembershipDetailsProxyProtocol, @unchecked Sendable {
|
||||
|
||||
@@ -85,6 +85,6 @@ private extension RoomMember {
|
||||
isIgnored: proxy.isIgnored,
|
||||
suggestedRoleForPowerLevel: proxy.role.rustRole,
|
||||
membershipChangeReason: proxy.membershipChangeReason,
|
||||
isServiceMember: false)
|
||||
isServiceMember: proxy.isServiceMember)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,6 +182,7 @@ extension RoomInfoProxyMock {
|
||||
activeMembersCount = configuration.members.filter { $0.membership == .join || $0.membership == .invite }.count
|
||||
invitedMembersCount = configuration.members.filter { $0.membership == .invite }.count
|
||||
joinedMembersCount = configuration.members.filter { $0.membership == .join }.count
|
||||
isDM = isDirect && activeMembersCount <= 2
|
||||
highlightCount = 0
|
||||
notificationCount = 0
|
||||
cachedUserDefinedNotificationMode = .allMessages
|
||||
|
||||
@@ -52,5 +52,6 @@ extension NotificationItemProxyMock {
|
||||
underlyingIsNoisy = configuration.isNoisy
|
||||
underlyingHasMention = configuration.hasMention
|
||||
threadRootEventID = configuration.threadRootEventID
|
||||
underlyingIsDM = configuration.isRoomDirect && configuration.roomJoinedMembers <= 2
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +151,8 @@ private extension SpaceRoom {
|
||||
childrenCount: UInt64 = 0,
|
||||
membership: Membership? = .joined,
|
||||
heroes: [RoomHero]? = [],
|
||||
via: [String] = []) {
|
||||
via: [String] = [],
|
||||
isDM: Bool? = false) {
|
||||
self.init(roomId: id,
|
||||
canonicalAlias: canonicalAlias,
|
||||
displayName: name,
|
||||
@@ -168,6 +169,6 @@ private extension SpaceRoom {
|
||||
state: membership,
|
||||
heroes: heroes,
|
||||
via: via,
|
||||
isDm: false)
|
||||
isDm: isDM)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user