rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trim whitespace from text messages

This commit is contained in:
Konstantinos Sideris 2018-09-12 14:20:12 +03:00
parent a0a76e352b
commit dd73a4b278
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Utils.cpp
View File

@ -337,10 +337,12 @@ utils::linkifyMessage(const QString &body)
return textString;
}
std::string
utils::markdownToHtml(const std::string &text)
QString
utils::markdownToHtml(const QString &text)
{
const char *tmp_buf = cmark_markdown_to_html(text.c_str(), text.size(), CMARK_OPT_DEFAULT);
const auto str = text.toUtf8();
const char *tmp_buf =
cmark_markdown_to_html(str.constData(), str.size(), CMARK_OPT_DEFAULT);
// Copy the null terminated output buffer.
std::string html(tmp_buf);
@ -348,17 +350,11 @@ utils::markdownToHtml(const std::string &text)
// The buffer is no longer needed.
free((char *)tmp_buf);
return html;
return QString::fromStdString(html).trimmed();
}
std::string
utils::markdownToHtml(const QString &text)
utils::stripHtml(const QString &text)
{
return utils::markdownToHtml(text.toStdString());
}
std::string
utils::stripHtml(const std::string &text)
{
return QString::fromStdString(text).remove(QRegExp("<[^>]*>")).toStdString();
return text.trimmed().remove(QRegExp("<[^>]*>")).toStdString();
}

7
src/Utils.h
View File

@ -217,13 +217,10 @@ QString
linkifyMessage(const QString &body);
//! Convert the input markdown text to html.
std::string
QString
markdownToHtml(const QString &text);
std::string
markdownToHtml(const std::string &text);
//! Return the plain text version of an html document.
std::string
stripHtml(const std::string &text);
stripHtml(const QString &text);
}

2
src/timeline/TimelineItem.cpp
View File

@ -272,7 +272,7 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
"You: ", userid, body, utils::descriptiveTime(timestamp), timestamp};
}
body = QString::fromStdString(utils::markdownToHtml(body));
body = utils::markdownToHtml(body);
body = utils::linkifyMessage(body);
generateTimestamp(timestamp);

4
src/timeline/TimelineView.cpp
View File

@ -1237,7 +1237,7 @@ toRoomMessage<mtx::events::msg::Emote>(const PendingMessage &m)
mtx::events::msg::Emote emote;
emote.body = utils::stripHtml(html);
emote.formatted_body = html;
emote.formatted_body = html.toStdString();
return emote;
}
@ -1262,7 +1262,7 @@ toRoomMessage<mtx::events::msg::Text>(const PendingMessage &m)
mtx::events::msg::Text text;
text.body = utils::stripHtml(html);
text.formatted_body = html;
text.formatted_body = html.toStdString();
return text;
}