diff --git a/src/Cache.h b/src/Cache.h
index da4e2040..a8991eb5 100644
--- a/src/Cache.h
+++ b/src/Cache.h
@@ -22,7 +22,11 @@
#include <QImage>
#include <QString>
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
#include <lmdb++.h>
+#endif
#include <mtx/responses.hpp>
diff --git a/src/Cache_p.h b/src/Cache_p.h
index 47dd945a..32f2a67d 100644
--- a/src/Cache_p.h
+++ b/src/Cache_p.h
@@ -26,7 +26,11 @@
#include <QImage>
#include <QString>
+#if __has_include(<lmdbxx/lmdb++.h>)
+#include <lmdbxx/lmdb++.h>
+#else
#include <lmdb++.h>
+#endif
#include <nlohmann/json.hpp>
#include <mtx/responses.hpp>
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 30b28120..59245390 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -116,7 +116,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
contentLayout_->setMargin(0);
top_bar_ = new TopRoomBar(this);
- view_manager_ = new TimelineViewManager(this);
+ view_manager_ = new TimelineViewManager(userSettings_, this);
contentLayout_->addWidget(top_bar_);
contentLayout_->addWidget(view_manager_->getWidget());
@@ -208,12 +208,11 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
mtx::http::RequestErr err) {
if (err) {
emit showNotification(
- QString("Failed to invite user: %1").arg(user));
+ tr("Failed to invite user: %1").arg(user));
return;
}
- emit showNotification(
- QString("Invited user: %1").arg(user));
+ emit showNotification(tr("Invited user: %1").arg(user));
});
});
}
@@ -280,6 +279,89 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(text_input_, &TextInputWidget::sendJoinRoomRequest, this, &ChatPage::joinRoom);
+ // invites and bans via quick command
+ connect(text_input_,
+ &TextInputWidget::sendInviteRoomRequest,
+ this,
+ [this](QString userid, QString reason) {
+ http::client()->invite_user(
+ current_room_.toStdString(),
+ userid.toStdString(),
+ [this, userid, room = current_room_](const mtx::responses::Empty &,
+ mtx::http::RequestErr err) {
+ if (err) {
+ emit showNotification(tr("Failed to invite %1 to %2: %3")
+ .arg(userid)
+ .arg(room)
+ .arg(QString::fromStdString(
+ err->matrix_error.error)));
+ } else
+ emit showNotification(tr("Invited user: %1").arg(userid));
+ },
+ reason.trimmed().toStdString());
+ });
+ connect(text_input_,
+ &TextInputWidget::sendKickRoomRequest,
+ this,
+ [this](QString userid, QString reason) {
+ http::client()->kick_user(
+ current_room_.toStdString(),
+ userid.toStdString(),
+ [this, userid, room = current_room_](const mtx::responses::Empty &,
+ mtx::http::RequestErr err) {
+ if (err) {
+ emit showNotification(tr("Failed to kick %1 to %2: %3")
+ .arg(userid)
+ .arg(room)
+ .arg(QString::fromStdString(
+ err->matrix_error.error)));
+ } else
+ emit showNotification(tr("Kicked user: %1").arg(userid));
+ },
+ reason.trimmed().toStdString());
+ });
+ connect(text_input_,
+ &TextInputWidget::sendBanRoomRequest,
+ this,
+ [this](QString userid, QString reason) {
+ http::client()->ban_user(
+ current_room_.toStdString(),
+ userid.toStdString(),
+ [this, userid, room = current_room_](const mtx::responses::Empty &,
+ mtx::http::RequestErr err) {
+ if (err) {
+ emit showNotification(tr("Failed to ban %1 in %2: %3")
+ .arg(userid)
+ .arg(room)
+ .arg(QString::fromStdString(
+ err->matrix_error.error)));
+ } else
+ emit showNotification(tr("Banned user: %1").arg(userid));
+ },
+ reason.trimmed().toStdString());
+ });
+ connect(
+ text_input_,
+ &TextInputWidget::sendUnbanRoomRequest,
+ this,
+ [this](QString userid, QString reason) {
+ http::client()->unban_user(
+ current_room_.toStdString(),
+ userid.toStdString(),
+ [this, userid, room = current_room_](const mtx::responses::Empty &,
+ mtx::http::RequestErr err) {
+ if (err) {
+ emit showNotification(
+ tr("Failed to unban %1 in %2: %3")
+ .arg(userid)
+ .arg(room)
+ .arg(QString::fromStdString(err->matrix_error.error)));
+ } else
+ emit showNotification(tr("Unbanned user: %1").arg(userid));
+ },
+ reason.trimmed().toStdString());
+ });
+
connect(
text_input_,
&TextInputWidget::uploadMedia,
@@ -1001,19 +1083,18 @@ ChatPage::joinRoom(const QString &room)
room_id, [this, room_id](const nlohmann::json &, mtx::http::RequestErr err) {
if (err) {
emit showNotification(
- QString("Failed to join room: %1")
+ tr("Failed to join room: %1")
.arg(QString::fromStdString(err->matrix_error.error)));
return;
}
- emit showNotification("You joined the room");
+ emit tr("You joined the room");
// We remove any invites with the same room_id.
try {
cache::removeInvite(room_id);
} catch (const lmdb::error &e) {
- emit showNotification(
- QString("Failed to remove invite: %1").arg(e.what()));
+ emit showNotification(tr("Failed to remove invite: %1").arg(e.what()));
}
});
}
@@ -1036,8 +1117,8 @@ ChatPage::createRoom(const mtx::requests::CreateRoom &req)
return;
}
- emit showNotification(QString("Room %1 created")
- .arg(QString::fromStdString(res.room_id.to_string())));
+ emit showNotification(
+ tr("Room %1 created").arg(QString::fromStdString(res.room_id.to_string())));
});
}
diff --git a/src/TextInputWidget.cpp b/src/TextInputWidget.cpp
index 7f5da009..502456bf 100644
--- a/src/TextInputWidget.cpp
+++ b/src/TextInputWidget.cpp
@@ -605,6 +605,14 @@ TextInputWidget::command(QString command, QString args)
sendEmoteMessage(args, input_->related);
} else if (command == "join") {
sendJoinRoomRequest(args);
+ } else if (command == "invite") {
+ sendInviteRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
+ } else if (command == "kick") {
+ sendKickRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
+ } else if (command == "ban") {
+ sendBanRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
+ } else if (command == "unban") {
+ sendUnbanRoomRequest(args.section(' ', 0, 0), args.section(' ', 1, -1));
} else if (command == "shrug") {
sendTextMessage("¯\\_(ツ)_/¯", input_->related);
} else if (command == "fliptable") {
diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h
index 6641d97c..4bdb2509 100644
--- a/src/TextInputWidget.h
+++ b/src/TextInputWidget.h
@@ -183,6 +183,10 @@ signals:
const std::optional<RelatedInfo> &related);
void sendJoinRoomRequest(const QString &room);
+ void sendInviteRoomRequest(const QString &userid, const QString &reason);
+ void sendKickRoomRequest(const QString &userid, const QString &reason);
+ void sendBanRoomRequest(const QString &userid, const QString &reason);
+ void sendUnbanRoomRequest(const QString &userid, const QString &reason);
void startedTyping();
void stoppedTyping();
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 6809d605..b73f80a1 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -50,6 +50,7 @@ UserSettings::load()
hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool();
isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool();
isGroupViewEnabled_ = settings.value("user/group_view", true).toBool();
+ isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool();
isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool();
isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool();
theme_ = settings.value("user/theme", defaultTheme_).toString();
@@ -126,6 +127,7 @@ UserSettings::save()
settings.setValue("typing_notifications", isTypingNotificationsEnabled_);
settings.setValue("read_receipts", isReadReceiptsEnabled_);
settings.setValue("group_view", isGroupViewEnabled_);
+ settings.setValue("markdown_enabled", isMarkdownEnabled_);
settings.setValue("desktop_notifications", hasDesktopNotifications_);
settings.setValue("theme", theme());
settings.setValue("font_family", font_);
@@ -167,70 +169,46 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
topBarLayout_->addWidget(backBtn_, 1, Qt::AlignLeft | Qt::AlignVCenter);
topBarLayout_->addStretch(1);
- auto trayOptionLayout_ = new QHBoxLayout;
- trayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto trayLabel = new QLabel(tr("Minimize to tray"), this);
- trayLabel->setFont(font);
- trayToggle_ = new Toggle(this);
+ auto addSetting = [this, &font](QString labelText) {
+ auto layout = new QHBoxLayout;
+ layout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- trayOptionLayout_->addWidget(trayLabel);
- trayOptionLayout_->addWidget(trayToggle_, 0, Qt::AlignRight);
+ auto label = new QLabel(labelText, this);
+ label->setFont(font);
- auto startInTrayOptionLayout_ = new QHBoxLayout;
- startInTrayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto startInTrayLabel = new QLabel(tr("Start in tray"), this);
- startInTrayLabel->setFont(font);
- startInTrayToggle_ = new Toggle(this);
- if (!settings_->isTrayEnabled())
- startInTrayToggle_->setDisabled(true);
+ auto toggle = new Toggle(this);
- startInTrayOptionLayout_->addWidget(startInTrayLabel);
- startInTrayOptionLayout_->addWidget(startInTrayToggle_, 0, Qt::AlignRight);
+ layout->addWidget(label);
+ layout->addWidget(toggle, 0, Qt::AlignRight);
- auto groupViewLayout = new QHBoxLayout;
- groupViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto groupViewLabel = new QLabel(tr("Group's sidebar"), this);
- groupViewLabel->setFont(font);
- groupViewToggle_ = new Toggle(this);
+ return std::pair{layout, toggle};
+ };
- groupViewLayout->addWidget(groupViewLabel);
- groupViewLayout->addWidget(groupViewToggle_, 0, Qt::AlignRight);
+ QHBoxLayout *trayOptionLayout_ = nullptr;
+ std::tie(trayOptionLayout_, trayToggle_) = addSetting(tr("Minimize to tray"));
- auto avatarViewLayout = new QHBoxLayout;
- avatarViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto avatarViewLabel = new QLabel(tr("Circular Avatars"), this);
- avatarViewLabel->setFont(font);
- avatarCircles_ = new Toggle(this);
-
- avatarViewLayout->addWidget(avatarViewLabel);
- avatarViewLayout->addWidget(avatarCircles_, 0, Qt::AlignRight);
+ QHBoxLayout *startInTrayOptionLayout_ = nullptr;
+ std::tie(startInTrayOptionLayout_, startInTrayToggle_) = addSetting(tr("Start in tray"));
+ if (!settings_->isTrayEnabled())
+ startInTrayToggle_->setDisabled(true);
- auto typingLayout = new QHBoxLayout;
- typingLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto typingLabel = new QLabel(tr("Typing notifications"), this);
- typingLabel->setFont(font);
- typingNotifications_ = new Toggle(this);
+ QHBoxLayout *groupViewLayout = nullptr;
+ std::tie(groupViewLayout, groupViewToggle_) = addSetting(tr("Group's sidebar"));
- typingLayout->addWidget(typingLabel);
- typingLayout->addWidget(typingNotifications_, 0, Qt::AlignRight);
+ QHBoxLayout *avatarViewLayout = nullptr;
+ std::tie(avatarViewLayout, avatarCircles_) = addSetting(tr("Circular Avatars"));
- auto receiptsLayout = new QHBoxLayout;
- receiptsLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto receiptsLabel = new QLabel(tr("Read receipts"), this);
- receiptsLabel->setFont(font);
- readReceipts_ = new Toggle(this);
+ QHBoxLayout *typingLayout = nullptr;
+ std::tie(typingLayout, typingNotifications_) = addSetting(tr("Typing notifications"));
- receiptsLayout->addWidget(receiptsLabel);
- receiptsLayout->addWidget(readReceipts_, 0, Qt::AlignRight);
+ QHBoxLayout *receiptsLayout = nullptr;
+ std::tie(receiptsLayout, readReceipts_) = addSetting(tr("Read receipts"));
- auto desktopLayout = new QHBoxLayout;
- desktopLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
- auto desktopLabel = new QLabel(tr("Desktop notifications"), this);
- desktopLabel->setFont(font);
- desktopNotifications_ = new Toggle(this);
+ QHBoxLayout *markdownLayout = nullptr;
+ std::tie(markdownLayout, markdownEnabled_) = addSetting(tr("Send messages as markdown"));
- desktopLayout->addWidget(desktopLabel);
- desktopLayout->addWidget(desktopNotifications_, 0, Qt::AlignRight);
+ QHBoxLayout *desktopLayout = nullptr;
+ std::tie(desktopLayout, desktopNotifications_) = addSetting(tr("Desktop notifications"));
auto scaleFactorOptionLayout = new QHBoxLayout;
scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin);
@@ -385,6 +363,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
mainLayout_->addWidget(new HorizontalLine(this));
mainLayout_->addLayout(typingLayout);
mainLayout_->addLayout(receiptsLayout);
+ mainLayout_->addLayout(markdownLayout);
mainLayout_->addLayout(desktopLayout);
mainLayout_->addWidget(new HorizontalLine(this));
@@ -466,6 +445,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
settings_->setAvatarCircles(!isDisabled);
});
+ connect(markdownEnabled_, &Toggle::toggled, this, [this](bool isDisabled) {
+ settings_->setMarkdownEnabled(!isDisabled);
+ });
+
connect(typingNotifications_, &Toggle::toggled, this, [this](bool isDisabled) {
settings_->setTypingNotifications(!isDisabled);
});
@@ -496,8 +479,10 @@ UserSettingsPage::showEvent(QShowEvent *)
trayToggle_->setState(!settings_->isTrayEnabled());
startInTrayToggle_->setState(!settings_->isStartInTrayEnabled());
groupViewToggle_->setState(!settings_->isGroupViewEnabled());
+ avatarCircles_->setState(!settings_->isAvatarCirclesEnabled());
typingNotifications_->setState(!settings_->isTypingNotificationsEnabled());
readReceipts_->setState(!settings_->isReadReceiptsEnabled());
+ markdownEnabled_->setState(!settings_->isMarkdownEnabled());
desktopNotifications_->setState(!settings_->hasDesktopNotifications());
deviceIdValue_->setText(QString::fromStdString(http::client()->device_id()));
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index 28236e83..8658e80e 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -68,6 +68,12 @@ public:
save();
}
+ void setMarkdownEnabled(bool state)
+ {
+ isMarkdownEnabled_ = state;
+ save();
+ }
+
void setReadReceipts(bool state)
{
isReadReceiptsEnabled_ = state;
@@ -96,6 +102,8 @@ public:
bool isTrayEnabled() const { return isTrayEnabled_; }
bool isStartInTrayEnabled() const { return isStartInTrayEnabled_; }
bool isGroupViewEnabled() const { return isGroupViewEnabled_; }
+ bool isAvatarCirclesEnabled() const { return avatarCircles_; }
+ bool isMarkdownEnabled() const { return isMarkdownEnabled_; }
bool isTypingNotificationsEnabled() const { return isTypingNotificationsEnabled_; }
bool isReadReceiptsEnabled() const { return isReadReceiptsEnabled_; }
bool hasDesktopNotifications() const { return hasDesktopNotifications_; }
@@ -116,6 +124,7 @@ private:
bool isTrayEnabled_;
bool isStartInTrayEnabled_;
bool isGroupViewEnabled_;
+ bool isMarkdownEnabled_;
bool isTypingNotificationsEnabled_;
bool isReadReceiptsEnabled_;
bool hasDesktopNotifications_;
@@ -168,6 +177,7 @@ private:
Toggle *groupViewToggle_;
Toggle *typingNotifications_;
Toggle *readReceipts_;
+ Toggle *markdownEnabled_;
Toggle *desktopNotifications_;
Toggle *avatarCircles_;
QLabel *deviceFingerprintValue_;
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 5a67ef62..76ffed31 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -397,6 +397,10 @@ utils::markdownToHtml(const QString &text)
auto result = linkifyMessage(escapeBlacklistedHtml(QString::fromStdString(html))).trimmed();
+ if (result.count("<p>") == 1 && result.startsWith("<p>") && result.endsWith("</p>")) {
+ result = result.mid(3, result.size() - 3 - 4);
+ }
+
return result;
}
diff --git a/src/install-debian.txt b/src/install-debian.txt
new file mode 100644
index 00000000..68387665
--- /dev/null
+++ b/src/install-debian.txt
@@ -0,0 +1,24 @@
+sudo apt install cmake
+sudo apt install gcc make automake
+sudo apt install qt5-default
+sudo apt install liblmdb-dev
+sudo apt install qttools5-dev-tools
+sudo apt install qttools5-dev-tools
+sudo apt install qttools5
+sudo apt install qt5-qmltooling-plugins qml-module-qtgstreamer
+sudo apt install libqt5webview5-dev
+sudo apt install libqt5quickcontrols2-5
+sudo apt install qtquickcontrols2-5-dev
+sudo apt install libssl-dev
+sudo apt install qml-module-qtgraphicaleffects
+sudo apt install qml-module-qtquick-controls2
+sudo apt install qml-module-qtquick-layouts
+sudo apt install qml-module-qtmultimedia
+sudo apt install qml-module-qt-labs-settings qml-module-qt-labs-sharedimage
+sudo apt install qttools5-dev
+sudo apt install libqt5svg5-dev
+sudo apt install qt5multimedia
+sudo apt install libqt5multimedia5
+sudo apt install libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5multimediawidgets5
+sudo apt install qt5ct
+sudo apt install qtmultimedia5-dev
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index f66099a0..f34cb405 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1,6 +1,7 @@
#include "TimelineModel.h"
#include <algorithm>
+#include <thread>
#include <type_traits>
#include <QFileDialog>
@@ -280,9 +281,26 @@ TimelineModel::data(const QString &id, int role) const
case FormattedBody: {
const static QRegularExpression replyFallback(
"<mx-reply>.*</mx-reply>", QRegularExpression::DotMatchesEverythingOption);
- return QVariant(
- utils::replaceEmoji(utils::linkifyMessage(utils::escapeBlacklistedHtml(
- formattedBodyWithFallback(event).remove(replyFallback)))));
+
+ bool isReply = !in_reply_to_event(event).empty();
+
+ auto formattedBody_ = QString::fromStdString(formatted_body(event));
+ if (formattedBody_.isEmpty()) {
+ auto body_ = QString::fromStdString(body(event));
+
+ if (isReply) {
+ while (body_.startsWith("> "))
+ body_ = body_.right(body_.size() - body_.indexOf('\n') - 1);
+ if (body_.startsWith('\n'))
+ body_ = body_.right(body_.size() - 1);
+ }
+ formattedBody_ = body_.toHtmlEscaped().replace('\n', "<br>");
+ } else {
+ if (isReply)
+ formattedBody_ = formattedBody_.remove(replyFallback);
+ }
+ return QVariant(utils::replaceEmoji(
+ utils::linkifyMessage(utils::escapeBlacklistedHtml(formattedBody_))));
}
case Url:
return QVariant(QString::fromStdString(url(event)));
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 676f5ca5..33441a62 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -18,8 +18,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
void
TimelineViewManager::updateColorPalette()
{
- UserSettings settings;
- if (settings.theme() == "light") {
+ if (settings->theme() == "light") {
QPalette lightActive(/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"),
/*light*/ QColor(),
@@ -33,7 +32,7 @@ TimelineViewManager::updateColorPalette()
lightActive.setColor(QPalette::ToolTipText, lightActive.text().color());
view->rootContext()->setContextProperty("currentActivePalette", lightActive);
view->rootContext()->setContextProperty("currentInactivePalette", lightActive);
- } else if (settings.theme() == "dark") {
+ } else if (settings->theme() == "dark") {
QPalette darkActive(/*windowText*/ QColor("#caccd1"),
/*button*/ QColor("#caccd1"),
/*light*/ QColor(),
@@ -54,9 +53,10 @@ TimelineViewManager::updateColorPalette()
}
}
-TimelineViewManager::TimelineViewManager(QWidget *parent)
+TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettings, QWidget *parent)
: imgProvider(new MxcImageProvider())
, colorImgProvider(new ColorImageProvider())
+ , settings(userSettings)
{
qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
"im.nheko",
@@ -190,8 +190,16 @@ TimelineViewManager::queueTextMessage(const QString &msg, const std::optional<Re
{
mtx::events::msg::Text text = {};
text.body = msg.trimmed().toStdString();
- text.format = "org.matrix.custom.html";
- text.formatted_body = utils::markdownToHtml(msg).toStdString();
+
+ if (settings->isMarkdownEnabled()) {
+ text.formatted_body = utils::markdownToHtml(msg).toStdString();
+
+ // Don't send formatted_body, when we don't need to
+ if (text.formatted_body == text.body)
+ text.formatted_body = "";
+ else
+ text.format = "org.matrix.custom.html";
+ }
if (related) {
QString body;
@@ -206,8 +214,17 @@ TimelineViewManager::queueTextMessage(const QString &msg, const std::optional<Re
}
text.body = QString("%1\n%2").arg(body).arg(msg).toStdString();
- text.formatted_body =
- utils::getFormattedQuoteBody(*related, utils::markdownToHtml(msg)).toStdString();
+
+ // NOTE(Nico): rich replies always need a formatted_body!
+ text.format = "org.matrix.custom.html";
+ if (settings->isMarkdownEnabled())
+ text.formatted_body =
+ utils::getFormattedQuoteBody(*related, utils::markdownToHtml(msg))
+ .toStdString();
+ else
+ text.formatted_body =
+ utils::getFormattedQuoteBody(*related, msg.toHtmlEscaped()).toStdString();
+
text.relates_to.in_reply_to.event_id = related->related_event;
}
@@ -223,8 +240,10 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
mtx::events::msg::Emote emote;
emote.body = msg.trimmed().toStdString();
- if (html != msg.trimmed().toHtmlEscaped())
+ if (html != msg.trimmed().toHtmlEscaped() && settings->isMarkdownEnabled()) {
emote.formatted_body = html.toStdString();
+ emote.format = "org.matrix.custom.html";
+ }
if (timeline_)
timeline_->sendMessage(emote);
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h
index 3db55366..5880a382 100644
--- a/src/timeline/TimelineViewManager.h
+++ b/src/timeline/TimelineViewManager.h
@@ -15,6 +15,7 @@
class MxcImageProvider;
class ColorImageProvider;
+class UserSettings;
class TimelineViewManager : public QObject
{
@@ -28,7 +29,7 @@ class TimelineViewManager : public QObject
replyingEventChanged)
public:
- TimelineViewManager(QWidget *parent = 0);
+ TimelineViewManager(QSharedPointer<UserSettings> userSettings, QWidget *parent = 0);
QWidget *getWidget() const { return container; }
void sync(const mtx::responses::Rooms &rooms);
@@ -109,4 +110,6 @@ private:
TimelineModel *timeline_ = nullptr;
bool isInitialSync_ = true;
QString replyingEvent_;
+
+ QSharedPointer<UserSettings> settings;
};
diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp
index 8a05d937..5daa697e 100644
--- a/src/ui/SnackBar.cpp
+++ b/src/ui/SnackBar.cpp
@@ -1,6 +1,6 @@
#include <QPainter>
-#include <tweeny/tweeny.h>
+#include <tweeny.h>
#include "SnackBar.h"
|
