Skip to content
Snippets Groups Projects
Commit 3355e46e authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fix an issue where nickchange messages with self were broken

parent 63953e09
No related branches found
No related tags found
No related merge requests found
......@@ -131,18 +131,29 @@ class QuasselMessageRenderer(
),
message.messageId == markerLine
)
Message_Type.Nick -> FormattedMessage(
Message_Type.Nick -> {
val nickSelf = message.sender == message.content || self
FormattedMessage(
message.messageId,
timeFormatter.format(message.time.atZone(zoneId)),
if (nickSelf) {
SpanFormatter.format(
context.getString(R.string.message_format_nick_self),
formatPrefix(message.senderPrefixes, highlight),
formatNick(message.sender, nickSelf, highlight)
)
} else {
SpanFormatter.format(
context.getString(R.string.message_format_nick),
formatPrefix(message.senderPrefixes, highlight),
formatNick(message.sender, self, highlight),
formatNick(message.sender, nickSelf, highlight),
formatPrefix(message.senderPrefixes, highlight),
formatNick(message.content, self, highlight)
),
formatNick(message.content, nickSelf, highlight)
)
},
message.messageId == markerLine
)
}
Message_Type.Mode -> FormattedMessage(
message.messageId,
timeFormatter.format(message.time.atZone(zoneId)),
......
......@@ -19,6 +19,7 @@
<string name="message_format_action">* %1$s%2$s %3$s</string>
<string name="message_format_notice">[%1$s%2$s] %3$s</string>
<string name="message_format_nick">%1$s%2$s is now known as %3$s%4$s</string>
<string name="message_format_nick_self">You are now known as %1$s%2$s</string>
<string name="message_format_mode">%1$s by %2$s%3$s</string>
<string name="message_format_join">%1$s%2$s joined</string>
<string name="message_format_part_1">%1$s%2$s left</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment