letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Remove the shouldDisambiguateDisplayNames parameter from the RoomEvent and RoomStateEvent string builders.

Browse Source
This commit is contained in:
Stefan Ceriu
2026-04-02 11:32:25 +03:00
committed by Stefan Ceriu
parent 33fe72041f
commit e375950ba1
5 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ElementX/Sources/Services/Client/ClientProxy.swift
View File

@@ -1340,9 +1340,8 @@ private struct ClientProxyServices {
mentionBuilder: PlainMentionBuilder()), mentionBuilder: PlainMentionBuilder()),
style: .senderPrefixed) style: .senderPrefixed)
eventStringBuilder = try RoomEventStringBuilder(stateEventStringBuilder: RoomStateEventStringBuilder(userID: client.userId(), shouldDisambiguateDisplayNames: false), eventStringBuilder = try RoomEventStringBuilder(stateEventStringBuilder: RoomStateEventStringBuilder(userID: client.userId()),
messageEventStringBuilder: roomMessageEventStringBuilder, messageEventStringBuilder: roomMessageEventStringBuilder,
shouldDisambiguateDisplayNames: false,
shouldPrefixSenderName: true) shouldPrefixSenderName: true)
roomSummaryProvider = RoomSummaryProvider(roomListService: roomListService, roomSummaryProvider = RoomSummaryProvider(roomListService: roomListService,

15
ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
View File

@@ -12,7 +12,6 @@ import MatrixRustSDK
struct RoomEventStringBuilder { struct RoomEventStringBuilder {
let stateEventStringBuilder: RoomStateEventStringBuilder let stateEventStringBuilder: RoomStateEventStringBuilder
let messageEventStringBuilder: RoomMessageEventStringBuilder let messageEventStringBuilder: RoomMessageEventStringBuilder
let shouldDisambiguateDisplayNames: Bool
let shouldPrefixSenderName: Bool let shouldPrefixSenderName: Bool
func buildAttributedString(for eventItemProxy: EventTimelineItemProxy) -> AttributedString? { func buildAttributedString(for eventItemProxy: EventTimelineItemProxy) -> AttributedString? {
@@ -22,11 +21,7 @@ struct RoomEventStringBuilder {
} }
func buildAttributedString(for content: TimelineItemContent, sender: TimelineItemSender, isOutgoing: Bool) -> AttributedString? { func buildAttributedString(for content: TimelineItemContent, sender: TimelineItemSender, isOutgoing: Bool) -> AttributedString? {
let displayName = if shouldDisambiguateDisplayNames { let displayName = sender.disambiguatedDisplayName ?? sender.id
sender.disambiguatedDisplayName ?? sender.id
} else {
sender.displayName ?? sender.id
}
switch content { switch content {
case .msgLike(let messageLikeContent): case .msgLike(let messageLikeContent):
@@ -105,20 +100,16 @@ struct RoomEventStringBuilder {
} }
static func pinnedEventStringBuilder(userID: String) -> Self { static func pinnedEventStringBuilder(userID: String) -> Self {
RoomEventStringBuilder(stateEventStringBuilder: .init(userID: userID, RoomEventStringBuilder(stateEventStringBuilder: .init(userID: userID),
shouldDisambiguateDisplayNames: true),
messageEventStringBuilder: .init(attributedStringBuilder: AttributedStringBuilder(cacheKey: "pinnedEvents", mentionBuilder: PlainMentionBuilder()), messageEventStringBuilder: .init(attributedStringBuilder: AttributedStringBuilder(cacheKey: "pinnedEvents", mentionBuilder: PlainMentionBuilder()),
style: .typeBolded), style: .typeBolded),
shouldDisambiguateDisplayNames: true,
shouldPrefixSenderName: false) shouldPrefixSenderName: false)
} }
static func threadListEventStringBuilder(userID: String) -> Self { static func threadListEventStringBuilder(userID: String) -> Self {
RoomEventStringBuilder(stateEventStringBuilder: .init(userID: userID, RoomEventStringBuilder(stateEventStringBuilder: .init(userID: userID),
shouldDisambiguateDisplayNames: true),
messageEventStringBuilder: .init(attributedStringBuilder: AttributedStringBuilder(cacheKey: "threadList", mentionBuilder: PlainMentionBuilder()), messageEventStringBuilder: .init(attributedStringBuilder: AttributedStringBuilder(cacheKey: "threadList", mentionBuilder: PlainMentionBuilder()),
style: .plain), style: .plain),
shouldDisambiguateDisplayNames: true,
shouldPrefixSenderName: false) shouldPrefixSenderName: false)
} }
} }

13
ElementX/Sources/Services/Timeline/TimelineItems/RoomStateEventStringBuilder.swift
View File

@@ -11,7 +11,6 @@ import UIKit
struct RoomStateEventStringBuilder { struct RoomStateEventStringBuilder {
let userID: String let userID: String
var shouldDisambiguateDisplayNames = true
func buildString(for change: MembershipChange?, func buildString(for change: MembershipChange?,
reason: String?, reason: String?,
@@ -27,11 +26,7 @@ struct RoomStateEventStringBuilder {
let senderIsYou = isOutgoing let senderIsYou = isOutgoing
let memberIsYou = memberUserID == userID let memberIsYou = memberUserID == userID
let member = memberDisplayName ?? memberUserID let member = memberDisplayName ?? memberUserID
let senderDisplayName = if shouldDisambiguateDisplayNames { let senderDisplayName = sender.disambiguatedDisplayName ?? sender.id
sender.disambiguatedDisplayName ?? sender.id
} else {
sender.displayName ?? sender.id
}
switch change { switch change {
case .joined: case .joined:
@@ -138,11 +133,7 @@ struct RoomStateEventStringBuilder {
} }
func buildString(for state: OtherState, sender: TimelineItemSender, isOutgoing: Bool) -> String? { func buildString(for state: OtherState, sender: TimelineItemSender, isOutgoing: Bool) -> String? {
let displayName = if shouldDisambiguateDisplayNames { let displayName = sender.disambiguatedDisplayName ?? sender.id
sender.disambiguatedDisplayName ?? sender.id
} else {
sender.displayName ?? sender.id
}
switch state { switch state {
case .roomAvatar(let url): case .roomAvatar(let url):

1
UnitTests/Sources/RoomEventStringBuilderTests.swift
View File

@@ -22,7 +22,6 @@ struct RoomEventStringBuilderTests {
stringBuilder = RoomEventStringBuilder(stateEventStringBuilder: stateEventStringBuilder, stringBuilder = RoomEventStringBuilder(stateEventStringBuilder: stateEventStringBuilder,
messageEventStringBuilder: RoomMessageEventStringBuilder(attributedStringBuilder: attributedStringBuilder, messageEventStringBuilder: RoomMessageEventStringBuilder(attributedStringBuilder: attributedStringBuilder,
style: .senderPrefixed), style: .senderPrefixed),
shouldDisambiguateDisplayNames: true,
shouldPrefixSenderName: true) shouldPrefixSenderName: true)
} }

1
UnitTests/Sources/RoomSummaryProviderTests.swift
View File

@@ -103,7 +103,6 @@ final class RoomSummaryProviderTests {
let eventStringBuilder = RoomEventStringBuilder(stateEventStringBuilder: stateEventStringBuilder, let eventStringBuilder = RoomEventStringBuilder(stateEventStringBuilder: stateEventStringBuilder,
messageEventStringBuilder: RoomMessageEventStringBuilder(attributedStringBuilder: attributedStringBuilder, messageEventStringBuilder: RoomMessageEventStringBuilder(attributedStringBuilder: attributedStringBuilder,
style: .senderPrefixed), style: .senderPrefixed),
shouldDisambiguateDisplayNames: true,
shouldPrefixSenderName: true) shouldPrefixSenderName: true)
roomSummaryProvider = RoomSummaryProvider(roomListService: RoomListServiceSDKMock(), roomSummaryProvider = RoomSummaryProvider(roomListService: RoomListServiceSDKMock(),