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

Fix a bug where your own emotes showed as '* You emoted'. (#4038)

Browse Source
This commit is contained in:
Doug
2025-04-17 12:39:41 +01:00
committed by GitHub
parent 4079549803
commit 7cf1d08b20
4 changed files with 85 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Room/RoomSummary/RoomEventStringBuilder.swift
+11 -13
View File
@@ -17,9 +17,7 @@ struct RoomEventStringBuilder {
func buildAttributedString(for eventItemProxy: EventTimelineItemProxy) -> AttributedString? {
let sender = eventItemProxy.sender
let isOutgoing = eventItemProxy.isOwn
let displayName = if isOutgoing {
L10n.commonYou
} else if shouldDisambiguateDisplayNames {
let displayName = if shouldDisambiguateDisplayNames {
sender.disambiguatedDisplayName ?? sender.id
} else {
sender.displayName ?? sender.id
@@ -29,14 +27,14 @@ struct RoomEventStringBuilder {
case .msgLike(let messageLikeContent):
switch messageLikeContent.kind {
case .message(let messageContent):
return messageEventStringBuilder.buildAttributedString(for: messageContent.msgType, senderDisplayName: displayName)
return messageEventStringBuilder.buildAttributedString(for: messageContent.msgType, senderDisplayName: displayName, isOutgoing: isOutgoing)
case .sticker:
if messageEventStringBuilder.destination == .pinnedEvent {
var string = AttributedString(L10n.commonSticker)
string.bold()
return string
}
return prefix(L10n.commonSticker, with: displayName)
return prefix(L10n.commonSticker, with: displayName, isOutgoing: isOutgoing)
case .poll(let question, _, _, _, _, _, _):
if messageEventStringBuilder.destination == .pinnedEvent {
let questionPlaceholder = "{question}"
@@ -46,9 +44,9 @@ struct RoomEventStringBuilder {
finalString.replace(questionPlaceholder, with: normalString)
return finalString
}
return prefix(L10n.commonPollSummary(question), with: displayName)
return prefix(L10n.commonPollSummary(question), with: displayName, isOutgoing: isOutgoing)
case .redacted:
return prefix(L10n.commonMessageRemoved, with: displayName)
return prefix(L10n.commonMessageRemoved, with: displayName, isOutgoing: isOutgoing)
case .unableToDecrypt(let encryptedMessage):
let errorMessage = switch encryptedMessage {
case .megolmV1AesSha2(_, .sentBeforeWeJoined): L10n.commonUnableToDecryptNoAccess
@@ -56,10 +54,10 @@ struct RoomEventStringBuilder {
case .megolmV1AesSha2(_, .unknownDevice), .megolmV1AesSha2(_, .unsignedDevice): L10n.commonUnableToDecryptInsecureDevice
default: L10n.commonWaitingForDecryptionKey
}
return prefix(errorMessage, with: displayName)
return prefix(errorMessage, with: displayName, isOutgoing: isOutgoing)
}
case .failedToParseMessageLike, .failedToParseState:
return prefix(L10n.commonUnsupportedEvent, with: displayName)
return prefix(L10n.commonUnsupportedEvent, with: displayName, isOutgoing: isOutgoing)
case .state(_, let state):
return stateEventStringBuilder
.buildString(for: state, sender: sender, isOutgoing: isOutgoing)
@@ -78,19 +76,19 @@ struct RoomEventStringBuilder {
memberIsYou: isOutgoing)
.map(AttributedString.init)
case .callInvite:
return prefix(L10n.commonUnsupportedCall, with: displayName)
return prefix(L10n.commonUnsupportedCall, with: displayName, isOutgoing: isOutgoing)
case .callNotify:
return prefix(L10n.commonCallStarted, with: displayName)
return prefix(L10n.commonCallStarted, with: displayName, isOutgoing: isOutgoing)
}
}
private func prefix(_ eventSummary: String, with senderDisplayName: String) -> AttributedString {
private func prefix(_ eventSummary: String, with senderDisplayName: String, isOutgoing: Bool) -> AttributedString {
guard shouldPrefixSenderName else {
return AttributedString(eventSummary)
}
let attributedEventSummary = AttributedString(eventSummary.trimmingCharacters(in: .whitespacesAndNewlines))
var attributedSenderDisplayName = AttributedString(senderDisplayName)
var attributedSenderDisplayName = AttributedString(isOutgoing ? L10n.commonYou : senderDisplayName)
attributedSenderDisplayName.bold()
// Don't include the message body in the markdown otherwise it makes tappable links.
ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
+2 -2
View File
@@ -24,7 +24,7 @@ struct RoomMessageEventStringBuilder {
let attributedStringBuilder: AttributedStringBuilderProtocol
let destination: Destination
func buildAttributedString(for messageType: MessageType, senderDisplayName: String) -> AttributedString {
func buildAttributedString(for messageType: MessageType, senderDisplayName: String, isOutgoing: Bool) -> AttributedString {
let message: AttributedString
switch messageType {
case .emote(content: let content):
@@ -69,7 +69,7 @@ struct RoomMessageEventStringBuilder {
}
if destination == .roomList {
return prefix(message, with: senderDisplayName)
return prefix(message, with: isOutgoing ? L10n.commonYou : senderDisplayName)
} else {
return message
}