diff options
| -rw-r--r-- | lib/connectiondata.cpp | 6 | ||||
| -rw-r--r-- | lib/room.h | 2 | ||||
| -rw-r--r-- | lib/util.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp index e2a0f06f..94cab29b 100644 --- a/lib/connectiondata.cpp +++ b/lib/connectiondata.cpp @@ -86,7 +86,11 @@ ConnectionData::ConnectionData(QUrl baseUrl) }); } -ConnectionData::~ConnectionData() = default; +ConnectionData::~ConnectionData() +{ + d->rateLimiter.disconnect(); + d->rateLimiter.stop(); +} void ConnectionData::submit(BaseJob* job) { @@ -181,7 +181,7 @@ public: QString avatarMediaId() const; QUrl avatarUrl() const; const Avatar& avatarObject() const; - Q_INVOKABLE Quotient::JoinState joinState() const; + Q_INVOKABLE JoinState joinState() const; Q_INVOKABLE QList<Quotient::User*> usersTyping() const; QList<User*> membersLeft() const; diff --git a/lib/util.cpp b/lib/util.cpp index 041a8aba..9f4ac85f 100644 --- a/lib/util.cpp +++ b/lib/util.cpp @@ -56,7 +56,7 @@ void Quotient::linkifyUrls(QString& htmlEscapedText) // https://matrix.org/docs/spec/appendices.html#identifier-grammar static const QRegularExpression MxIdRegExp( QStringLiteral( - R"((^|[^<>/])([!#@][-a-z0-9_=/.]{1,252}:(?:\w|\.|-)+\.\w+(?::\d{1,5})?))"), + R"((^|[^<>/])([!#@][-a-z0-9_=#/.]{1,252}:(?:\w|\.|-)+\.\w+(?::\d{1,5})?))"), RegExpOptions); // NOTE: htmlEscapedText is already HTML-escaped! No literal <,>,&," |