lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

interaction: do not rewrite author for outgoing interaction

Browse source 
Change-Id: I92d50aa0342a6d89e003cedabf1227fec029baeb
This commit is contained in:
Sébastien Blin 2022-12-07 13:54:48 -05:00
parent 482c334f3e
commit 8d81b90b7f
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/commoncomponents/DataTransferMessageDelegate.qml
View file

@ -67,7 +67,7 @@ Loader {
2 * hPadding - avatarBlockWidth 2 * hPadding - avatarBlockWidth
- buttonsLoader.width - 24 - 6 - 24 - buttonsLoader.width - 24 - 6 - 24
isOutgoing: Author === "" isOutgoing: Author === CurrentAccount.uri
showTime: root.showTime showTime: root.showTime
seq: root.seq seq: root.seq
author: Author author: Author

5
src/app/commoncomponents/SBSMessageBase.qml
View file

@ -231,6 +231,7 @@ Control {
} else { } else {
y = 0 y = 0
} }
var distBorders = root.width - bubble.width - width var distBorders = root.width - bubble.width - width
if (isOutgoing) { if (isOutgoing) {
if (distBorders > 0) if (distBorders > 0)
@ -246,6 +247,7 @@ Control {
} }
} }
MessageBubble { MessageBubble {
id: bubble id: bubble
@ -359,7 +361,7 @@ Control {
EmojiReactions { EmojiReactions {
id: emojiReaction id: emojiReaction
property bool isOutgoing: Author === "" property bool isOutgoing: Author === CurrentAccount.uri
Layout.alignment: isOutgoing ? Qt.AlignRight : Qt.AlignLeft Layout.alignment: isOutgoing ? Qt.AlignRight : Qt.AlignLeft
Layout.rightMargin: isOutgoing ? status.width : undefined Layout.rightMargin: isOutgoing ? status.width : undefined
Layout.leftMargin: !isOutgoing ? avatarBlock.width : undefined Layout.leftMargin: !isOutgoing ? avatarBlock.width : undefined
@ -411,5 +413,6 @@ Control {
id: reactionPopup id: reactionPopup
emojiReaction: Reactions emojiReaction: Reactions
} }
} }

2
src/app/commoncomponents/TextMessageDelegate.qml
View file

@ -37,7 +37,7 @@ SBSMessageBase {
JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorLight :
JamiTheme.chatviewLinkColorDark JamiTheme.chatviewLinkColorDark
isOutgoing: Author === "" isOutgoing: Author === CurrentAccount.uri
author: Author author: Author
readers: Readers readers: Readers
timestamp: Timestamp timestamp: Timestamp

4
src/libclient/api/interaction.h
View file

@ -325,14 +325,12 @@ struct Info
if (message.contains("react-to") && type == Type::TEXT) { if (message.contains("react-to") && type == Type::TEXT) {
type = to_type("REACTION"); type = to_type("REACTION");
react_to = message["react-to"]; react_to = message["react-to"];
authorUri = message["author"];
} }
authorUri = message["author"];
if (type == Type::TEXT || type == Type::EDITED || type == Type::REACTION) { if (type == Type::TEXT || type == Type::EDITED || type == Type::REACTION) {
body = message["body"]; body = message["body"];
} }
if (type != Type::REACTION)
authorUri = accountURI == message["author"] ? "" : message["author"];
timestamp = message["timestamp"].toInt(); timestamp = message["timestamp"].toInt();
status = Status::SUCCESS; status = Status::SUCCESS;
parentId = message["linearizedParent"]; parentId = message["linearizedParent"];