mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-21 18:50:47 +03:00
Optimize build
This commit is contained in:
parent
7f2d18c36d
commit
12fff7408e
33 changed files with 243 additions and 232 deletions
|
@ -340,7 +340,7 @@ if(USE_BUNDLED_MTXCLIENT)
|
|||
FetchContent_Declare(
|
||||
MatrixClient
|
||||
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
|
||||
GIT_TAG 6432e89a3465e58ed838dd2abdcb0f91bd4f05b0
|
||||
GIT_TAG ba5af13e5378915ff99a2db6ccfb0e9ab9eba70a
|
||||
)
|
||||
FetchContent_MakeAvailable(MatrixClient)
|
||||
else()
|
||||
|
@ -600,6 +600,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
|
|||
target_precompile_headers(nheko
|
||||
PRIVATE
|
||||
<string>
|
||||
<algorithm>
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -3,3 +3,7 @@ hunter_config(
|
|||
VERSION "1.70.0-p1"
|
||||
CMAKE_ARGS IOSTREAMS_NO_BZIP2=1
|
||||
)
|
||||
hunter_config(
|
||||
nlohmann_json
|
||||
CMAKE_ARGS JSON_MultipleHeaders=ON
|
||||
)
|
||||
|
|
|
@ -146,7 +146,7 @@
|
|||
"name": "mtxclient",
|
||||
"sources": [
|
||||
{
|
||||
"commit": "6432e89a3465e58ed838dd2abdcb0f91bd4f05b0",
|
||||
"commit": "5af13e5378915ff99a2db6ccfb0e9ab9eba70a",
|
||||
"type": "git",
|
||||
"url": "https://github.com/Nheko-Reborn/mtxclient.git"
|
||||
}
|
||||
|
|
|
@ -3376,6 +3376,46 @@ Cache::markUserKeysOutOfDate(lmdb::txn &txn,
|
|||
});
|
||||
}
|
||||
|
||||
void
|
||||
Cache::query_keys(const std::string &user_id,
|
||||
std::function<void(const UserKeyCache &, mtx::http::RequestErr)> cb)
|
||||
{
|
||||
auto cache_ = cache::userKeys(user_id);
|
||||
|
||||
if (cache_.has_value()) {
|
||||
if (!cache_->updated_at.empty() && cache_->updated_at == cache_->last_changed) {
|
||||
cb(cache_.value(), {});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
mtx::requests::QueryKeys req;
|
||||
req.device_keys[user_id] = {};
|
||||
|
||||
std::string last_changed;
|
||||
if (cache_)
|
||||
last_changed = cache_->last_changed;
|
||||
req.token = last_changed;
|
||||
|
||||
http::client()->query_keys(req,
|
||||
[cb, user_id, last_changed](const mtx::responses::QueryKeys &res,
|
||||
mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->warn(
|
||||
"failed to query device keys: {},{}",
|
||||
err->matrix_error.errcode,
|
||||
static_cast<int>(err->status_code));
|
||||
cb({}, err);
|
||||
return;
|
||||
}
|
||||
|
||||
cache::updateUserKeys(last_changed, res);
|
||||
|
||||
auto keys = cache::userKeys(user_id);
|
||||
cb(keys.value_or(UserKeyCache{}), err);
|
||||
});
|
||||
}
|
||||
|
||||
void
|
||||
to_json(json &j, const VerificationCache &info)
|
||||
{
|
||||
|
|
28
src/Cache.h
28
src/Cache.h
|
@ -28,11 +28,18 @@
|
|||
#include <lmdb++.h>
|
||||
#endif
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtx/events/event_type.hpp>
|
||||
#include <mtx/events/presence.hpp>
|
||||
#include <mtx/responses/crypto.hpp>
|
||||
#include <mtxclient/crypto/types.hpp>
|
||||
|
||||
#include "CacheCryptoStructs.h"
|
||||
#include "CacheStructs.h"
|
||||
|
||||
namespace mtx::responses {
|
||||
struct Notifications;
|
||||
}
|
||||
|
||||
namespace cache {
|
||||
void
|
||||
init(const QString &user_id);
|
||||
|
@ -94,8 +101,6 @@ getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb);
|
|||
std::vector<RoomMember>
|
||||
getMembers(const std::string &room_id, std::size_t startIndex = 0, std::size_t len = 30);
|
||||
|
||||
void
|
||||
saveState(const mtx::responses::Sync &res);
|
||||
bool
|
||||
isInitialized();
|
||||
|
||||
|
@ -128,9 +133,6 @@ setCurrentFormat();
|
|||
bool
|
||||
runMigrations();
|
||||
|
||||
std::map<QString, mtx::responses::Timeline>
|
||||
roomMessages();
|
||||
|
||||
QMap<QString, mtx::responses::Notifications>
|
||||
getTimelineMentions();
|
||||
|
||||
|
@ -182,22 +184,8 @@ saveImage(const QString &url, const QByteArray &data);
|
|||
|
||||
RoomInfo
|
||||
singleRoomInfo(const std::string &room_id);
|
||||
std::vector<std::string>
|
||||
roomsWithStateUpdates(const mtx::responses::Sync &res);
|
||||
std::vector<std::string>
|
||||
roomsWithTagUpdates(const mtx::responses::Sync &res);
|
||||
std::map<QString, RoomInfo>
|
||||
getRoomInfo(const std::vector<std::string> &rooms);
|
||||
inline std::map<QString, RoomInfo>
|
||||
roomUpdates(const mtx::responses::Sync &sync)
|
||||
{
|
||||
return getRoomInfo(roomsWithStateUpdates(sync));
|
||||
}
|
||||
inline std::map<QString, RoomInfo>
|
||||
roomTagUpdates(const mtx::responses::Sync &sync)
|
||||
{
|
||||
return getRoomInfo(roomsWithTagUpdates(sync));
|
||||
}
|
||||
|
||||
//! Calculates which the read status of a room.
|
||||
//! Whether all the events in the timeline have been read.
|
||||
|
|
|
@ -3,10 +3,8 @@
|
|||
#include <map>
|
||||
#include <mutex>
|
||||
|
||||
//#include <nlohmann/json.hpp>
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtxclient/crypto/client.hpp>
|
||||
#include <mtx/responses/crypto.hpp>
|
||||
#include <mtxclient/crypto/objects.hpp>
|
||||
|
||||
// Extra information associated with an outbound megolm session.
|
||||
struct OutboundGroupSessionData
|
||||
|
|
|
@ -33,8 +33,11 @@
|
|||
#endif
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtx/responses/messages.hpp>
|
||||
#include <mtx/responses/notifications.hpp>
|
||||
#include <mtx/responses/sync.hpp>
|
||||
#include <mtxclient/crypto/client.hpp>
|
||||
#include <mtxclient/http/client.hpp>
|
||||
|
||||
#include "CacheCryptoStructs.h"
|
||||
#include "CacheStructs.h"
|
||||
|
@ -65,6 +68,8 @@ public:
|
|||
void deleteUserKeys(lmdb::txn &txn,
|
||||
lmdb::dbi &db,
|
||||
const std::vector<std::string> &user_ids);
|
||||
void query_keys(const std::string &user_id,
|
||||
std::function<void(const UserKeyCache &, mtx::http::RequestErr)> cb);
|
||||
|
||||
// device & user verification cache
|
||||
VerificationStatus verificationStatus(const std::string &user_id);
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "MainWindow.h"
|
||||
#include "MatrixClient.h"
|
||||
#include "UserSettingsPage.h"
|
||||
#include "Utils.h"
|
||||
#include "WebRTCSession.h"
|
||||
#include "dialogs/AcceptCall.h"
|
||||
|
||||
|
@ -33,8 +34,8 @@ std::vector<std::string>
|
|||
getTurnURIs(const mtx::responses::TurnServer &turnServer);
|
||||
}
|
||||
|
||||
CallManager::CallManager(QSharedPointer<UserSettings> userSettings)
|
||||
: QObject()
|
||||
CallManager::CallManager(QSharedPointer<UserSettings> userSettings, QObject *parent)
|
||||
: QObject(parent)
|
||||
, session_(WebRTCSession::instance())
|
||||
, turnServerTimer_(this)
|
||||
, settings_(userSettings)
|
||||
|
|
|
@ -24,7 +24,7 @@ class CallManager : public QObject
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
CallManager(QSharedPointer<UserSettings>);
|
||||
CallManager(QSharedPointer<UserSettings>, QObject *);
|
||||
|
||||
void sendInvite(const QString &roomid);
|
||||
void hangUp(
|
||||
|
|
185
src/ChatPage.cpp
185
src/ChatPage.cpp
|
@ -22,9 +22,12 @@
|
|||
#include <QShortcut>
|
||||
#include <QtConcurrent>
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
|
||||
#include "AvatarProvider.h"
|
||||
#include "Cache.h"
|
||||
#include "Cache_p.h"
|
||||
#include "CallManager.h"
|
||||
#include "ChatPage.h"
|
||||
#include "DeviceVerificationFlow.h"
|
||||
#include "EventAccessors.h"
|
||||
|
@ -69,7 +72,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
|
|||
, isConnected_(true)
|
||||
, userSettings_{userSettings}
|
||||
, notificationsManager(this)
|
||||
, callManager_(userSettings)
|
||||
, callManager_(new CallManager(userSettings, this))
|
||||
{
|
||||
setObjectName("chatPage");
|
||||
|
||||
|
@ -126,7 +129,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
|
|||
contentLayout_->setSpacing(0);
|
||||
contentLayout_->setMargin(0);
|
||||
|
||||
view_manager_ = new TimelineViewManager(&callManager_, this);
|
||||
view_manager_ = new TimelineViewManager(callManager_, this);
|
||||
|
||||
contentLayout_->addWidget(view_manager_->getWidget());
|
||||
|
||||
|
@ -434,8 +437,8 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
|
|||
});
|
||||
|
||||
connect(text_input_, &TextInputWidget::callButtonPress, this, [this]() {
|
||||
if (callManager_.onActiveCall()) {
|
||||
callManager_.hangUp();
|
||||
if (callManager_->onActiveCall()) {
|
||||
callManager_->hangUp();
|
||||
} else {
|
||||
if (auto roomInfo = cache::singleRoomInfo(current_room_.toStdString());
|
||||
roomInfo.member_count != 2) {
|
||||
|
@ -454,7 +457,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
|
|||
userSettings_,
|
||||
MainWindow::instance());
|
||||
connect(dialog, &dialogs::PlaceCall::voice, this, [this]() {
|
||||
callManager_.sendInvite(current_room_);
|
||||
callManager_->sendInvite(current_room_);
|
||||
});
|
||||
utils::centerWidget(dialog, MainWindow::instance());
|
||||
dialog->show();
|
||||
|
@ -692,7 +695,7 @@ ChatPage::bootstrap(QString userid, QString homeserver, QString token)
|
|||
const bool isInitialized = cache::isInitialized();
|
||||
const auto cacheVersion = cache::formatVersion();
|
||||
|
||||
callManager_.refreshTurnServer();
|
||||
callManager_->refreshTurnServer();
|
||||
|
||||
if (!isInitialized) {
|
||||
cache::setCurrentFormat();
|
||||
|
@ -762,7 +765,7 @@ ChatPage::loadStateFromCache()
|
|||
cache::restoreSessions();
|
||||
olm::client()->load(cache::restoreOlmAccount(), STORAGE_SECRET_KEY);
|
||||
|
||||
emit initializeEmptyViews(cache::roomMessages());
|
||||
emit initializeEmptyViews(cache::client()->roomMessages());
|
||||
emit initializeRoomList(cache::roomInfo());
|
||||
emit initializeMentions(cache::getTimelineMentions());
|
||||
emit syncTags(cache::roomInfo().toStdMap());
|
||||
|
@ -969,13 +972,64 @@ ChatPage::startInitialSync()
|
|||
opts.set_presence = currentPresence();
|
||||
|
||||
http::client()->sync(
|
||||
opts,
|
||||
std::bind(
|
||||
&ChatPage::initialSyncHandler, this, std::placeholders::_1, std::placeholders::_2));
|
||||
opts, [this](const mtx::responses::Sync &res, mtx::http::RequestErr err) {
|
||||
// TODO: Initial Sync should include mentions as well...
|
||||
|
||||
if (err) {
|
||||
const auto error = QString::fromStdString(err->matrix_error.error);
|
||||
const auto msg = tr("Please try to login again: %1").arg(error);
|
||||
const auto err_code = mtx::errors::to_string(err->matrix_error.errcode);
|
||||
const int status_code = static_cast<int>(err->status_code);
|
||||
|
||||
nhlog::net()->error("initial sync error: {} {}", status_code, err_code);
|
||||
|
||||
// non http related errors
|
||||
if (status_code <= 0 || status_code >= 600) {
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (status_code) {
|
||||
case 502:
|
||||
case 504:
|
||||
case 524: {
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
default: {
|
||||
emit dropToLoginPageCb(msg);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nhlog::net()->info("initial sync completed");
|
||||
|
||||
try {
|
||||
cache::client()->saveState(res);
|
||||
|
||||
olm::handle_to_device_messages(res.to_device.events);
|
||||
|
||||
emit initializeViews(std::move(res.rooms));
|
||||
emit initializeRoomList(cache::roomInfo());
|
||||
emit initializeMentions(cache::getTimelineMentions());
|
||||
|
||||
cache::calculateRoomReadStatus();
|
||||
emit syncTags(cache::roomInfo().toStdMap());
|
||||
} catch (const lmdb::error &e) {
|
||||
nhlog::db()->error("failed to save state after initial sync: {}",
|
||||
e.what());
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
|
||||
emit trySyncCb();
|
||||
emit contentLoaded();
|
||||
});
|
||||
}
|
||||
|
||||
void
|
||||
ChatPage::handleSyncResponse(mtx::responses::Sync res)
|
||||
ChatPage::handleSyncResponse(const mtx::responses::Sync &res)
|
||||
{
|
||||
nhlog::net()->debug("sync completed: {}", res.next_batch);
|
||||
|
||||
|
@ -984,16 +1038,16 @@ ChatPage::handleSyncResponse(mtx::responses::Sync res)
|
|||
|
||||
// TODO: fine grained error handling
|
||||
try {
|
||||
cache::saveState(res);
|
||||
cache::client()->saveState(res);
|
||||
olm::handle_to_device_messages(res.to_device.events);
|
||||
|
||||
auto updates = cache::roomUpdates(res);
|
||||
auto updates = cache::getRoomInfo(cache::client()->roomsWithStateUpdates(res));
|
||||
|
||||
emit syncRoomlist(updates);
|
||||
|
||||
emit syncUI(res.rooms);
|
||||
|
||||
emit syncTags(cache::roomTagUpdates(res));
|
||||
emit syncTags(cache::getRoomInfo(cache::client()->roomsWithTagUpdates(res)));
|
||||
|
||||
// if we process a lot of syncs (1 every 200ms), this means we clean the
|
||||
// db every 100s
|
||||
|
@ -1068,7 +1122,7 @@ ChatPage::joinRoom(const QString &room)
|
|||
const auto room_id = room.toStdString();
|
||||
|
||||
http::client()->join_room(
|
||||
room_id, [this, room_id](const nlohmann::json &, mtx::http::RequestErr err) {
|
||||
room_id, [this, room_id](const mtx::responses::RoomId &, mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
emit showNotification(
|
||||
tr("Failed to join room: %1")
|
||||
|
@ -1114,7 +1168,8 @@ void
|
|||
ChatPage::leaveRoom(const QString &room_id)
|
||||
{
|
||||
http::client()->leave_room(
|
||||
room_id.toStdString(), [this, room_id](const json &, mtx::http::RequestErr err) {
|
||||
room_id.toStdString(),
|
||||
[this, room_id](const mtx::responses::RoomId &, mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
emit showNotification(
|
||||
tr("Failed to leave room: %1")
|
||||
|
@ -1289,62 +1344,6 @@ ChatPage::currentPresence() const
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
ChatPage::initialSyncHandler(const mtx::responses::Sync &res, mtx::http::RequestErr err)
|
||||
{
|
||||
// TODO: Initial Sync should include mentions as well...
|
||||
|
||||
if (err) {
|
||||
const auto error = QString::fromStdString(err->matrix_error.error);
|
||||
const auto msg = tr("Please try to login again: %1").arg(error);
|
||||
const auto err_code = mtx::errors::to_string(err->matrix_error.errcode);
|
||||
const int status_code = static_cast<int>(err->status_code);
|
||||
|
||||
nhlog::net()->error("initial sync error: {} {}", status_code, err_code);
|
||||
|
||||
// non http related errors
|
||||
if (status_code <= 0 || status_code >= 600) {
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (status_code) {
|
||||
case 502:
|
||||
case 504:
|
||||
case 524: {
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
default: {
|
||||
emit dropToLoginPageCb(msg);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nhlog::net()->info("initial sync completed");
|
||||
|
||||
try {
|
||||
cache::saveState(res);
|
||||
|
||||
olm::handle_to_device_messages(res.to_device.events);
|
||||
|
||||
emit initializeViews(std::move(res.rooms));
|
||||
emit initializeRoomList(cache::roomInfo());
|
||||
emit initializeMentions(cache::getTimelineMentions());
|
||||
|
||||
cache::calculateRoomReadStatus();
|
||||
emit syncTags(cache::roomInfo().toStdMap());
|
||||
} catch (const lmdb::error &e) {
|
||||
nhlog::db()->error("failed to save state after initial sync: {}", e.what());
|
||||
startInitialSync();
|
||||
return;
|
||||
}
|
||||
|
||||
emit trySyncCb();
|
||||
emit contentLoaded();
|
||||
}
|
||||
|
||||
void
|
||||
ChatPage::ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts)
|
||||
{
|
||||
|
@ -1453,51 +1452,11 @@ ChatPage::initiateLogout()
|
|||
emit showOverlayProgressBar();
|
||||
}
|
||||
|
||||
void
|
||||
ChatPage::query_keys(const std::string &user_id,
|
||||
std::function<void(const UserKeyCache &, mtx::http::RequestErr)> cb)
|
||||
{
|
||||
auto cache_ = cache::userKeys(user_id);
|
||||
|
||||
if (cache_.has_value()) {
|
||||
if (!cache_->updated_at.empty() && cache_->updated_at == cache_->last_changed) {
|
||||
cb(cache_.value(), {});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
mtx::requests::QueryKeys req;
|
||||
req.device_keys[user_id] = {};
|
||||
|
||||
std::string last_changed;
|
||||
if (cache_)
|
||||
last_changed = cache_->last_changed;
|
||||
req.token = last_changed;
|
||||
|
||||
http::client()->query_keys(req,
|
||||
[cb, user_id, last_changed](const mtx::responses::QueryKeys &res,
|
||||
mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->warn(
|
||||
"failed to query device keys: {},{}",
|
||||
err->matrix_error.errcode,
|
||||
static_cast<int>(err->status_code));
|
||||
cb({}, err);
|
||||
return;
|
||||
}
|
||||
|
||||
cache::updateUserKeys(last_changed, res);
|
||||
|
||||
auto keys = cache::userKeys(user_id);
|
||||
cb(keys.value_or(UserKeyCache{}), err);
|
||||
});
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void
|
||||
ChatPage::connectCallMessage()
|
||||
{
|
||||
connect(&callManager_,
|
||||
connect(callManager_,
|
||||
qOverload<const QString &, const T &>(&CallManager::newMessage),
|
||||
view_manager_,
|
||||
qOverload<const QString &, const T &>(&TimelineViewManager::queueCallMessage));
|
||||
|
|
|
@ -23,9 +23,10 @@
|
|||
#include <variant>
|
||||
|
||||
#include <mtx/common.hpp>
|
||||
#include <mtx/requests.hpp>
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtxclient/http/errors.hpp>
|
||||
#include <mtx/events.hpp>
|
||||
#include <mtx/events/encrypted.hpp>
|
||||
#include <mtx/events/member.hpp>
|
||||
#include <mtx/events/presence.hpp>
|
||||
|
||||
#include <QFrame>
|
||||
#include <QHBoxLayout>
|
||||
|
@ -37,11 +38,8 @@
|
|||
|
||||
#include "CacheCryptoStructs.h"
|
||||
#include "CacheStructs.h"
|
||||
#include "CallManager.h"
|
||||
#include "CommunitiesList.h"
|
||||
#include "Utils.h"
|
||||
#include "notifications/Manager.h"
|
||||
#include "popups/UserMentions.h"
|
||||
|
||||
class OverlayModal;
|
||||
class QuickSwitcher;
|
||||
|
@ -54,13 +52,25 @@ class UserInfoWidget;
|
|||
class UserSettings;
|
||||
class NotificationsManager;
|
||||
class TimelineModel;
|
||||
class CallManager;
|
||||
|
||||
constexpr int CONSENSUS_TIMEOUT = 1000;
|
||||
constexpr int SHOW_CONTENT_TIMEOUT = 3000;
|
||||
constexpr int TYPING_REFRESH_TIMEOUT = 10000;
|
||||
|
||||
namespace mtx::http {
|
||||
using RequestErr = const std::optional<mtx::http::ClientError> &;
|
||||
namespace mtx::requests {
|
||||
struct CreateRoom;
|
||||
}
|
||||
namespace mtx::responses {
|
||||
struct Notifications;
|
||||
struct Sync;
|
||||
struct Timeline;
|
||||
struct Rooms;
|
||||
struct LeftRoom;
|
||||
}
|
||||
|
||||
namespace popups {
|
||||
class UserMentions;
|
||||
}
|
||||
|
||||
class ChatPage : public QWidget
|
||||
|
@ -89,8 +99,6 @@ public:
|
|||
//! Show the room/group list (if it was visible).
|
||||
void showSideBars();
|
||||
void initiateLogout();
|
||||
void query_keys(const std::string &req,
|
||||
std::function<void(const UserKeyCache &, mtx::http::RequestErr)> cb);
|
||||
void focusMessageInput();
|
||||
|
||||
QString status() const;
|
||||
|
@ -145,7 +153,7 @@ signals:
|
|||
void trySyncCb();
|
||||
void tryDelayedSyncCb();
|
||||
void tryInitialSyncCb();
|
||||
void newSyncResponse(mtx::responses::Sync res);
|
||||
void newSyncResponse(const mtx::responses::Sync &res);
|
||||
void leftRoom(const QString &room_id);
|
||||
|
||||
void initializeRoomList(QMap<QString, RoomInfo>);
|
||||
|
@ -194,14 +202,11 @@ private slots:
|
|||
|
||||
void joinRoom(const QString &room);
|
||||
void sendTypingNotifications();
|
||||
void handleSyncResponse(mtx::responses::Sync res);
|
||||
void handleSyncResponse(const mtx::responses::Sync &res);
|
||||
|
||||
private:
|
||||
static ChatPage *instance_;
|
||||
|
||||
//! Handler callback for initial sync. It doesn't run on the main thread so all
|
||||
//! communication with the GUI should be done through signals.
|
||||
void initialSyncHandler(const mtx::responses::Sync &res, mtx::http::RequestErr err);
|
||||
void startInitialSync();
|
||||
void tryInitialSync();
|
||||
void trySync();
|
||||
|
@ -276,7 +281,7 @@ private:
|
|||
QSharedPointer<UserSettings> userSettings_;
|
||||
|
||||
NotificationsManager notificationsManager;
|
||||
CallManager callManager_;
|
||||
CallManager *callManager_;
|
||||
};
|
||||
|
||||
template<class Collection>
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#include "Splitter.h"
|
||||
|
||||
#include <mtx/responses/groups.hpp>
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <QLabel>
|
||||
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
#include "DeviceVerificationFlow.h"
|
||||
|
||||
#include "Cache.h"
|
||||
#include "Cache_p.h"
|
||||
#include "ChatPage.h"
|
||||
#include "Logging.h"
|
||||
#include "Utils.h"
|
||||
#include "timeline/TimelineModel.h"
|
||||
|
||||
#include <QDateTime>
|
||||
|
@ -39,7 +41,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
|
|||
|
||||
auto user_id = userID.toStdString();
|
||||
this->toClient = mtx::identifiers::parse<mtx::identifiers::User>(user_id);
|
||||
ChatPage::instance()->query_keys(
|
||||
cache::client()->query_keys(
|
||||
user_id, [user_id, this](const UserKeyCache &res, mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
nhlog::net()->warn("failed to query device keys: {},{}",
|
||||
|
@ -57,7 +59,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
|
|||
this->their_keys = res;
|
||||
});
|
||||
|
||||
ChatPage::instance()->query_keys(
|
||||
cache::client()->query_keys(
|
||||
http::client()->user_id().to_string(),
|
||||
[this](const UserKeyCache &res, mtx::http::RequestErr err) {
|
||||
if (err) {
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include <QObject>
|
||||
|
||||
#include <mtx/responses/crypto.hpp>
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include "CacheCryptoStructs.h"
|
||||
#include "Logging.h"
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include "EventAccessors.h"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <type_traits>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include <QShortcut>
|
||||
|
||||
#include <mtx/requests.hpp>
|
||||
#include <mtx/responses/login.hpp>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "ChatPage.h"
|
||||
|
@ -54,8 +55,8 @@
|
|||
MainWindow *MainWindow::instance_ = nullptr;
|
||||
|
||||
MainWindow::MainWindow(const QString profile, QWidget *parent)
|
||||
: QMainWindow(parent),
|
||||
profile_{ profile }
|
||||
: QMainWindow(parent)
|
||||
, profile_{profile}
|
||||
{
|
||||
setWindowTitle(0);
|
||||
setObjectName("MainWindow");
|
||||
|
@ -104,8 +105,7 @@ MainWindow::MainWindow(const QString profile, QWidget *parent)
|
|||
connect(chat_page_, &ChatPage::closing, this, &MainWindow::showWelcomePage);
|
||||
connect(
|
||||
chat_page_, &ChatPage::showOverlayProgressBar, this, &MainWindow::showOverlayProgressBar);
|
||||
connect(
|
||||
chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle);
|
||||
connect(chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle);
|
||||
connect(chat_page_, SIGNAL(unreadMessages(int)), trayIcon_, SLOT(setUnreadCount(int)));
|
||||
connect(chat_page_, &ChatPage::showLoginPage, this, [this](const QString &msg) {
|
||||
login_page_->loginError(msg);
|
||||
|
@ -185,8 +185,7 @@ MainWindow::setWindowTitle(int notificationCount)
|
|||
QString name = "nheko";
|
||||
if (!profile_.isEmpty())
|
||||
name += " | " + profile_;
|
||||
if (notificationCount > 0)
|
||||
{
|
||||
if (notificationCount > 0) {
|
||||
name.append(QString{" (%1)"}.arg(notificationCount));
|
||||
}
|
||||
QMainWindow::setWindowTitle(name);
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include "MxcImageProvider.h"
|
||||
|
||||
#include <mtxclient/crypto/client.hpp>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "Logging.h"
|
||||
#include "MatrixClient.h"
|
||||
|
|
20
src/Olm.cpp
20
src/Olm.cpp
|
@ -1,6 +1,7 @@
|
|||
#include "Olm.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <variant>
|
||||
|
||||
#include "Cache.h"
|
||||
|
@ -20,6 +21,21 @@ auto client_ = std::make_unique<mtx::crypto::OlmClient>();
|
|||
}
|
||||
|
||||
namespace olm {
|
||||
void
|
||||
from_json(const nlohmann::json &obj, OlmMessage &msg)
|
||||
{
|
||||
if (obj.at("type") != "m.room.encrypted")
|
||||
throw std::invalid_argument("invalid type for olm message");
|
||||
|
||||
if (obj.at("content").at("algorithm") != OLM_ALGO)
|
||||
throw std::invalid_argument("invalid algorithm for olm message");
|
||||
|
||||
msg.sender = obj.at("sender");
|
||||
msg.sender_key = obj.at("content").at("sender_key");
|
||||
msg.ciphertext = obj.at("content")
|
||||
.at("ciphertext")
|
||||
.get<std::map<std::string, mtx::events::msg::OlmCipherContent>>();
|
||||
}
|
||||
|
||||
mtx::crypto::OlmClient *
|
||||
client()
|
||||
|
@ -419,8 +435,8 @@ send_key_request_for(mtx::events::EncryptedEvent<mtx::events::msg::Encrypted> e,
|
|||
e.content.session_id);
|
||||
|
||||
mtx::events::msg::KeyRequest request;
|
||||
request.action = !cancel ? mtx::events::msg::RequestAction::Request
|
||||
: mtx::events::msg::RequestAction::Cancellation;
|
||||
request.action = !cancel ? mtx::events::msg::RequestAction::Request
|
||||
: mtx::events::msg::RequestAction::Cancellation;
|
||||
request.algorithm = MEGOLM_ALGO;
|
||||
request.room_id = e.room_id;
|
||||
request.sender_key = e.content.sender_key;
|
||||
|
|
17
src/Olm.h
17
src/Olm.h
|
@ -40,21 +40,8 @@ struct OlmMessage
|
|||
std::map<RecipientKey, mtx::events::msg::OlmCipherContent> ciphertext;
|
||||
};
|
||||
|
||||
inline void
|
||||
from_json(const nlohmann::json &obj, OlmMessage &msg)
|
||||
{
|
||||
if (obj.at("type") != "m.room.encrypted")
|
||||
throw std::invalid_argument("invalid type for olm message");
|
||||
|
||||
if (obj.at("content").at("algorithm") != OLM_ALGO)
|
||||
throw std::invalid_argument("invalid algorithm for olm message");
|
||||
|
||||
msg.sender = obj.at("sender");
|
||||
msg.sender_key = obj.at("content").at("sender_key");
|
||||
msg.ciphertext = obj.at("content")
|
||||
.at("ciphertext")
|
||||
.get<std::map<std::string, mtx::events::msg::OlmCipherContent>>();
|
||||
}
|
||||
void
|
||||
from_json(const nlohmann::json &obj, OlmMessage &msg);
|
||||
|
||||
mtx::crypto::OlmClient *
|
||||
client();
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <QSharedPointer>
|
||||
#include <QWidget>
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtx/responses/sync.hpp>
|
||||
|
||||
#include "CacheStructs.h"
|
||||
#include "UserSettingsPage.h"
|
||||
|
|
|
@ -453,8 +453,8 @@ FilteredTextEdit::completerRect()
|
|||
auto item_height = completer_->popup()->sizeHintForRow(0);
|
||||
auto max_height = item_height * completer_->maxVisibleItems();
|
||||
auto height = (completer_->completionCount() > completer_->maxVisibleItems())
|
||||
? max_height
|
||||
: completer_->completionCount() * item_height;
|
||||
? max_height
|
||||
: completer_->completionCount() * item_height;
|
||||
rect.setWidth(completer_->popup()->sizeHintForColumn(0));
|
||||
rect.moveBottom(-height);
|
||||
return rect;
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include <QApplication>
|
||||
#include <QComboBox>
|
||||
#include <QCoreApplication>
|
||||
#include <QFileDialog>
|
||||
#include <QFontComboBox>
|
||||
#include <QFormLayout>
|
||||
|
@ -36,7 +37,6 @@
|
|||
#include <QString>
|
||||
#include <QTextStream>
|
||||
#include <QtQml>
|
||||
#include <QCoreApplication>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "Config.h"
|
||||
|
@ -450,7 +450,8 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
|
|||
|
||||
auto versionInfo = new QLabel(QString("%1 | %2").arg(nheko::version).arg(nheko::build_os));
|
||||
if (QCoreApplication::applicationName() != "nheko")
|
||||
versionInfo->setText(versionInfo->text() + " | " + tr("profile: %1").arg(QCoreApplication::applicationName()));
|
||||
versionInfo->setText(versionInfo->text() + " | " +
|
||||
tr("profile: %1").arg(QCoreApplication::applicationName()));
|
||||
versionInfo->setTextInteractionFlags(Qt::TextBrowserInteraction);
|
||||
|
||||
topBarLayout_ = new QHBoxLayout;
|
||||
|
@ -904,11 +905,7 @@ UserSettingsPage::importSessionKeys()
|
|||
auto sessions =
|
||||
mtx::crypto::decrypt_exported_sessions(payload, password.toStdString());
|
||||
cache::importSessionKeys(std::move(sessions));
|
||||
} catch (const mtx::crypto::sodium_exception &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
} catch (const lmdb::error &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
} catch (const nlohmann::json::exception &e) {
|
||||
} catch (const std::exception &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
}
|
||||
}
|
||||
|
@ -956,11 +953,7 @@ UserSettingsPage::exportSessionKeys()
|
|||
QTextStream out(&file);
|
||||
out << prefix << newline << b64 << newline << suffix;
|
||||
file.close();
|
||||
} catch (const mtx::crypto::sodium_exception &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
} catch (const lmdb::error &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
} catch (const nlohmann::json::exception &e) {
|
||||
} catch (const std::exception &e) {
|
||||
QMessageBox::warning(this, tr("Error"), e.what());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -638,7 +638,7 @@ utils::luminance(const QColor &col)
|
|||
qreal lumRgb[3];
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
qreal v = colRgb[i] / 255.0;
|
||||
qreal v = colRgb[i] / 255.0;
|
||||
v <= 0.03928 ? lumRgb[i] = v / 12.92 : lumRgb[i] = qPow((v + 0.055) / 1.055, 2.4);
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
#include <QVBoxLayout>
|
||||
|
||||
#include "dialogs/RoomSettings.h"
|
||||
#include <mtx/responses/common.hpp>
|
||||
#include <mtx/responses/media.hpp>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "ChatPage.h"
|
||||
|
|
39
src/main.cpp
39
src/main.cpp
|
@ -107,33 +107,28 @@ main(int argc, char *argv[])
|
|||
// needed for settings so need to register before any settings are read to prevent warnings
|
||||
qRegisterMetaType<UserSettings::Presence>();
|
||||
|
||||
// This is some hacky programming, but it's necessary (AFAIK?) to get the unique config name parsed
|
||||
// before the app name is set.
|
||||
// This is some hacky programming, but it's necessary (AFAIK?) to get the unique config name
|
||||
// parsed before the app name is set.
|
||||
QString appName{"nheko"};
|
||||
for (int i = 0; i < argc; ++i)
|
||||
{
|
||||
if (QString{argv[i]}.startsWith("--profile="))
|
||||
{
|
||||
for (int i = 0; i < argc; ++i) {
|
||||
if (QString{argv[i]}.startsWith("--profile=")) {
|
||||
QString q{argv[i]};
|
||||
q.remove("--profile=");
|
||||
appName += "-" + q;
|
||||
}
|
||||
else if (QString{argv[i]}.startsWith("--p="))
|
||||
{
|
||||
} else if (QString{argv[i]}.startsWith("--p=")) {
|
||||
QString q{argv[i]};
|
||||
q.remove("-p=");
|
||||
appName += "-" + q;
|
||||
}
|
||||
else if (QString{argv[i]} == "--profile" || QString{argv[i]} == "-p")
|
||||
{
|
||||
if (i < argc -1) // if i is less than argc - 1, we still have a parameter left to process as the name
|
||||
} else if (QString{argv[i]} == "--profile" || QString{argv[i]} == "-p") {
|
||||
if (i < argc - 1) // if i is less than argc - 1, we still have a parameter
|
||||
// left to process as the name
|
||||
{
|
||||
++i; // the next arg is the name, so increment
|
||||
appName += "-" + QString {argv[i]};
|
||||
appName += "-" + QString{argv[i]};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QCoreApplication::setApplicationName(appName);
|
||||
QCoreApplication::setApplicationVersion(nheko::version);
|
||||
QCoreApplication::setOrganizationName("nheko");
|
||||
|
@ -168,11 +163,15 @@ main(int argc, char *argv[])
|
|||
// This option is not actually parsed via Qt due to the need to parse it before the app
|
||||
// name is set. It only exists to keep Qt from complaining about the --profile/-p
|
||||
// option and thereby crashing the app.
|
||||
QCommandLineOption configName(QStringList() << "p" << "profile",
|
||||
QCoreApplication::tr("Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko."),
|
||||
QCoreApplication::tr("profile"), QCoreApplication::tr("profile name"));
|
||||
QCommandLineOption configName(
|
||||
QStringList() << "p"
|
||||
<< "profile",
|
||||
QCoreApplication::tr("Create a unique profile, which allows you to log into several "
|
||||
"accounts at the same time and start multiple instances of nheko."),
|
||||
QCoreApplication::tr("profile"),
|
||||
QCoreApplication::tr("profile name"));
|
||||
parser.addOption(configName);
|
||||
|
||||
|
||||
parser.process(app);
|
||||
|
||||
app.setWindowIcon(QIcon(":/logos/nheko.png"));
|
||||
|
@ -217,7 +216,7 @@ main(int argc, char *argv[])
|
|||
appTranslator.load(QLocale(), "nheko", "_", ":/translations");
|
||||
app.installTranslator(&appTranslator);
|
||||
|
||||
MainWindow w{ (appName == "nheko" ? "" : appName.remove("nheko-")) };
|
||||
MainWindow w{(appName == "nheko" ? "" : appName.remove("nheko-"))};
|
||||
|
||||
// Move the MainWindow to the center
|
||||
w.move(screenCenter(w.width(), w.height()));
|
||||
|
|
|
@ -19,6 +19,12 @@ SuggestionsPopup::SuggestionsPopup(QWidget *parent)
|
|||
layout_->setSpacing(0);
|
||||
}
|
||||
|
||||
QString
|
||||
SuggestionsPopup::displayName(QString room, QString user)
|
||||
{
|
||||
return cache::displayName(room, user);
|
||||
}
|
||||
|
||||
void
|
||||
SuggestionsPopup::addRooms(const std::vector<RoomSearchResult> &rooms)
|
||||
{
|
||||
|
|
|
@ -22,7 +22,7 @@ public:
|
|||
|
||||
const auto &widget = qobject_cast<Item *>(item->widget());
|
||||
emit itemSelected(
|
||||
cache::displayName(ChatPage::instance()->currentRoom(), widget->selectedText()));
|
||||
displayName(ChatPage::instance()->currentRoom(), widget->selectedText()));
|
||||
|
||||
resetSelection();
|
||||
}
|
||||
|
@ -47,6 +47,7 @@ signals:
|
|||
void itemSelected(const QString &user);
|
||||
|
||||
private:
|
||||
QString displayName(QString roomid, QString userid);
|
||||
void hoverSelection();
|
||||
void resetSelection() { selectedItem_ = -1; }
|
||||
void selectFirstItem() { selectedItem_ = 0; }
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtx/responses/notifications.hpp>
|
||||
|
||||
#include <QMap>
|
||||
#include <QString>
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
#include <QThread>
|
||||
#include <QTimer>
|
||||
|
||||
#include <mtx/responses/common.hpp>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "Cache_p.h"
|
||||
#include "ChatPage.h"
|
||||
|
@ -10,6 +12,7 @@
|
|||
#include "Logging.h"
|
||||
#include "MatrixClient.h"
|
||||
#include "Olm.h"
|
||||
#include "Utils.h"
|
||||
|
||||
Q_DECLARE_METATYPE(Reaction)
|
||||
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "ChatPage.h"
|
||||
#include "ColorImageProvider.h"
|
||||
#include "DelegateChooser.h"
|
||||
#include "DeviceVerificationFlow.h"
|
||||
#include "Logging.h"
|
||||
#include "MainWindow.h"
|
||||
#include "MatrixClient.h"
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
#include <QWidget>
|
||||
|
||||
#include <mtx/common.hpp>
|
||||
#include <mtx/responses.hpp>
|
||||
#include <mtx/responses/messages.hpp>
|
||||
#include <mtx/responses/sync.hpp>
|
||||
|
||||
#include "Cache.h"
|
||||
#include "CallManager.h"
|
||||
#include "DeviceVerificationFlow.h"
|
||||
#include "Logging.h"
|
||||
#include "TimelineModel.h"
|
||||
#include "Utils.h"
|
||||
|
@ -24,6 +24,7 @@ class BlurhashProvider;
|
|||
class ColorImageProvider;
|
||||
class UserSettings;
|
||||
class ChatPage;
|
||||
class DeviceVerificationFlow;
|
||||
|
||||
class TimelineViewManager : public QObject
|
||||
{
|
||||
|
|
|
@ -117,7 +117,7 @@ UserProfile::fetchDeviceList(const QString &userID)
|
|||
{
|
||||
auto localUser = utils::localUser();
|
||||
|
||||
ChatPage::instance()->query_keys(
|
||||
cache::client()->query_keys(
|
||||
userID.toStdString(),
|
||||
[other_user_id = userID.toStdString(), this](const UserKeyCache &other_user_keys,
|
||||
mtx::http::RequestErr err) {
|
||||
|
@ -129,7 +129,7 @@ UserProfile::fetchDeviceList(const QString &userID)
|
|||
}
|
||||
|
||||
// Finding if the User is Verified or not based on the Signatures
|
||||
ChatPage::instance()->query_keys(
|
||||
cache::client()->query_keys(
|
||||
utils::localUser().toStdString(),
|
||||
[other_user_id, other_user_keys, this](const UserKeyCache &res,
|
||||
mtx::http::RequestErr err) {
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
#include <QString>
|
||||
#include <QVector>
|
||||
|
||||
#include "MatrixClient.h"
|
||||
|
||||
namespace verification {
|
||||
Q_NAMESPACE
|
||||
|
||||
|
@ -116,8 +114,4 @@ private:
|
|||
bool isUserVerified = false;
|
||||
TimelineViewManager *manager;
|
||||
TimelineModel *model;
|
||||
|
||||
void callback_fn(const mtx::responses::QueryKeys &res,
|
||||
mtx::http::RequestErr err,
|
||||
std::string user_id);
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue