ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Room Member is now an interface SDK update (#711)

Browse Source 
* migrated to the usage of a Protocol for the RoomMember

* removed unused file

* code improvement

* sliding sync new states

* sdk bump

* fix for tests

* fixing tests

* package resolved rollback

* rollback package.resolved

* fixed a mistakenly removed dependency

* Revert "fixed a mistakenly removed dependency"

This reverts commit 096d9da6142d8117bc1dfa6d5bbbd797b43b31ad.

* removing unnecessary Identifiable conformance

* pr suggestions

* pr comment
This commit is contained in:
Mauro
2023-03-22 13:36:08 +01:00
committed by GitHub
parent 8c89b06f3b
commit fe72d34d11
24 changed files with 241 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Room/RoomMember/RoomMemberProxy.swift
+54
View File
@@ -0,0 +1,54 @@
//
// Copyright 2023 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
import MatrixRustSDK
final class RoomMemberProxy: RoomMemberProxyProtocol {
private let member: RoomMemberProtocol
init(member: RoomMemberProtocol) {
self.member = member
}
var userID: String {
member.userId()
}
var displayName: String? {
member.displayName()
}
var avatarURL: URL? {
member.avatarUrl().flatMap(URL.init(string:))
}
var membership: MembershipState {
member.membership()
}
var isNameAmbiguous: Bool {
member.isNameAmbiguous()
}
var powerLevel: Int {
Int(member.powerLevel())
}
var normalizedPowerLevel: Int {
Int(member.normalizedPowerLevel())
}
}
ElementX/Sources/Services/Room/RoomMember/RoomMemberProxyProtocol.swift
+29
View File
@@ -0,0 +1,29 @@
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
import MatrixRustSDK
// sourcery: AutoMockable
protocol RoomMemberProxyProtocol {
var userID: String { get }
var displayName: String? { get }
var avatarURL: URL? { get }
var membership: MembershipState { get }
var isNameAmbiguous: Bool { get }
var powerLevel: Int { get }
var normalizedPowerLevel: Int { get }
}
ElementX/Sources/Services/Room/RoomMemberProxy.swift
-93
View File
@@ -1,93 +0,0 @@
//
// Copyright 2022 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
import Foundation
import MatrixRustSDK
struct RoomMemberProxy {
private let member: RoomMember
init(with member: RoomMember) {
self.member = member
}
var userId: String {
member.userId
}
var displayName: String? {
member.displayName
}
var avatarURL: URL? {
member.avatarUrl.flatMap(URL.init(string:))
}
var membership: MembershipState {
member.membership
}
var isNameAmbiguous: Bool {
member.isNameAmbiguous
}
var powerLevel: Int64 {
member.powerLevel
}
var normalizedPowerLevel: Int64 {
member.normalizedPowerLevel
}
}
extension RoomMemberProxy: Identifiable {
var id: String {
userId
}
}
// Mocks
extension RoomMemberProxy {
static var mockAlice: RoomMemberProxy {
RoomMemberProxy(with: .init(userId: "alice@matrix.org",
displayName: "Alice",
avatarUrl: nil,
membership: .join,
isNameAmbiguous: false,
powerLevel: 50,
normalizedPowerLevel: 50))
}
static var mockBob: RoomMemberProxy {
RoomMemberProxy(with: .init(userId: "bob@matrix.org",
displayName: "Bob",
avatarUrl: nil,
membership: .join,
isNameAmbiguous: false,
powerLevel: 50,
normalizedPowerLevel: 50))
}
static var mockCharlie: RoomMemberProxy {
RoomMemberProxy(with: .init(userId: "charlie@matrix.org",
displayName: "Charlie",
avatarUrl: nil,
membership: .join,
isNameAmbiguous: false,
powerLevel: 50,
normalizedPowerLevel: 50))
}
}
ElementX/Sources/Services/Room/RoomProxy.swift
+2 -2
View File
@@ -271,11 +271,11 @@ class RoomProxy: RoomProxyProtocol {
}
}
func members() async -> Result<[RoomMemberProxy], RoomProxyError> {
func members() async -> Result<[RoomMemberProxyProtocol], RoomProxyError> {
await Task.dispatch(on: .global()) {
do {
let members = try self.room.members()
return .success(members.map { RoomMemberProxy(with: $0) })
return .success(members.map { RoomMemberProxy(member: $0) })
} catch {
return .failure(.failedRetrievingMembers)
}
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+1 -1
View File
@@ -76,7 +76,7 @@ protocol RoomProxyProtocol {
func reportContent(_ eventID: String, reason: String?) async -> Result<Void, RoomProxyError>
func members() async -> Result<[RoomMemberProxy], RoomProxyError>
func members() async -> Result<[RoomMemberProxyProtocol], RoomProxyError>
func retryDecryption(for sessionID: String) async