d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-21 18:50:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix mentions with markdown and in edits

Browse source
This commit is contained in:
Nicolas Werner 2024-05-31 18:17:35 +02:00
parent 1c5f747856
commit ec9af40fc5
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
7 changed files with 50 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -606,7 +606,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 8b3c9a34770df147fbd78134dc71a9b27471d153
GIT_TAG 604a2ec95b03fbf8c856bc481e7582f5c6a64748
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
im.nheko.Nheko.yaml
View file

@ -223,7 +223,7 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- commit: 8b3c9a34770df147fbd78134dc71a9b27471d153
- commit: 604a2ec95b03fbf8c856bc481e7582f5c6a64748
#tag: v0.9.2
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git

6
src/UsersModel.cpp
View file

@ -11,6 +11,7 @@
#include "CompletionModelRoles.h"
#include "Logging.h"
#include "UserSettingsPage.h"
#include "Utils.h"
UsersModel::UsersModel(const std::string &roomId, QObject *parent)
: QAbstractListModel(parent)
@ -66,10 +67,7 @@ UsersModel::data(const QModelIndex &index, int role) const
case CompletionModel::CompletionRole:
if (UserSettings::instance()->markdown())
return QStringLiteral("[%1](https://matrix.to/#/%2)")
.arg(QString(displayNames[index.row()])
.replace("[", "\\[")
.replace("]", "\\]")
.toHtmlEscaped(),
.arg(utils::escapeMentionMarkdown(QString(displayNames[index.row()])),
QString(QUrl::toPercentEncoding(userids[index.row()])));
else
return displayNames[index.row()];

35
src/Utils.cpp
View file

@ -581,6 +581,34 @@ utils::linkifyMessage(const QString &body)
return doc;
}
QString
utils::escapeMentionMarkdown(QString input)
{
input = input.toHtmlEscaped();
constexpr std::array<char, 10> markdownChars = {
'\\',
'`',
'*',
'_',
/*'{', '}',*/ '[',
']',
'<',
'>',
/* '(', ')', '#', '-', '+', '.', '!', */ '~',
'|',
};
QByteArray replacement = "\\\\";
for (char c : markdownChars) {
replacement[1] = c;
input.replace(QChar::fromLatin1(c), QLatin1StringView(replacement));
}
return input;
}
QString
utils::escapeBlacklistedHtml(const QString &rawStr)
{
@ -1139,18 +1167,19 @@ utils::getFormattedQuoteBody(const RelatedInfo &related, const QString &html)
return QStringLiteral("sent a video");
}
default: {
return related.quoted_formatted_body;
return escapeBlacklistedHtml(related.quoted_formatted_body);
}
}
};
return QStringLiteral("<mx-reply><blockquote><a "
"href=\"https://matrix.to/#/%1/%2\">In reply "
"to</a> <a href=\"https://matrix.to/#/%3\">%4</a><br"
"/>%5</blockquote></mx-reply>")
.arg(related.room,
QString::fromStdString(related.related_event),
related.quoted_user,
related.quoted_user,
QUrl::toPercentEncoding(related.quoted_user),
related.quoted_user.toHtmlEscaped(),
getFormattedBody()) +
html;
}

3
src/Utils.h
View file

@ -140,6 +140,9 @@ linkifyMessage(const QString &body);
QString
markdownToHtml(const QString &text, bool rainbowify = false, bool noExtensions = false);
QString
escapeMentionMarkdown(QString input);
//! Escape every html tag, that was not whitelisted
QString
escapeBlacklistedHtml(const QString &data);

4
src/timeline/InputBar.cpp
View file

@ -462,8 +462,7 @@ replaceMatrixToMarkdownLink(QString input)
int newline = input.indexOf('\n', endOfName);
if (endOfLink > endOfName && (newline == -1 || endOfLink < newline)) {
auto name = input.mid(startOfName + 1, endOfName - startOfName - 1);
name.replace("\\[", "[");
name.replace("\\]", "]");
name.remove(QChar(u'\\'), Qt::CaseSensitive);
input.replace(startOfName, endOfLink - startOfName + 1, name);
replaced = true;
}
@ -522,6 +521,7 @@ InputBar::generateMentions()
// this->containsAtRoom_ = false;
// this->mentions_.clear();
// this->mentionTexts_.clear();
return mention;
}

16
src/timeline/TimelineModel.cpp
View file

@ -3080,8 +3080,6 @@ TimelineModel::setEdit(const QString &newEdit)
input()->storeForEdit();
}
auto quoted = [](QString in) { return in.replace("[", "\\[").replace("]", "\\]"); };
if (edit_ != newEdit) {
auto ev = events.get(newEdit.toStdString(), "");
if (ev && mtx::accessors::sender(*ev) == http::client()->user_id().to_string()) {
@ -3100,10 +3098,12 @@ TimelineModel::setEdit(const QString &newEdit)
for (const auto &user : mentionsList->user_ids) {
auto userid = QString::fromStdString(user);
mentions.append(userid);
mentionTexts.append(
QStringLiteral("[%1](https://matrix.to/#/%2)")
.arg(displayName(userid).replace("[", "\\[").replace("]", "\\]"),
QString(QUrl::toPercentEncoding(userid))));
mentionTexts.append(QStringLiteral("[%1](https://matrix.to/#/%2)")
.arg(utils::escapeMentionMarkdown(
// not using TimelineModel::displayName here,
// because it would double html escape
cache::displayName(room_id_, userid)),
QString(QUrl::toPercentEncoding(userid))));
}
}
@ -3127,7 +3127,9 @@ TimelineModel::setEdit(const QString &newEdit)
for (const auto &[user, link] : reverseNameMapping) {
// TODO(Nico): html unescape the user name
editText.replace(user, QStringLiteral("[%1](%2)").arg(quoted(user), link));
editText.replace(
user,
QStringLiteral("[%1](%2)").arg(utils::escapeMentionMarkdown(user), link));
}
}