status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/chat): handle same name mentions 

Fixes #7220
This commit is contained in:
PavelS 2022-09-20 18:26:54 +03:00 committed by PavelS
parent cee8af5869
commit 6a96bc93b3
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/AppLayouts/Chat/views/ChatContentView.qml
View File

@ -235,10 +235,10 @@ ColumnLayout {
}
if(root.rootStore.sendMessage(event,
chatInput.textInput.text,
chatInput.isReply? chatInput.replyMessageId : "",
chatInput.fileUrls
))
chatInput.getTextWithPublicKeys(),
chatInput.isReply? chatInput.replyMessageId : "",
chatInput.fileUrls
))
{
Global.sendMessageSound.stop();
Qt.callLater(Global.sendMessageSound.play);

43
ui/imports/shared/status/StatusChatInput.qml
View File

@ -222,7 +222,7 @@ Rectangle {
property var mentionsPos: []
function insertMention(aliasName, lastAtPosition, lastCursorPosition) {
function insertMention(aliasName, publicKey, lastAtPosition, lastCursorPosition) {
let startInd = aliasName.indexOf("(");
if (startInd > 0){
aliasName = aliasName.substring(0, startInd-1)
@ -239,7 +239,7 @@ Rectangle {
// It reset to 0 for some reason, go back to the end
messageInputField.cursorPosition = messageInputField.length
}
mentionsPos.push({name: aliasName, leftIndex: lastAtPosition, rightIndex: (lastAtPosition+aliasName.length + 1)});
mentionsPos.push({name: aliasName, pubKey: publicKey, leftIndex: lastAtPosition, rightIndex: (lastAtPosition+aliasName.length + 1)});
}
function isUploadFilePressed(event) {
@ -371,9 +371,10 @@ Rectangle {
let aliasName = suggestionsBox.formattedPlainTextFilter;
let lastCursorPosition = suggestionsBox.suggestionFilter.cursorPosition;
let lastAtPosition = suggestionsBox.suggestionFilter.lastAtPosition;
if (aliasName.toLowerCase() === suggestionsBox.suggestionsModel.get(suggestionsBox.listView.currentIndex).name.toLowerCase()
let suggestionItem = suggestionsBox.suggestionsModel.get(suggestionsBox.listView.currentIndex);
if (aliasName.toLowerCase() === suggestionItem.name.toLowerCase()
&& (event.key !== Qt.Key_Backspace) && (event.key !== Qt.Key_Delete)) {
insertMention(aliasName, lastAtPosition, lastCursorPosition);
insertMention(aliasName, suggestionItem.publicKey, lastAtPosition, lastCursorPosition);
} else if (event.key === Qt.Key_Space) {
var plainTextToReplace = messageInputField.getText(lastAtPosition, lastCursorPosition);
messageInputField.remove(lastAtPosition, lastCursorPosition);
@ -480,6 +481,36 @@ Rectangle {
return found[1]
}
function getTextWithPublicKeys() {
let result = messageInputField.getText(0, messageInputField.length)
if (mentionsPos.length > 0) {
let lastIndex = messageInputField.length
while (lastIndex > 0) {
let currentMax = -1
let maxIndex = -1
for (var i = 0; i < mentionsPos.length; i++) {
if (mentionsPos[i].rightIndex < lastIndex && mentionsPos[i].rightIndex > currentMax) {
currentMax = mentionsPos[i].rightIndex
maxIndex = i
}
}
lastIndex = 0
if (currentMax >= 0) {
result = result.substring(0, mentionsPos[maxIndex].leftIndex + 1)
+ mentionsPos[maxIndex].pubKey
+ result.substring(mentionsPos[maxIndex].rightIndex, result.length)
lastIndex = mentionsPos[maxIndex].leftIndex
}
}
}
return result
}
function setFormatInInput(formationFunction, startTag, endTag, formationChar, numFormationChars) {
const inputText = getFormattedText()
const plainInputText = messageInputField.getText(0, messageInputField.length)
@ -861,7 +892,7 @@ Rectangle {
onItemSelected: function (item, lastAtPosition, lastCursorPosition) {
messageInputField.forceActiveFocus();
let name = item.name.replace("@", "")
insertMention(name, lastAtPosition, lastCursorPosition)
insertMention(name, item.publicKey, lastAtPosition, lastCursorPosition)
suggestionsBox.suggestionsModel.clear()
}
onVisibleChanged: {
@ -1153,7 +1184,7 @@ Rectangle {
}
})
}
if (text === "") {
if (length === 0) {
mentionsPos = [];
}
} else {