StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(core): Add action message with friend request text

Browse Source
This commit is contained in:
Diadlo 2017-05-06 14:35:50 +03:00
parent d77cb084d6
commit b25f5b5ed6
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/core.cpp
View File

@ -594,22 +594,22 @@ QString Core::getFriendRequestErrorMessage(const ToxId& friendId, const QString&
/** /**
* @brief Adds history message about friendship request attempt if history is enabled * @brief Adds history message about friendship request attempt if history is enabled
* @param friendId Id of a friend which request is destined to * @param friendPk Pk of a friend which request is destined to
* @param selfPk Self public key * @param selfPk Self public key
* @param message Friendship request message * @param message Friendship request message
*/ */
void tryAddFriendRequestToHistory(const ToxId& friendId, const ToxPk& selfPk, const QString& msg) void tryAddFriendRequestToHistory(const ToxPk& friendPk, const ToxPk& selfPk, const QString& msg)
{ {
Profile* profile = Nexus::getProfile(); Profile* profile = Nexus::getProfile();
if (!profile->isHistoryEnabled()) { if (!profile->isHistoryEnabled()) {
return; return;
} }
QString idStr = friendId.toString(); QString pkStr = friendPk.toString();
QString inviteStr = Core::tr("/me offers friendship, \"%1\"").arg(msg); QString inviteStr = Core::tr("/me offers friendship, \"%1\"").arg(msg);
QString pkStr = selfPk.toString(); QString selfStr = selfPk.toString();
QDateTime datetime = QDateTime::currentDateTime(); QDateTime datetime = QDateTime::currentDateTime();
profile->getHistory()->addNewMessage(idStr, inviteStr, pkStr, datetime, true, QString()); profile->getHistory()->addNewMessage(pkStr, inviteStr, selfStr, datetime, true, QString());
} }
void Core::requestFriendship(const ToxId& friendId, const QString& message) void Core::requestFriendship(const ToxId& friendId, const QString& message)
@ -632,7 +632,7 @@ void Core::requestFriendship(const ToxId& friendId, const QString& message)
Settings::getInstance().updateFriendAddress(friendId.toString()); Settings::getInstance().updateFriendAddress(friendId.toString());
// TODO: this really shouldn't be in Core // TODO: this really shouldn't be in Core
tryAddFriendRequestToHistory(friendId, getSelfPublicKey(), message); tryAddFriendRequestToHistory(friendPk, getSelfPublicKey(), message);
emit friendAdded(friendNumber, friendPk); emit friendAdded(friendNumber, friendPk);
emit friendshipChanged(friendNumber); emit friendshipChanged(friendNumber);