Revert "Embed cmark."

This reverts commit f35001112dc740ed827e4a4de6e4bb3d94b0e466

src/controller.cpp

@@ -33,7 +33,7 @@
 #include <QtNetwork/QAuthenticator>
 #include <QtNetwork/QNetworkReply>
 
-#include <keychain.h>
+#include <qt5keychain/keychain.h>
 
 Controller::Controller(QObject* parent) : QObject(parent) {
   QApplication::setQuitOnLastWindowClosed(false);

src/main.cpp

@@ -22,8 +22,6 @@
 #include "csapi/joining.h"
 #include "csapi/leaving.h"
 
-#include "qqmlsortfilterproxymodel.h"
-
 using namespace QMatrixClient;
 
 int main(int argc, char* argv[]) {
@@ -38,8 +36,6 @@ int main(int argc, char* argv[]) {
   app.setApplicationName("Spectral");
   app.setWindowIcon(QIcon(":/assets/img/icon.png"));
 
-  qmlRegisterType<qqsfpm::QQmlSortFilterProxyModel>("SortFilterProxyModel", 0,
-                                                    2, "SortFilterProxyModel");
   qmlRegisterType<Controller>("Spectral", 0, 1, "Controller");
   qmlRegisterType<AccountListModel>("Spectral", 0, 1, "AccountListModel");
   qmlRegisterType<RoomListModel>("Spectral", 0, 1, "RoomListModel");

src/spectralroom.cpp

@@ -21,7 +21,7 @@
 #include <QMimeDatabase>
 #include <QTextDocument>
 
-#include "html.h"
+#include <cmark.h>
 
 #include "utils.h"
 
@@ -299,24 +299,18 @@ void SpectralRoom::removeLocalAlias(const QString& alias) {
 }
 
 QString SpectralRoom::markdownToHTML(const QString& markdown) {
-  unsigned char* sequence =
-      (unsigned char*)qstrdup(markdown.toUtf8().constData());
-  qint64 length = strlen((char*)sequence);
+  const auto str = markdown.toUtf8();
+  const char* tmp_buf =
+      cmark_markdown_to_html(str.constData(), str.size(), CMARK_OPT_DEFAULT);
 
-  hoedown_renderer* renderer =
-      hoedown_html_renderer_new(HOEDOWN_HTML_USE_XHTML, 32);
-  hoedown_extensions extensions = (hoedown_extensions)(
-      (HOEDOWN_EXT_BLOCK | HOEDOWN_EXT_SPAN | HOEDOWN_EXT_MATH_EXPLICIT) &
-      ~HOEDOWN_EXT_QUOTE);
-  hoedown_document* document = hoedown_document_new(renderer, extensions, 32);
-  hoedown_buffer* html = hoedown_buffer_new(length);
-  hoedown_document_render(document, html, sequence, length);
-  QString result = QString::fromUtf8((char*)html->data, html->size);
+  std::string html(tmp_buf);
 
-  free(sequence);
-  hoedown_buffer_free(html);
-  hoedown_document_free(document);
-  hoedown_html_renderer_free(renderer);
+  free((char *)tmp_buf);
+
+  auto result = QString::fromStdString(html).trimmed();
+
+  result.replace("<p>", "");
+  result.replace("</p>", "");
 
   return result;
 }
@@ -368,22 +362,22 @@ void SpectralRoom::postPlainMessage(const QString& text,
   if (isReply) {
     const auto& replyEvt = **replyIt;
 
-    QJsonObject json{{"msgtype", msgTypeToString(type)},
-                     {"body", "> <" + replyEvt.senderId() + "> " +
-                                  eventToString(replyEvt) + "\n\n" + text},
-                     {"format", "org.matrix.custom.html"},
-                     {"m.relates_to",
-                      QJsonObject{{"m.in_reply_to",
-                                   QJsonObject{{"event_id", replyEventId}}}}},
-                     {"formatted_body",
-                      "<mx-reply><blockquote><a href=\"https://matrix.to/#/" +
-                          id() + "/" + replyEventId +
-                          "\">In reply to</a> <a href=\"https://matrix.to/#/" +
-                          replyEvt.senderId() + "\">" + replyEvt.senderId() +
-                          "</a><br>" + utils::removeReply(eventToString(replyEvt, Qt::RichText)) +
-                          "</blockquote></mx-reply>" + text.toHtmlEscaped()}};
-    postJson("m.room.message",
-             json);
+    QJsonObject json{
+        {"msgtype", msgTypeToString(type)},
+        {"body", "> <" + replyEvt.senderId() + "> " + eventToString(replyEvt) +
+                     "\n\n" + text},
+        {"format", "org.matrix.custom.html"},
+        {"m.relates_to",
+         QJsonObject{
+             {"m.in_reply_to", QJsonObject{{"event_id", replyEventId}}}}},
+        {"formatted_body",
+         "<mx-reply><blockquote><a href=\"https://matrix.to/#/" + id() + "/" +
+             replyEventId +
+             "\">In reply to</a> <a href=\"https://matrix.to/#/" +
+             replyEvt.senderId() + "\">" + replyEvt.senderId() + "</a><br>" +
+             utils::removeReply(eventToString(replyEvt, Qt::RichText)) +
+             "</blockquote></mx-reply>" + text.toHtmlEscaped()}};
+    postJson("m.room.message", json);
 
     return;
   }
@@ -403,22 +397,22 @@ void SpectralRoom::postHtmlMessage(const QString& text,
   if (isReply) {
     const auto& replyEvt = **replyIt;
 
-    QJsonObject json{{"msgtype", msgTypeToString(type)},
-                     {"body", "> <" + replyEvt.senderId() + "> " +
-                                  eventToString(replyEvt) + "\n\n" + text},
-                     {"format", "org.matrix.custom.html"},
-                     {"m.relates_to",
-                      QJsonObject{{"m.in_reply_to",
-                                   QJsonObject{{"event_id", replyEventId}}}}},
-                     {"formatted_body",
-                      "<mx-reply><blockquote><a href=\"https://matrix.to/#/" +
-                          id() + "/" + replyEventId +
-                          "\">In reply to</a> <a href=\"https://matrix.to/#/" +
-                          replyEvt.senderId() + "\">" + replyEvt.senderId() +
-                          "</a><br>" + utils::removeReply(eventToString(replyEvt, Qt::RichText)) +
-                          "</blockquote></mx-reply>" + html}};
-    postJson("m.room.message",
-             json);
+    QJsonObject json{
+        {"msgtype", msgTypeToString(type)},
+        {"body", "> <" + replyEvt.senderId() + "> " + eventToString(replyEvt) +
+                     "\n\n" + text},
+        {"format", "org.matrix.custom.html"},
+        {"m.relates_to",
+         QJsonObject{
+             {"m.in_reply_to", QJsonObject{{"event_id", replyEventId}}}}},
+        {"formatted_body",
+         "<mx-reply><blockquote><a href=\"https://matrix.to/#/" + id() + "/" +
+             replyEventId +
+             "\">In reply to</a> <a href=\"https://matrix.to/#/" +
+             replyEvt.senderId() + "\">" + replyEvt.senderId() + "</a><br>" +
+             utils::removeReply(eventToString(replyEvt, Qt::RichText)) +
+             "</blockquote></mx-reply>" + html}};
+    postJson("m.room.message", json);
 
     return;
   }

src/trayicon.cpp

@@ -147,6 +147,8 @@ void TrayIcon::setIsOnline(bool online) {
 
     QtMac::setBadgeLabelText(labelText);
   }
+#elif defined(Q_OS_WIN)
+// FIXME: Find a way to use Windows apis for the badge counter (if any).
 #else
   if (!icon_ || online == icon_->isOnline)
     return;

src/trayicon.h

@@ -68,7 +68,7 @@ class TrayIcon : public QSystemTrayIcon {
   QAction* viewAction_;
   QAction* quitAction_;
 
-  MsgCountComposedIcon* icon_;
+  MsgCountComposedIcon* icon_ = nullptr;
 };
 
 #endif  // TRAYICON_H