ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Time and date support in messageeventmodel && local echo support.

Browse Source
This commit is contained in:
Black Hat
2018-07-30 00:00:41 +08:00
parent a105f344f4
commit 93a303799a
7 changed files with 279 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/controller.cpp
View File

@@ -9,20 +9,20 @@
#include <QMimeDatabase>
Controller::Controller(QObject* parent) : QObject(parent) {
connect(m_connection, &QMatrixClient::Connection::connected, this,
connect(m_connection, &Connection::connected, this,
&Controller::connected);
connect(m_connection, &QMatrixClient::Connection::resolveError, this,
connect(m_connection, &Connection::resolveError, this,
&Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncError, this,
connect(m_connection, &Connection::syncError, this,
&Controller::reconnect);
connect(m_connection, &QMatrixClient::Connection::syncDone, this,
connect(m_connection, &Connection::syncDone, this,
&Controller::resync);
connect(m_connection, &QMatrixClient::Connection::connected, this,
connect(m_connection, &Connection::connected, this,
&Controller::connectionChanged);
connect(m_connection, &QMatrixClient::Connection::connected,
connect(m_connection, &Connection::connected,
[=] { setBusy(true); });
connect(m_connection, &QMatrixClient::Connection::syncDone,
connect(m_connection, &Connection::syncDone,
[=] { setBusy(false); });
}
@@ -76,7 +76,7 @@ void Controller::reconnect() {
m_connection->connectWithToken(userID, token, "");
}
void Controller::postFile(QMatrixClient::Room* room, const QUrl& localFile,
void Controller::postFile(Room* room, const QUrl& localFile,
const QUrl& mxcUrl) {
const QString mime = getMIME(localFile);
const QString fileName = localFile.toLocalFile();