make util strip util functions non-static and move definition to cpp file

pull/552/head
targetakhil 4 years ago
parent 2dfa40e017
commit 5a5aba662e
  1. 18
      src/Utils.cpp
  2. 20
      src/Utils.h

@ -52,6 +52,24 @@ createDescriptionInfo(const Event &event, const QString &localUser, const QStrin
ts}; ts};
} }
void
utils::stripReplyFromBody(QString &body)
{
QRegularExpression plainQuote("^>.*?$\n?", QRegularExpression::MultilineOption);
while (body.startsWith(">"))
body.remove(plainQuote);
if (body.startsWith("\n"))
body.remove(0, 1);
}
void
utils::stripReplyFromFormattedBody(QString &formatted_body)
{
formatted_body.remove(QRegularExpression("<mx-reply>.*</mx-reply>",
QRegularExpression::DotMatchesEverythingOption));
formatted_body.replace("@room", "@\u2060aroom");
}
RelatedInfo RelatedInfo
utils::stripReplyFallbacks(const TimelineEvent &event, std::string id, QString room_id_) utils::stripReplyFallbacks(const TimelineEvent &event, std::string id, QString room_id_)
{ {

@ -42,24 +42,12 @@ namespace utils {
using TimelineEvent = mtx::events::collections::TimelineEvents; using TimelineEvent = mtx::events::collections::TimelineEvents;
//! Helper function to remove reply fallback from body //! Helper function to remove reply fallback from body
static void void
stripReplyFromBody(QString &body) stripReplyFromBody(QString &body);
{
QRegularExpression plainQuote("^>.*?$\n?", QRegularExpression::MultilineOption);
while (body.startsWith(">"))
body.remove(plainQuote);
if (body.startsWith("\n"))
body.remove(0, 1);
}
//! Helper function to remove reply fallback from formatted body //! Helper function to remove reply fallback from formatted body
static void void
stripReplyFromFormattedBody(QString &formatted_body) stripReplyFromFormattedBody(QString &formatted_body);
{
formatted_body.remove(QRegularExpression("<mx-reply>.*</mx-reply>",
QRegularExpression::DotMatchesEverythingOption));
formatted_body.replace("@room", "@\u2060aroom");
}
RelatedInfo RelatedInfo
stripReplyFallbacks(const TimelineEvent &event, std::string id, QString room_id_); stripReplyFallbacks(const TimelineEvent &event, std::string id, QString room_id_);

Loading…
Cancel
Save