swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-11 13:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load member profiles through the timeline (#522)

Browse Source
This commit is contained in:
Stefan Ceriu 2023-02-03 12:12:36 +02:00 committed by GitHub
parent 3f900df3de
commit 183cc88114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX.xcodeproj/project.pbxproj
View File

@ -4012,7 +4012,7 @@
repositoryURL = "https://github.com/matrix-org/matrix-rust-components-swift";
requirement = {
kind = exactVersion;
version = "1.0.36-alpha";
version = "1.0.37-alpha";
};
};
96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */ = {

4
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -86,8 +86,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift",
"state" : {
"revision" : "f001ac9e4b72647a2b5a9f3f210d72384915164f",
"version" : "1.0.36-alpha"
"revision" : "79ead18b0db04f898d5ba9ce1a0b609a518f44ec",
"version" : "1.0.37-alpha"
}
},
{

8
ElementX/Sources/Services/Room/MockRoomProxy.swift
View File

@ -40,18 +40,10 @@ struct MockRoomProxy: RoomProxyProtocol {
.failure(.failedRetrievingMemberDisplayName)
}
func avatarURLForUserId(_ userId: String) -> URL? {
nil
}
func loadAvatarURLForUserId(_ userId: String) async -> Result<URL?, RoomProxyError> {
.failure(.failedRetrievingMemberAvatarURL)
}
func displayNameForUserId(_ userId: String) -> String? {
nil
}
func startLiveEventListener() { }
func addTimelineListener(listener: TimelineListener) -> Result<Void, RoomProxyError> {

46
ElementX/Sources/Services/Room/RoomProxy.swift
View File

@ -31,9 +31,6 @@ class RoomProxy: RoomProxyProtocol {
private var sendMessageBackgroundTask: BackgroundTaskProtocol?
private var memberAvatars = [String: URL]()
private var memberDisplayNames = [String: String]()
private(set) var displayName: String?
private var timelineObservationToken: StoppableSpawn?
@ -109,10 +106,6 @@ class RoomProxy: RoomProxyProtocol {
return Asset.Images.encryptionTrusted.image
}
func avatarURLForUserId(_ userId: String) -> URL? {
memberAvatars[userId]
}
func loadAvatarURLForUserId(_ userId: String) async -> Result<URL?, RoomProxyError> {
do {
guard let urlString = try await Task.dispatch(on: lowPriorityDispatchQueue, {
@ -126,23 +119,17 @@ class RoomProxy: RoomProxyProtocol {
return .failure(.failedRetrievingMemberAvatarURL)
}
update(url: avatarURL, forUserId: userId)
return .success(avatarURL)
} catch {
return .failure(.failedRetrievingMemberAvatarURL)
}
}
func displayNameForUserId(_ userId: String) -> String? {
memberDisplayNames[userId]
}
func loadDisplayNameForUserId(_ userId: String) async -> Result<String?, RoomProxyError> {
do {
let displayName = try await Task.dispatch(on: lowPriorityDispatchQueue) {
try self.room.memberDisplayName(userId: userId)
}
update(displayName: displayName, forUserId: userId)
return .success(displayName)
} catch {
return .failure(.failedRetrievingMemberDisplayName)
@ -152,6 +139,9 @@ class RoomProxy: RoomProxyProtocol {
func addTimelineListener(listener: TimelineListener) -> Result<Void, RoomProxyError> {
if let token = slidingSyncRoom.subscribeAndAddTimelineListener(listener: listener, settings: nil) {
timelineObservationToken = token
Task {
await fetchMembers()
}
return .success(())
} else {
return .failure(.failedAddingTimelineListener)
@ -195,17 +185,17 @@ class RoomProxy: RoomProxyProtocol {
let transactionId = genTransactionId()
return await Task.dispatch(on: userInitiatedDispatchQueue) {
do {
if let eventID {
if let eventID {
do {
try self.room.sendReply(msg: message, inReplyToEventId: eventID, txnId: transactionId)
} else {
let messageContent = messageEventContentFromMarkdown(md: message)
try self.room.send(msg: messageContent, txnId: transactionId)
} catch {
return .failure(.failedSendingMessage)
}
return .success(())
} catch {
return .failure(.failedSendingMessage)
} else {
let messageContent = messageEventContentFromMarkdown(md: message)
self.room.send(msg: messageContent, txnId: transactionId)
}
return .success(())
}
}
@ -280,14 +270,14 @@ class RoomProxy: RoomProxyProtocol {
// MARK: - Private
private func update(url: URL?, forUserId userId: String) {
memberAvatars[userId] = url
/// Force the timeline to load member details so it can populate sender profiles whenever we add a timeline listener
/// This should become automatic on the RustSDK side at some point
private func fetchMembers() async {
await Task.dispatch(on: .global()) {
self.room.fetchMembers()
}
}
private func update(displayName: String?, forUserId userId: String) {
memberDisplayNames[userId] = displayName
}
private func update(displayName: String) {
self.displayName = displayName
}

4
ElementX/Sources/Services/Room/RoomProxyProtocol.swift
View File

@ -51,12 +51,8 @@ protocol RoomProxyProtocol {
var avatarURL: URL? { get }
func avatarURLForUserId(_ userId: String) -> URL?
func loadAvatarURLForUserId(_ userId: String) async -> Result<URL?, RoomProxyError>
func displayNameForUserId(_ userId: String) -> String?
func loadDisplayNameForUserId(_ userId: String) async -> Result<String?, RoomProxyError>
func addTimelineListener(listener: TimelineListener) -> Result<Void, RoomProxyError>

32
ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
View File

@ -97,15 +97,7 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
}
}
func processItemAppearance(_ itemID: String) async {
guard let timelineItem = timelineItems.first(where: { $0.id == itemID }) else {
return
}
if let item = timelineItem as? EventBasedTimelineItemProtocol {
await loadUserDisplayNameForTimelineItem(item)
}
}
func processItemAppearance(_ itemID: String) async { }
func processItemDisappearance(_ itemID: String) { }
@ -435,26 +427,4 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
break
}
}
#warning("This is here because sender profiles aren't working properly. Remove it entirely later")
private func loadUserDisplayNameForTimelineItem(_ timelineItem: EventBasedTimelineItemProtocol) async {
if timelineItem.shouldShowSenderDetails == false || timelineItem.sender.displayName != nil {
return
}
switch await roomProxy.loadDisplayNameForUserId(timelineItem.sender.id) {
case .success(let displayName):
guard let displayName,
let index = timelineItems.firstIndex(where: { $0.id == timelineItem.id }),
var item = timelineItems[index] as? EventBasedTimelineItemProtocol else {
return
}
item.sender.displayName = displayName
timelineItems[index] = item
callbacks.send(.updatedTimelineItem(timelineItem.id))
case .failure:
break
}
}
}

14
ElementX/Sources/Services/Timeline/TimelineItemProxy.swift
View File

@ -106,9 +106,17 @@ struct EventTimelineItemProxy: CustomDebugStringConvertible {
var sender: TimelineItemSender {
let profile = item.senderProfile()
return .init(id: item.sender(),
displayName: profile.displayName,
avatarURL: profile.avatarUrl.flatMap(URL.init(string:)))
switch profile {
case let .ready(displayName, _, avatarUrl):
return .init(id: item.sender(),
displayName: displayName,
avatarURL: avatarUrl.flatMap(URL.init(string:)))
default:
return .init(id: item.sender(),
displayName: nil,
avatarURL: nil)
}
}
var reactions: [Reaction] {

2
project.yml
View File

@ -40,7 +40,7 @@ include:
packages:
MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.0.36-alpha
exactVersion: 1.0.37-alpha
# path: ../matrix-rust-sdk
DesignKit:
path: DesignKit