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

lint and avoid copy

Browse source
This commit is contained in:
Nicolas Werner 2023-02-02 01:26:42 +01:00
parent a320fc6f7a
commit 0ab566dc4b
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChatPage.cpp
View file

@ -1652,7 +1652,7 @@ ChatPage::isRoomActive(const QString &room_id)
void
ChatPage::removeAllNotifications()
{
#if defined (Q_OS_LINUX)
#if defined(Q_OS_LINUX)
notificationsManager->closeAllNotifications();
#endif
}

82
src/Config.h
View file

@ -25,23 +25,22 @@ constexpr auto LABEL_MEDIUM_SIZE_RATIO = 1.3;
namespace strings {
const QString url_html = QStringLiteral("<a href=\"\\1\">\\1</a>");
const QRegularExpression
url_regex(
// match an unquoted URL
[]() {
const auto general_unicode = QStringLiteral(
R"((?:[^\x{0}-\x{7f}\p{Cc}\s\p{P}]|[\x{2010}\x{2011}\x{2012}\x{2013}\x{2014}\x{2015}]))");
const auto protocol = QStringLiteral(R"((?:[Hh][Tt][Tt][Pp][Ss]?))");
const auto unreserved_subdelims_colon = QStringLiteral(R"([a-zA-Z0-9\-._~!$&'()*+,;=:])");
const auto pct_enc = QStringLiteral(R"((?:%[[:xdigit:]]{2}))");
const auto userinfo = "(?:" + unreserved_subdelims_colon + "*(?:" + pct_enc +
unreserved_subdelims_colon + "*)*)";
const auto dec_octet =
QStringLiteral(R"((?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))");
const auto ipv4_addr = "(?:" + dec_octet + R"((?:\.)" + dec_octet + "){3})";
const auto h16 = QStringLiteral(R"((?:[[:xdigit:]]{1,4}))");
const auto ls32 = "(?:" + h16 + ":" + h16 + "|" + ipv4_addr + ")";
// clang-format off
const QRegularExpression url_regex(
// match an unquoted URL
[]() {
const auto general_unicode = QStringLiteral(
R"((?:[^\x{0}-\x{7f}\p{Cc}\s\p{P}]|[\x{2010}\x{2011}\x{2012}\x{2013}\x{2014}\x{2015}]))");
const auto protocol = QStringLiteral(R"((?:[Hh][Tt][Tt][Pp][Ss]?))");
const auto unreserved_subdelims_colon = QStringLiteral(R"([a-zA-Z0-9\-._~!$&'()*+,;=:])");
const auto pct_enc = QStringLiteral(R"((?:%[[:xdigit:]]{2}))");
const auto userinfo =
"(?:" + unreserved_subdelims_colon + "*(?:" + pct_enc + unreserved_subdelims_colon + "*)*)";
const auto dec_octet =
QStringLiteral(R"((?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))");
const auto ipv4_addr = "(?:" + dec_octet + R"((?:\.)" + dec_octet + "){3})";
const auto h16 = QStringLiteral(R"((?:[[:xdigit:]]{1,4}))");
const auto ls32 = "(?:" + h16 + ":" + h16 + "|" + ipv4_addr + ")";
// clang-format off
const auto ipv6_addr = "(?:"
"(?:" + h16 + ":){6}" + ls32
+ "|" "::(?:" + h16 + ":){5}" + ls32
@ -53,30 +52,31 @@ const QRegularExpression
+ "|" "(?:" + h16 + "(?::" + h16 + "){0,5})?::" + h16
+ "|" "(?:" + h16 + "(?::" + h16 + "){0,6})?::"
")";
// clang-format on
const auto ipvfuture = R"((?:v[[:xdigit:]]+\.)" + unreserved_subdelims_colon + "+)";
const auto ip_literal = R"((?:\[(?:)" + ipv6_addr + "|" + ipvfuture + R"()\]))";
const auto host_alnum = "(?:[a-zA-Z0-9]|" + general_unicode + ")";
const auto host_label = "(?:" + host_alnum + "+(?:-+" + host_alnum + "+)*)";
const auto hostname = "(?:" + host_label + R"((?:\.)" + host_label + R"()*\.?))";
const auto host = "(?:" + hostname + "|" + ip_literal + ")";
const auto path = R"((?:/((?:[a-zA-Z0-9\-._~!$&'*+,;=:@/]|)" + pct_enc + R"(|\((?-1)\)|)" +
general_unicode + ")*))";
const auto query = R"(((?:[a-zA-Z0-9\-._~!$&'*+,;=:@/?\\{}]|)" + pct_enc +
R"(|\((?-1)\)|\[(?-1)\]|)" + general_unicode + ")*)";
const auto &fragment = query;
return
R"((?<!["'\w])(?>()"
+ protocol + "://"
+ "(?:" + userinfo + "@)?"
+ host + "(?::[0-9]+)?"
+ path + "?"
R"((?:\?)" + query + ")?"
R"((?:#)" + fragment + ")?"
"(?<![.!?,;:'])"
R"())(?!["']))";
}(),
QRegularExpression::UseUnicodePropertiesOption);
// clang-format on
const auto ipvfuture = R"((?:v[[:xdigit:]]+\.)" + unreserved_subdelims_colon + "+)";
const auto ip_literal = R"((?:\[(?:)" + ipv6_addr + "|" + ipvfuture + R"()\]))";
const auto host_alnum = "(?:[a-zA-Z0-9]|" + general_unicode + ")";
const auto host_label = "(?:" + host_alnum + "+(?:-+" + host_alnum + "+)*)";
const auto hostname = "(?:" + host_label + R"((?:\.)" + host_label + R"()*\.?))";
const auto host = "(?:" + hostname + "|" + ip_literal + ")";
const auto path = R"((?:/((?:[a-zA-Z0-9\-._~!$&'*+,;=:@/]|)" + pct_enc + R"(|\((?-1)\)|)" +
general_unicode + ")*))";
const auto query = R"(((?:[a-zA-Z0-9\-._~!$&'*+,;=:@/?\\{}]|)" + pct_enc +
R"(|\((?-1)\)|\[(?-1)\]|)" + general_unicode + ")*)";
const auto &fragment = query;
return R"((?<!["'\w])(?>()" + protocol + "://" + "(?:" + userinfo + "@)?" + host +
"(?::[0-9]+)?" + path +
"?"
R"((?:\?)" +
query +
")?"
R"((?:#)" +
fragment +
")?"
"(?<![.!?,;:'])"
R"())(?!["']))";
}(),
QRegularExpression::UseUnicodePropertiesOption);
// A matrix link to be converted back to markdown
static const QRegularExpression
matrixToLink(QStringLiteral(R"(<a href=\"(https://matrix.to/#/.*?)\">(.*?)</a>)"));

3
src/notifications/ManagerLinux.cpp
View file

@ -275,7 +275,8 @@ NotificationsManager::notificationClosed(uint id, uint reason)
void
NotificationsManager::closeAllNotifications()
{
for (auto id : notificationIds.keys()) {
const auto ids = notificationIds.keys();
for (const auto &id : ids) {
closeNotification(id);
notificationIds.remove(id);
}