mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge branch 'pr646'
This commit is contained in:
commit
c26bec3982
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
#include "messageaction.h"
|
#include "messageaction.h"
|
||||||
#include "src/misc/smileypack.h"
|
#include "src/misc/smileypack.h"
|
||||||
|
#include "src/misc/settings.h"
|
||||||
|
|
||||||
MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
|
MessageAction::MessageAction(const QString &author, const QString &message, const QString &date, const bool &me) :
|
||||||
ChatAction(me, author, date),
|
ChatAction(me, author, date),
|
||||||
|
@ -25,7 +26,11 @@ MessageAction::MessageAction(const QString &author, const QString &message, cons
|
||||||
|
|
||||||
QString MessageAction::getMessage(QString div)
|
QString MessageAction::getMessage(QString div)
|
||||||
{
|
{
|
||||||
QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
|
QString message_;
|
||||||
|
if(Settings::getInstance().getUseEmoticons())
|
||||||
|
message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
|
||||||
|
else
|
||||||
|
message_ = toHtmlChars(message);
|
||||||
|
|
||||||
// detect urls
|
// detect urls
|
||||||
QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
|
QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
|
||||||
|
|
Loading…
Reference in New Issue
Block a user