rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Linted code

This commit is contained in:
kamathmanu 2021-07-28 22:33:23 -04:00
parent 93f8c24fc5
commit 04d0d413e3
3 changed files with 157 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
src/RoomDirectoryModel.cpp
View File

@ -8,164 +8,170 @@
#include <algorithm> #include <algorithm>
RoomDirectoryModel::RoomDirectoryModel(QObject *parent, const std::string &s) RoomDirectoryModel::RoomDirectoryModel(QObject *parent, const std::string &s)
: QAbstractListModel(parent) : QAbstractListModel(parent)
, server_(s) , server_(s)
, canFetchMore_(true) , canFetchMore_(true)
{ {
connect(this, &RoomDirectoryModel::fetchedRoomsBatch, this, &RoomDirectoryModel::displayRooms, Qt::QueuedConnection); connect(this,
&RoomDirectoryModel::fetchedRoomsBatch,
this,
&RoomDirectoryModel::displayRooms,
Qt::QueuedConnection);
} }
QHash<int, QByteArray> QHash<int, QByteArray>
RoomDirectoryModel::roleNames() const RoomDirectoryModel::roleNames() const
{ {
return { return {
{Roles::Name, "name"}, {Roles::Name, "name"},
{Roles::Id, "roomid"}, {Roles::Id, "roomid"},
{Roles::AvatarUrl, "avatarUrl"}, {Roles::AvatarUrl, "avatarUrl"},
{Roles::Topic, "topic"}, {Roles::Topic, "topic"},
{Roles::MemberCount, "numMembers"}, {Roles::MemberCount, "numMembers"},
{Roles::Previewable, "canPreview"},}; {Roles::Previewable, "canPreview"},
};
} }
void void
RoomDirectoryModel::resetDisplayedData() RoomDirectoryModel::resetDisplayedData()
{ {
beginResetModel(); beginResetModel();
prevBatch_ = ""; prevBatch_ = "";
nextBatch_ = ""; nextBatch_ = "";
canFetchMore_ = true; canFetchMore_ = true;
beginRemoveRows(QModelIndex(), 0 , static_cast<int> (publicRoomsData_.size())); beginRemoveRows(QModelIndex(), 0, static_cast<int>(publicRoomsData_.size()));
publicRoomsData_.clear(); publicRoomsData_.clear();
endRemoveRows(); endRemoveRows();
endResetModel(); endResetModel();
} }
void void
RoomDirectoryModel::setMatrixServer(const QString &s) RoomDirectoryModel::setMatrixServer(const QString &s)
{ {
server_ = s.toStdString(); server_ = s.toStdString();
nhlog::ui()->debug("Received matrix server: {}", server_); nhlog::ui()->debug("Received matrix server: {}", server_);
resetDisplayedData(); resetDisplayedData();
} }
void void
RoomDirectoryModel::setSearchTerm(const QString &f) RoomDirectoryModel::setSearchTerm(const QString &f)
{ {
userSearchString_ = f.toStdString(); userSearchString_ = f.toStdString();
nhlog::ui()->debug("Received user query: {}", userSearchString_); nhlog::ui()->debug("Received user query: {}", userSearchString_);
resetDisplayedData(); resetDisplayedData();
} }
std::vector<std::string> std::vector<std::string>
RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases) RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
{ {
std::vector<std::string> vias; std::vector<std::string> vias;
vias.reserve(aliases.size());
std::transform(aliases.begin(), aliases.end(), vias.reserve(aliases.size());
std::back_inserter(vias), [](const auto &alias) {
const auto roomAliasDelimiter = ":";
return alias.substr(alias.find(roomAliasDelimiter) + 1);
});
return vias; std::transform(
aliases.begin(), aliases.end(), std::back_inserter(vias), [](const auto &alias) {
const auto roomAliasDelimiter = ":";
return alias.substr(alias.find(roomAliasDelimiter) + 1);
});
return vias;
} }
void void
RoomDirectoryModel::joinRoom(const int &index) RoomDirectoryModel::joinRoom(const int &index)
{ {
if (index >= 0 && static_cast<size_t> (index) < publicRoomsData_.size()) if (index >= 0 && static_cast<size_t>(index) < publicRoomsData_.size()) {
{ const auto &chunk = publicRoomsData_[index];
const auto &chunk = publicRoomsData_[index]; nhlog::ui()->debug("'Joining room {}", chunk.room_id);
nhlog::ui()->debug("'Joining room {}", chunk.room_id); ChatPage::instance()->joinRoomVia(chunk.room_id, getViasForRoom(chunk.aliases));
ChatPage::instance()->joinRoomVia(chunk.room_id, getViasForRoom(chunk.aliases)); }
}
} }
QVariant QVariant
RoomDirectoryModel::data(const QModelIndex &index, int role) const RoomDirectoryModel::data(const QModelIndex &index, int role) const
{ {
if (hasIndex(index.row(), index.column(), index.parent())) if (hasIndex(index.row(), index.column(), index.parent())) {
{ const auto &room_chunk = publicRoomsData_[index.row()];
const auto &room_chunk = publicRoomsData_[index.row()]; switch (role) {
switch (role) case Roles::Name:
{ return QString::fromStdString(room_chunk.name);
case Roles::Name: case Roles::Id:
return QString::fromStdString(room_chunk.name); return QString::fromStdString(room_chunk.room_id);
case Roles::Id: case Roles::AvatarUrl:
return QString::fromStdString(room_chunk.room_id); return QString::fromStdString(room_chunk.avatar_url);
case Roles::AvatarUrl: case Roles::Topic:
return QString::fromStdString(room_chunk.avatar_url); return QString::fromStdString(room_chunk.topic);
case Roles::Topic: case Roles::MemberCount:
return QString::fromStdString(room_chunk.topic); return QVariant::fromValue(room_chunk.num_joined_members);
case Roles::MemberCount: case Roles::Previewable:
return QVariant::fromValue(room_chunk.num_joined_members); return QVariant::fromValue(room_chunk.world_readable);
case Roles::Previewable: }
return QVariant::fromValue(room_chunk.world_readable);
} }
} return {};
return {};
} }
void void
RoomDirectoryModel::fetchMore(const QModelIndex &) RoomDirectoryModel::fetchMore(const QModelIndex &)
{ {
nhlog::net()->debug("Fetching more rooms from mtxclient..."); nhlog::net()->debug("Fetching more rooms from mtxclient...");
nhlog::net()->debug("Prev batch: {} | Next batch: {}", prevBatch_, nextBatch_); nhlog::net()->debug("Prev batch: {} | Next batch: {}", prevBatch_, nextBatch_);
mtx::requests::PublicRooms req; mtx::requests::PublicRooms req;
req.limit = limit_; req.limit = limit_;
req.since = prevBatch_; req.since = prevBatch_;
req.filter.generic_search_term = userSearchString_; req.filter.generic_search_term = userSearchString_;
// req.third_party_instance_id = third_party_instance_id; // req.third_party_instance_id = third_party_instance_id;
auto requested_server = server_; auto requested_server = server_;
http::client()->post_public_rooms(req, [requested_server, this, req] http::client()->post_public_rooms(
(const mtx::responses::PublicRooms &res, req,
mtx::http::RequestErr err) [requested_server, this, req](const mtx::responses::PublicRooms &res,
{ mtx::http::RequestErr err) {
if (err) { if (err) {
nhlog::net()->error nhlog::net()->error(
("Failed to retrieve rooms from mtxclient - {} - {} - {}", "Failed to retrieve rooms from mtxclient - {} - {} - {}",
mtx::errors::to_string(err->matrix_error.errcode), mtx::errors::to_string(err->matrix_error.errcode),
err->matrix_error.error, err->matrix_error.error,
err->parse_error); err->parse_error);
} else if ( req.filter.generic_search_term == this->userSearchString_ } else if (req.filter.generic_search_term == this->userSearchString_ &&
&& req.since == this->prevBatch_ req.since == this->prevBatch_ && requested_server == this->server_) {
&& requested_server == this->server_) { nhlog::net()->debug("signalling chunk to GUI thread");
nhlog::net()->debug("signalling chunk to GUI thread"); emit fetchedRoomsBatch(res.chunk, res.prev_batch, res.next_batch);
emit fetchedRoomsBatch(res.chunk, res.prev_batch, res.next_batch); }
} },
}, requested_server); requested_server);
} }
void void
RoomDirectoryModel::displayRooms(std::vector<mtx::responses::PublicRoomsChunk> fetched_rooms, RoomDirectoryModel::displayRooms(std::vector<mtx::responses::PublicRoomsChunk> fetched_rooms,
const std::string &prev_batch, const std::string &next_batch) const std::string &prev_batch,
const std::string &next_batch)
{ {
nhlog::net()->debug("Prev batch: {} | Next batch: {}", prevBatch_, nextBatch_); nhlog::net()->debug("Prev batch: {} | Next batch: {}", prevBatch_, nextBatch_);
nhlog::net()->debug("NP batch: {} | NN batch: {}", prev_batch, next_batch); nhlog::net()->debug("NP batch: {} | NN batch: {}", prev_batch, next_batch);
if (fetched_rooms.empty()) { if (fetched_rooms.empty()) {
nhlog::net()->error("mtxclient helper thread yielded empty chunk!"); nhlog::net()->error("mtxclient helper thread yielded empty chunk!");
return; return;
} }
beginInsertRows(QModelIndex(), static_cast<int> (publicRoomsData_.size()), static_cast<int> (publicRoomsData_.size() + fetched_rooms.size()) - 1); beginInsertRows(QModelIndex(),
this->publicRoomsData_.insert(this->publicRoomsData_.end(), fetched_rooms.begin(), fetched_rooms.end()); static_cast<int>(publicRoomsData_.size()),
endInsertRows(); static_cast<int>(publicRoomsData_.size() + fetched_rooms.size()) - 1);
this->publicRoomsData_.insert(
this->publicRoomsData_.end(), fetched_rooms.begin(), fetched_rooms.end());
endInsertRows();
if (next_batch.empty()) { if (next_batch.empty()) {
canFetchMore_ = false; canFetchMore_ = false;
} }
prevBatch_ = std::exchange(nextBatch_, next_batch); prevBatch_ = std::exchange(nextBatch_, next_batch);
} }

94
src/RoomDirectoryModel.h
View File

@ -7,12 +7,12 @@
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QHash> #include <QHash>
#include <QString> #include <QString>
#include <vector>
#include <string> #include <string>
#include <vector>
#include "MatrixClient.h" #include "MatrixClient.h"
#include <mtxclient/http/errors.hpp>
#include <mtx/responses/public_rooms.hpp> #include <mtx/responses/public_rooms.hpp>
#include <mtxclient/http/errors.hpp>
#include "Logging.h" #include "Logging.h"
@ -25,61 +25,63 @@ struct PublicRooms;
class RoomDirectoryModel : public QAbstractListModel class RoomDirectoryModel : public QAbstractListModel
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit RoomDirectoryModel explicit RoomDirectoryModel(QObject *parent = nullptr, const std::string &s = "");
(QObject *parent = nullptr, const std::string &s = "");
enum Roles { enum Roles
Name = Qt::UserRole, {
Id, Name = Qt::UserRole,
AvatarUrl, Id,
Topic, AvatarUrl,
MemberCount, Topic,
Previewable MemberCount,
}; Previewable
QHash<int, QByteArray> roleNames() const override; };
QHash<int, QByteArray> roleNames() const override;
QVariant data(const QModelIndex &index, int role) const override; QVariant data(const QModelIndex &index, int role) const override;
inline int rowCount(const QModelIndex &parent = QModelIndex()) const override inline int rowCount(const QModelIndex &parent = QModelIndex()) const override
{ {
(void) parent; (void)parent;
return static_cast<int> (publicRoomsData_.size()); return static_cast<int>(publicRoomsData_.size());
} }
inline bool canFetchMore(const QModelIndex &) const override inline bool canFetchMore(const QModelIndex &) const override
{ {
nhlog::net()->debug("determining if can fetch more"); nhlog::net()->debug("determining if can fetch more");
return canFetchMore_; return canFetchMore_;
} }
void fetchMore(const QModelIndex &) override; void fetchMore(const QModelIndex &) override;
Q_INVOKABLE void joinRoom(const int &index = -1); Q_INVOKABLE void joinRoom(const int &index = -1);
signals: signals:
void fetchedRoomsBatch(std::vector<mtx::responses::PublicRoomsChunk> rooms, void fetchedRoomsBatch(std::vector<mtx::responses::PublicRoomsChunk> rooms,
const std::string &prev_batch, const std::string &next_batch); const std::string &prev_batch,
void serverChanged(); const std::string &next_batch);
void searchTermEntered(); void serverChanged();
void searchTermEntered();
public slots: public slots:
void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms, void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms,
const std::string &prev, const std::string &next); const std::string &prev,
void setMatrixServer(const QString &s = ""); const std::string &next);
void setSearchTerm(const QString &f); void setMatrixServer(const QString &s = "");
void setSearchTerm(const QString &f);
private: private:
static constexpr size_t limit_ = 50; static constexpr size_t limit_ = 50;
std::string server_;
std::string userSearchString_;
std::string prevBatch_;
std::string nextBatch_;
bool canFetchMore_;
std::vector<mtx::responses::PublicRoomsChunk> publicRoomsData_;
std::vector<std::string> getViasForRoom(const std::vector<std::string> &room); std::string server_;
void resetDisplayedData(); std::string userSearchString_;
std::string prevBatch_;
std::string nextBatch_;
bool canFetchMore_;
std::vector<mtx::responses::PublicRoomsChunk> publicRoomsData_;
std::vector<std::string> getViasForRoom(const std::vector<std::string> &room);
void resetDisplayedData();
}; };

4
src/timeline/TimelineViewManager.cpp
View File

@ -153,7 +153,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
qRegisterMetaType<mtx::events::msg::KeyVerificationStart>(); qRegisterMetaType<mtx::events::msg::KeyVerificationStart>();
qRegisterMetaType<CombinedImagePackModel *>(); qRegisterMetaType<CombinedImagePackModel *>();
qRegisterMetaType<std::vector<mtx::responses::PublicRoomsChunk>>(); qRegisterMetaType<std::vector<mtx::responses::PublicRoomsChunk>>();
qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject, qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
"im.nheko", "im.nheko",
@ -278,7 +278,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
"EmojiCategory", "EmojiCategory",
"Error: Only enums"); "Error: Only enums");
qmlRegisterType<RoomDirectoryModel>( qmlRegisterType<RoomDirectoryModel>(
"im.nheko.RoomDirectoryModel", 1, 0, "RoomDirectoryModel"); "im.nheko.RoomDirectoryModel", 1, 0, "RoomDirectoryModel");
#ifdef USE_QUICK_VIEW #ifdef USE_QUICK_VIEW