mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-27 13:38:49 +03:00
Compare commits
No commits in common. "1a00d913167fb9f10b5ff15204c189cb4cfb82d1" and "2f967978f23381a5e9f2bc8c1561b033d38bd58d" have entirely different histories.
1a00d91316
...
2f967978f2
1 changed files with 2 additions and 3 deletions
|
@ -20,8 +20,6 @@
|
||||||
#include <QVideoFrame>
|
#include <QVideoFrame>
|
||||||
#include <QVideoSink>
|
#include <QVideoSink>
|
||||||
|
|
||||||
#include <fmt/format.h>
|
|
||||||
|
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
#include <mtx/responses/common.hpp>
|
#include <mtx/responses/common.hpp>
|
||||||
|
@ -580,7 +578,8 @@ InputBar::message(const QString &msg, MarkdownOverride useMarkdown, bool rainbow
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
text.body = fmt::format("{}\n{}", body.toStdString(), text.body);
|
text.body =
|
||||||
|
QStringLiteral("%1\n%2").arg(body, QString::fromStdString(text.body)).toStdString();
|
||||||
|
|
||||||
// NOTE(Nico): rich replies always need a formatted_body!
|
// NOTE(Nico): rich replies always need a formatted_body!
|
||||||
text.format = "org.matrix.custom.html";
|
text.format = "org.matrix.custom.html";
|
||||||
|
|
Loading…
Reference in a new issue