Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 07:59:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Escape name before inserting in name changed message and in anchor info

Browse Source
This commit is contained in:
AsamK 2015-08-31 16:38:28 +02:00
parent bd6bb8996b
commit cfde9d303c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -671,7 +671,7 @@ void ChatLobbyDialog::displayLobbyEvent(int event_type, const RsGxsId& gxs_id, c
ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(), ui.chatWidget->addChatMsg(true, tr("Lobby management"), QDateTime::currentDateTime(),
QDateTime::currentDateTime(), QDateTime::currentDateTime(),
tr("%1 changed his name to: %2").arg(name).arg(newname), tr("%1 changed his name to: %2").arg(RsHtml::plainText(name)).arg(RsHtml::plainText(newname)),
ChatWidget::MSGTYPE_SYSTEM); ChatWidget::MSGTYPE_SYSTEM);
// TODO if a user was muted and changed his name, update mute list, but only, when the muted peer, dont change his name to a other peer in your chat lobby // TODO if a user was muted and changed his name, update mute list, but only, when the muted peer, dont change his name to a other peer in your chat lobby

3
retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
View File

@ -28,6 +28,7 @@
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
#include "util/DateTime.h" #include "util/DateTime.h"
#include <retroshare/rsidentity.h> #include <retroshare/rsidentity.h>
#include <util/HandleRichText.h>
ChatLobbyUserNotify::ChatLobbyUserNotify(QObject *parent) : ChatLobbyUserNotify::ChatLobbyUserNotify(QObject *parent) :
UserNotify(parent) UserNotify(parent)
@ -258,7 +259,7 @@ void ChatLobbyUserNotify::chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime ti
if ((bGetNickName || bFoundTextToNotify || _bCountUnRead)){ if ((bGetNickName || bFoundTextToNotify || _bCountUnRead)){
QString strAnchor = time.toString(Qt::ISODate); QString strAnchor = time.toString(Qt::ISODate);
MsgData msgData; MsgData msgData;
msgData.text=senderName + ": " + msg; msgData.text=RsHtml::plainText(senderName) + ": " + msg;
msgData.unread=!(bGetNickName || bFoundTextToNotify); msgData.unread=!(bGetNickName || bFoundTextToNotify);
_listMsg[lobby_id][strAnchor]=msgData; _listMsg[lobby_id][strAnchor]=msgData;