mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Linted code

Browse Source
pull/659/head
kamathmanu 3 years ago
parent 93f8c24fc5
commit 04d0d413e3
3 changed files with 169 additions and 161 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 54
      src/RoomDirectoryModel.cpp
  2. 20
      src/RoomDirectoryModel.h

54
src/RoomDirectoryModel.cpp
Unescape View File

@ -12,7 +12,11 @@ RoomDirectoryModel::RoomDirectoryModel(QObject *parent, const std::string &s)
, server_(s)
, canFetchMore_(true)
{
connect(this, &RoomDirectoryModel::fetchedRoomsBatch, this, &RoomDirectoryModel::displayRooms, Qt::QueuedConnection);
connect(this,
&RoomDirectoryModel::fetchedRoomsBatch,
this,
&RoomDirectoryModel::displayRooms,
Qt::QueuedConnection);
}
QHash<int, QByteArray>
@ -24,7 +28,8 @@ RoomDirectoryModel::roleNames() const
{Roles::AvatarUrl, "avatarUrl"},
{Roles::Topic, "topic"},
{Roles::MemberCount, "numMembers"},
{Roles::Previewable, "canPreview"},};
{Roles::Previewable, "canPreview"},
};
}
void
@ -36,7 +41,7 @@ RoomDirectoryModel::resetDisplayedData()
nextBatch_ = "";
canFetchMore_ = true;
beginRemoveRows(QModelIndex(), 0 , static_cast<int> (publicRoomsData_.size()));
beginRemoveRows(QModelIndex(), 0, static_cast<int>(publicRoomsData_.size()));
publicRoomsData_.clear();
endRemoveRows();
@ -70,8 +75,8 @@ RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
vias.reserve(aliases.size());
std::transform(aliases.begin(), aliases.end(),
std::back_inserter(vias), [](const auto &alias) {
std::transform(
aliases.begin(), aliases.end(), std::back_inserter(vias), [](const auto &alias) {
const auto roomAliasDelimiter = ":";
return alias.substr(alias.find(roomAliasDelimiter) + 1);
});
@ -82,8 +87,7 @@ RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
void
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];
nhlog::ui()->debug("'Joining room {}", chunk.room_id);
ChatPage::instance()->joinRoomVia(chunk.room_id, getViasForRoom(chunk.aliases));
@ -93,11 +97,9 @@ RoomDirectoryModel::joinRoom(const int &index)
QVariant
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()];
switch (role)
{
switch (role) {
case Roles::Name:
return QString::fromStdString(room_chunk.name);
case Roles::Id:
@ -128,28 +130,29 @@ RoomDirectoryModel::fetchMore(const QModelIndex &)
// req.third_party_instance_id = third_party_instance_id;
auto requested_server = server_;
http::client()->post_public_rooms(req, [requested_server, this, req]
(const mtx::responses::PublicRooms &res,
mtx::http::RequestErr err)
{
http::client()->post_public_rooms(
req,
[requested_server, this, req](const mtx::responses::PublicRooms &res,
mtx::http::RequestErr err) {
if (err) {
nhlog::net()->error
("Failed to retrieve rooms from mtxclient - {} - {} - {}",
nhlog::net()->error(
"Failed to retrieve rooms from mtxclient - {} - {} - {}",
mtx::errors::to_string(err->matrix_error.errcode),
err->matrix_error.error,
err->parse_error);
} else if ( req.filter.generic_search_term == this->userSearchString_
&& req.since == this->prevBatch_
&& requested_server == this->server_) {
} else if (req.filter.generic_search_term == this->userSearchString_ &&
req.since == this->prevBatch_ && requested_server == this->server_) {
nhlog::net()->debug("signalling chunk to GUI thread");
emit fetchedRoomsBatch(res.chunk, res.prev_batch, res.next_batch);
}
}, requested_server);
},
requested_server);
}
void
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("NP batch: {} | NN batch: {}", prev_batch, next_batch);
@ -159,8 +162,11 @@ RoomDirectoryModel::displayRooms(std::vector<mtx::responses::PublicRoomsChunk> f
return;
}
beginInsertRows(QModelIndex(), static_cast<int> (publicRoomsData_.size()), static_cast<int> (publicRoomsData_.size() + fetched_rooms.size()) - 1);
this->publicRoomsData_.insert(this->publicRoomsData_.end(), fetched_rooms.begin(), fetched_rooms.end());
beginInsertRows(QModelIndex(),
static_cast<int>(publicRoomsData_.size()),
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()) {

20
src/RoomDirectoryModel.h
Unescape View File

@ -7,12 +7,12 @@
#include <QAbstractListModel>
#include <QHash>
#include <QString>
#include <vector>
#include <string>
#include <vector>
#include "MatrixClient.h"
#include <mtxclient/http/errors.hpp>
#include <mtx/responses/public_rooms.hpp>
#include <mtxclient/http/errors.hpp>
#include "Logging.h"
@ -28,10 +28,10 @@ class RoomDirectoryModel : public QAbstractListModel
Q_OBJECT
public:
explicit RoomDirectoryModel
(QObject *parent = nullptr, const std::string &s = "");
explicit RoomDirectoryModel(QObject *parent = nullptr, const std::string &s = "");
enum Roles {
enum Roles
{
Name = Qt::UserRole,
Id,
AvatarUrl,
@ -45,8 +45,8 @@ public:
inline int rowCount(const QModelIndex &parent = QModelIndex()) const override
{
(void) parent;
return static_cast<int> (publicRoomsData_.size());
(void)parent;
return static_cast<int>(publicRoomsData_.size());
}
inline bool canFetchMore(const QModelIndex &) const override
@ -60,13 +60,15 @@ public:
signals:
void fetchedRoomsBatch(std::vector<mtx::responses::PublicRoomsChunk> rooms,
const std::string &prev_batch, const std::string &next_batch);
const std::string &prev_batch,
const std::string &next_batch);
void serverChanged();
void searchTermEntered();
public slots:
void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms,
const std::string &prev, const std::string &next);
const std::string &prev,
const std::string &next);
void setMatrixServer(const QString &s = "");
void setSearchTerm(const QString &f);

Write Preview
Loading…
Cancel
Save