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

Merge branch 'pr1637'

Browse Source
This commit is contained in:
tux3 2015-05-13 04:25:34 +02:00
commit bdefe54efa
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/form/chatform.cpp
View File

@ -815,7 +815,7 @@ void ChatForm::loadHistory(QDateTime since, bool processUndelivered)
// Show each messages
ToxID authorId = ToxID::fromString(it.sender);
QString authorStr = authorId.isMine() ? Core::getInstance()->getUsername() : resolveToxID(authorId);
bool isAction = it.message.startsWith("/me ");
bool isAction = it.message.startsWith("/me ", Qt::CaseInsensitive);
ChatMessage::Ptr msg = ChatMessage::createChatMessage(authorStr,
isAction ? it.message.right(it.message.length() - 4) : it.message,
@ -999,7 +999,7 @@ void ChatForm::SendMessageStr(QString msg)
if (msg.isEmpty())
return;
bool isAction = msg.startsWith("/me ");
bool isAction = msg.startsWith("/me ", Qt::CaseInsensitive);
if (isAction)
msg = msg = msg.right(msg.length() - 4);

4
src/widget/form/groupchatform.cpp
View File

@ -101,7 +101,7 @@ void GroupChatForm::onSendTriggered()
if (group->getPeersCount() != 1)
{
if (msg.startsWith("/me "))
if (msg.startsWith("/me ", Qt::CaseInsensitive))
{
msg = msg.right(msg.length() - 4);
emit sendAction(group->getGroupId(), msg);
@ -113,7 +113,7 @@ void GroupChatForm::onSendTriggered()
}
else
{
if (msg.startsWith("/me "))
if (msg.startsWith("/me ", Qt::CaseInsensitive))
addSelfMessage(msg.right(msg.length() - 4), true, QDateTime::currentDateTime(), true);
else
addSelfMessage(msg, false, QDateTime::currentDateTime(), true);