mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-08-03 14:25:38 +02:00
interaction: do not rewrite author for outgoing interaction
Change-Id: I92d50aa0342a6d89e003cedabf1227fec029baeb
This commit is contained in:
parent
482c334f3e
commit
8d81b90b7f
4 changed files with 7 additions and 6 deletions
|
@ -67,7 +67,7 @@ Loader {
|
|||
2 * hPadding - avatarBlockWidth
|
||||
- buttonsLoader.width - 24 - 6 - 24
|
||||
|
||||
isOutgoing: Author === ""
|
||||
isOutgoing: Author === CurrentAccount.uri
|
||||
showTime: root.showTime
|
||||
seq: root.seq
|
||||
author: Author
|
||||
|
|
|
@ -231,6 +231,7 @@ Control {
|
|||
} else {
|
||||
y = 0
|
||||
}
|
||||
|
||||
var distBorders = root.width - bubble.width - width
|
||||
if (isOutgoing) {
|
||||
if (distBorders > 0)
|
||||
|
@ -246,6 +247,7 @@ Control {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
MessageBubble {
|
||||
id: bubble
|
||||
|
||||
|
@ -359,7 +361,7 @@ Control {
|
|||
EmojiReactions {
|
||||
id: emojiReaction
|
||||
|
||||
property bool isOutgoing: Author === ""
|
||||
property bool isOutgoing: Author === CurrentAccount.uri
|
||||
Layout.alignment: isOutgoing ? Qt.AlignRight : Qt.AlignLeft
|
||||
Layout.rightMargin: isOutgoing ? status.width : undefined
|
||||
Layout.leftMargin: !isOutgoing ? avatarBlock.width : undefined
|
||||
|
@ -411,5 +413,6 @@ Control {
|
|||
id: reactionPopup
|
||||
|
||||
emojiReaction: Reactions
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ SBSMessageBase {
|
|||
JamiTheme.chatviewLinkColorLight :
|
||||
JamiTheme.chatviewLinkColorDark
|
||||
|
||||
isOutgoing: Author === ""
|
||||
isOutgoing: Author === CurrentAccount.uri
|
||||
author: Author
|
||||
readers: Readers
|
||||
timestamp: Timestamp
|
||||
|
|
|
@ -325,14 +325,12 @@ struct Info
|
|||
if (message.contains("react-to") && type == Type::TEXT) {
|
||||
type = to_type("REACTION");
|
||||
react_to = message["react-to"];
|
||||
authorUri = message["author"];
|
||||
}
|
||||
authorUri = message["author"];
|
||||
|
||||
if (type == Type::TEXT || type == Type::EDITED || type == Type::REACTION) {
|
||||
body = message["body"];
|
||||
}
|
||||
if (type != Type::REACTION)
|
||||
authorUri = accountURI == message["author"] ? "" : message["author"];
|
||||
timestamp = message["timestamp"].toInt();
|
||||
status = Status::SUCCESS;
|
||||
parentId = message["linearizedParent"];
|
||||
|
|
Loading…
Add table
Reference in a new issue