adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more stl containers & minor refactorings

Browse Source
remotes/origin/HEAD
Konstantinos Sideris 7 years ago
parent 9eedcd700a
commit 1fad9398fc
16 changed files with 293 additions and 329 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. 4
      include/AvatarProvider.h
  2. 5
      include/Cache.h
  3. 14
      include/ChatPage.h
  4. 25
      include/CommunitiesList.h
  5. 42
      include/Community.h
  6. 4
      include/QuickSwitcher.h
  7. 26
      include/RoomList.h
  8. 12
      include/timeline/TimelineViewManager.h
  9. 24
      src/AvatarProvider.cc
  10. 10
      src/Cache.cc
  11. 120
      src/ChatPage.cc
  12. 50
      src/CommunitiesList.cc
  13. 25
      src/Community.cc
  14. 7
      src/QuickSwitcher.cc
  15. 162
      src/RoomList.cc
  16. 40
      src/timeline/TimelineViewManager.cc

4
include/AvatarProvider.h
Unescape View File

@ -48,6 +48,6 @@ private:
static QSharedPointer<MatrixClient> client_; static QSharedPointer<MatrixClient> client_;
using UserID = QString; using UserID = QString;
static QMap<UserID, AvatarData> avatars_; static std::map<UserID, AvatarData> avatars_;
static QMap<UserID, QList<std::function<void(QImage)>>> toBeResolved_; static std::map<UserID, std::vector<std::function<void(QImage)>>> toBeResolved_;
}; };

5
include/Cache.h
Unescape View File

@ -18,7 +18,6 @@
#pragma once #pragma once
#include <QDir> #include <QDir>
#include <QMap>
#include <json.hpp> #include <json.hpp>
#include <lmdb++.h> #include <lmdb++.h>
#include <mtx/responses.hpp> #include <mtx/responses.hpp>
@ -53,7 +52,7 @@ public:
Cache(const QString &userId, QObject *parent = nullptr); Cache(const QString &userId, QObject *parent = nullptr);
void setState(const QString &nextBatchToken, void setState(const QString &nextBatchToken,
const QMap<QString, QSharedPointer<RoomState>> &states); const std::map<QString, QSharedPointer<RoomState>> &states);
bool isInitialized() const; bool isInitialized() const;
QString nextBatchToken() const; QString nextBatchToken() const;
@ -90,7 +89,7 @@ public:
void saveImage(const QString &url, const QByteArray &data); void saveImage(const QString &url, const QByteArray &data);
signals: signals:
void statesLoaded(QMap<QString, RoomState> states); void statesLoaded(std::map<QString, RoomState> states);
private: private:
void setNextBatchToken(lmdb::txn &txn, const QString &token); void setNextBatchToken(lmdb::txn &txn, const QString &token);

14
include/ChatPage.h
Unescape View File

@ -95,7 +95,7 @@ private:
static ChatPage *instance_; static ChatPage *instance_;
using UserID = QString; using UserID = QString;
using RoomStates = QMap<UserID, QSharedPointer<RoomState>>; using RoomStates = std::map<UserID, QSharedPointer<RoomState>>;
using Membership = mtx::events::StateEvent<mtx::events::state::Member>; using Membership = mtx::events::StateEvent<mtx::events::state::Member>;
using Memberships = std::map<std::string, Membership>; using Memberships = std::map<std::string, Membership>;
@ -105,7 +105,7 @@ private:
void removeLeftRooms(const LeftRooms &rooms); void removeLeftRooms(const LeftRooms &rooms);
void updateJoinedRooms(const JoinedRooms &rooms); void updateJoinedRooms(const JoinedRooms &rooms);
QMap<QString, QSharedPointer<RoomState>> generateMembershipDifference( std::map<QString, QSharedPointer<RoomState>> generateMembershipDifference(
const JoinedRooms &rooms, const JoinedRooms &rooms,
const RoomStates &states) const; const RoomStates &states) const;
@ -160,18 +160,18 @@ private:
QString current_room_; QString current_room_;
QString current_community_; QString current_community_;
QMap<QString, QPixmap> room_avatars_; std::map<QString, QPixmap> roomAvatars_;
QMap<QString, QPixmap> community_avatars_; std::map<QString, QPixmap> community_avatars_;
UserInfoWidget *user_info_widget_; UserInfoWidget *user_info_widget_;
RoomStates roomStates_; RoomStates roomStates_;
QMap<QString, QSharedPointer<RoomSettings>> roomSettings_; std::map<QString, QSharedPointer<RoomSettings>> roomSettings_;
QMap<QString, QSharedPointer<Community>> communityManager_; std::map<QString, QSharedPointer<Community>> communities_;
// Keeps track of the users currently typing on each room. // Keeps track of the users currently typing on each room.
QMap<QString, QList<QString>> typingUsers_; std::map<QString, QList<QString>> typingUsers_;
QTimer *typingRefresher_; QTimer *typingRefresher_;
QSharedPointer<QuickSwitcher> quickSwitcher_; QSharedPointer<QuickSwitcher> quickSwitcher_;

25
include/CommunitiesList.h
Unescape View File

@ -3,7 +3,6 @@
#include <QScrollArea> #include <QScrollArea>
#include <QSharedPointer> #include <QSharedPointer>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget>
#include "CommunitiesListItem.h" #include "CommunitiesListItem.h"
#include "Community.h" #include "Community.h"
@ -16,27 +15,33 @@ class CommunitiesList : public QWidget
public: public:
CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *parent = nullptr); CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *parent = nullptr);
~CommunitiesList();
void setCommunities(const QMap<QString, QSharedPointer<Community>> &communities); void setCommunities(const std::map<QString, QSharedPointer<Community>> &communities);
void clear(); void clear() { communities_.clear(); }
void addCommunity(QSharedPointer<Community> community, const QString &id);
void removeCommunity(const QString &id);
void addCommunity(QSharedPointer<Community> community, const QString &community_id);
void removeCommunity(const QString &community_id);
signals: signals:
void communityChanged(const QString &community_id); void communityChanged(const QString &id);
public slots: public slots:
void updateCommunityAvatar(const QString &community_id, const QPixmap &img); void updateCommunityAvatar(const QString &id, const QPixmap &img);
void highlightSelectedCommunity(const QString &community_id); void highlightSelectedCommunity(const QString &id);
private: private:
//! Check whether or not a community id is currently managed.
bool communityExists(const QString &id)
{
return communities_.find(id) != communities_.end();
}
QVBoxLayout *topLayout_; QVBoxLayout *topLayout_;
QVBoxLayout *contentsLayout_; QVBoxLayout *contentsLayout_;
QWidget *scrollAreaContents_; QWidget *scrollAreaContents_;
QScrollArea *scrollArea_; QScrollArea *scrollArea_;
QMap<QString, QSharedPointer<CommunitiesListItem>> communities_; std::map<QString, QSharedPointer<CommunitiesListItem>> communities_;
QSharedPointer<MatrixClient> client_; QSharedPointer<MatrixClient> client_;
}; };

42
include/Community.h
Unescape View File

@ -13,11 +13,11 @@ public:
void parseProfile(const QJsonObject &profile); void parseProfile(const QJsonObject &profile);
void parseRooms(const QJsonObject &rooms); void parseRooms(const QJsonObject &rooms);
inline QUrl getAvatar() const; QUrl getAvatar() const { return avatar_; }
inline QString getName() const; QString getName() const { return name_; }
inline QString getShortDescription() const; QString getShortDescription() const { return short_description_; }
inline QString getLongDescription() const; QString getLongDescription() const { return long_description_; }
inline const QList<QString> getRoomList() const; std::vector<QString> getRoomList() const { return rooms_; }
private: private:
QUrl avatar_; QUrl avatar_;
@ -25,35 +25,5 @@ private:
QString short_description_; QString short_description_;
QString long_description_; QString long_description_;
QList<QString> rooms_; std::vector<QString> rooms_;
}; };
inline QUrl
Community::getAvatar() const
{
return avatar_;
}
inline QString
Community::getName() const
{
return name_;
}
inline QString
Community::getShortDescription() const
{
return short_description_;
}
inline QString
Community::getLongDescription() const
{
return long_description_;
}
inline const QList<QString>
Community::getRoomList() const
{
return rooms_;
}

4
include/QuickSwitcher.h
Unescape View File

@ -47,7 +47,7 @@ class QuickSwitcher : public QFrame
public: public:
explicit QuickSwitcher(QWidget *parent = nullptr); explicit QuickSwitcher(QWidget *parent = nullptr);
void setRoomList(const QMap<QString, QString> &rooms); void setRoomList(const std::map<QString, QString> &rooms);
signals: signals:
void closing(); void closing();
@ -65,5 +65,5 @@ private:
RoomSearchInput *roomSearch_; RoomSearchInput *roomSearch_;
QCompleter *completer_; QCompleter *completer_;
QMap<QString, QString> rooms_; std::map<QString, QString> rooms_;
}; };

26
include/RoomList.h
Unescape View File

@ -17,7 +17,6 @@
#pragma once #pragma once
#include <QMap>
#include <QPushButton> #include <QPushButton>
#include <QScrollArea> #include <QScrollArea>
#include <QSharedPointer> #include <QSharedPointer>
@ -50,22 +49,22 @@ public:
~RoomList(); ~RoomList();
void setCache(QSharedPointer<Cache> cache) { cache_ = cache; } void setCache(QSharedPointer<Cache> cache) { cache_ = cache; }
void setInitialRooms(const QMap<QString, QSharedPointer<RoomSettings>> &settings, void setInitialRooms(const std::map<QString, QSharedPointer<RoomSettings>> &settings,
const QMap<QString, QSharedPointer<RoomState>> &states); const std::map<QString, QSharedPointer<RoomState>> &states);
void sync(const QMap<QString, QSharedPointer<RoomState>> &states, void sync(const std::map<QString, QSharedPointer<RoomState>> &states,
const QMap<QString, QSharedPointer<RoomSettings>> &settings); const std::map<QString, QSharedPointer<RoomSettings>> &settings);
void syncInvites(const std::map<std::string, mtx::responses::InvitedRoom> &rooms); void syncInvites(const std::map<std::string, mtx::responses::InvitedRoom> &rooms);
void clear(); void clear();
void updateAvatar(const QString &room_id, const QString &url); void updateAvatar(const QString &room_id, const QString &url);
void addRoom(const QMap<QString, QSharedPointer<RoomSettings>> &settings, void addRoom(const QSharedPointer<RoomSettings> &settings,
const QSharedPointer<RoomState> &state, const QSharedPointer<RoomState> &state,
const QString &room_id); const QString &room_id);
void addInvitedRoom(const QString &room_id, const mtx::responses::InvitedRoom &room); void addInvitedRoom(const QString &room_id, const mtx::responses::InvitedRoom &room);
void removeRoom(const QString &room_id, bool reset); void removeRoom(const QString &room_id, bool reset);
void setFilterRooms(bool filterRooms); void setFilterRooms(bool filterRooms);
void setRoomFilter(QList<QString> room_ids); void setRoomFilter(std::vector<QString> room_ids);
signals: signals:
void roomChanged(const QString &room_id); void roomChanged(const QString &room_id);
@ -92,7 +91,14 @@ private slots:
void sortRoomsByLastMessage(); void sortRoomsByLastMessage();
private: private:
//! Return the first non-null room.
std::pair<QString, QSharedPointer<RoomInfoListItem>> firstRoom() const;
void calculateUnreadMessageCount(); void calculateUnreadMessageCount();
bool roomExists(const QString &room_id) { return rooms_.find(room_id) != rooms_.end(); }
bool filterItemExists(const QString &id)
{
return std::find(roomFilter_.begin(), roomFilter_.end(), id) != roomFilter_.end();
}
QVBoxLayout *topLayout_; QVBoxLayout *topLayout_;
QVBoxLayout *contentsLayout_; QVBoxLayout *contentsLayout_;
@ -106,11 +112,11 @@ private:
QSharedPointer<OverlayModal> leaveRoomModal_; QSharedPointer<OverlayModal> leaveRoomModal_;
QSharedPointer<dialogs::LeaveRoom> leaveRoomDialog_; QSharedPointer<dialogs::LeaveRoom> leaveRoomDialog_;
QMap<QString, QSharedPointer<RoomInfoListItem>> rooms_; std::map<QString, QSharedPointer<RoomInfoListItem>> rooms_;
QString selectedRoom_; QString selectedRoom_;
bool filterRooms_ = false; //! Which rooms to include in the room list.
QList<QString> roomFilter_ = QList<QString>(); // which rooms to include in the room list std::vector<QString> roomFilter_;
QSharedPointer<MatrixClient> client_; QSharedPointer<MatrixClient> client_;
QSharedPointer<Cache> cache_; QSharedPointer<Cache> cache_;

12
include/timeline/TimelineViewManager.h
Unescape View File

@ -17,7 +17,6 @@
#pragma once #pragma once
#include <QMap>
#include <QSharedPointer> #include <QSharedPointer>
#include <QStackedWidget> #include <QStackedWidget>
@ -41,13 +40,13 @@ public:
// Initialize with timeline events. // Initialize with timeline events.
void initialize(const mtx::responses::Rooms &rooms); void initialize(const mtx::responses::Rooms &rooms);
// Empty initialization. // Empty initialization.
void initialize(const QList<QString> &rooms); void initialize(const std::vector<QString> &rooms);
void addRoom(const mtx::responses::JoinedRoom &room, const QString &room_id); void addRoom(const mtx::responses::JoinedRoom &room, const QString &room_id);
void addRoom(const QString &room_id); void addRoom(const QString &room_id);
void sync(const mtx::responses::Rooms &rooms); void sync(const mtx::responses::Rooms &rooms);
void clearAll(); void clearAll() { views_.clear(); }
// Check if all the timelines have been loaded. // Check if all the timelines have been loaded.
bool hasLoaded() const; bool hasLoaded() const;
@ -55,7 +54,7 @@ public:
static QString chooseRandomColor(); static QString chooseRandomColor();
static QString displayName(const QString &userid); static QString displayName(const QString &userid);
static QMap<QString, QString> DISPLAY_NAMES; static std::map<QString, QString> DISPLAY_NAMES;
signals: signals:
void clearRoomMessageCount(QString roomid); void clearRoomMessageCount(QString roomid);
@ -78,7 +77,10 @@ private slots:
void messageSendFailed(const QString &roomid, int txnid); void messageSendFailed(const QString &roomid, int txnid);
private: private:
//! Check if the given room id is managed by a TimelineView.
bool timelineViewExists(const QString &id) { return views_.find(id) != views_.end(); }
QString active_room_; QString active_room_;
QMap<QString, QSharedPointer<TimelineView>> views_; std::map<QString, QSharedPointer<TimelineView>> views_;
QSharedPointer<MatrixClient> client_; QSharedPointer<MatrixClient> client_;
}; };

24
src/AvatarProvider.cc
Unescape View File

@ -20,8 +20,8 @@
QSharedPointer<MatrixClient> AvatarProvider::client_; QSharedPointer<MatrixClient> AvatarProvider::client_;
QMap<QString, AvatarData> AvatarProvider::avatars_; std::map<QString, AvatarData> AvatarProvider::avatars_;
QMap<QString, QList<std::function<void(QImage)>>> AvatarProvider::toBeResolved_; std::map<QString, std::vector<std::function<void(QImage)>>> AvatarProvider::toBeResolved_;
void void
AvatarProvider::init(QSharedPointer<MatrixClient> client) AvatarProvider::init(QSharedPointer<MatrixClient> client)
@ -32,26 +32,26 @@ AvatarProvider::init(QSharedPointer<MatrixClient> client)
void void
AvatarProvider::updateAvatar(const QString &uid, const QImage &img) AvatarProvider::updateAvatar(const QString &uid, const QImage &img)
{ {
if (toBeResolved_.contains(uid)) { if (toBeResolved_.find(uid) != toBeResolved_.end()) {
auto callbacks = toBeResolved_[uid]; auto callbacks = toBeResolved_[uid];
// Update all the timeline items with the resolved avatar. // Update all the timeline items with the resolved avatar.
for (const auto callback : callbacks) for (const auto callback : callbacks)
callback(img); callback(img);
toBeResolved_.remove(uid); toBeResolved_.erase(toBeResolved_.find(uid));
} }
auto avatarData = avatars_[uid]; auto avatarData = avatars_[uid];
avatarData.img = img; avatarData.img = img;
avatars_.insert(uid, avatarData); avatars_.emplace(uid, avatarData);
} }
void void
AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callback) AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callback)
{ {
if (!avatars_.contains(userId)) if (avatars_.find(userId) == avatars_.end())
return; return;
auto img = avatars_[userId].img; auto img = avatars_[userId].img;
@ -62,7 +62,7 @@ AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callb
} }
// Add the current timeline item to the waiting list for this avatar. // Add the current timeline item to the waiting list for this avatar.
if (!toBeResolved_.contains(userId)) { if (toBeResolved_.find(userId) == toBeResolved_.end()) {
client_->fetchUserAvatar(avatars_[userId].url, client_->fetchUserAvatar(avatars_[userId].url,
[userId](QImage image) { updateAvatar(userId, image); }, [userId](QImage image) { updateAvatar(userId, image); },
[userId](QString error) { [userId](QString error) {
@ -71,12 +71,12 @@ AvatarProvider::resolve(const QString &userId, std::function<void(QImage)> callb
<< userId; << userId;
}); });
QList<std::function<void(QImage)>> items; std::vector<std::function<void(QImage)>> items;
items.push_back(callback); items.emplace_back(callback);
toBeResolved_.insert(userId, items); toBeResolved_.emplace(userId, items);
} else { } else {
toBeResolved_[userId].push_back(callback); toBeResolved_[userId].emplace_back(callback);
} }
} }
@ -86,7 +86,7 @@ AvatarProvider::setAvatarUrl(const QString &userId, const QUrl &url)
AvatarData data; AvatarData data;
data.url = url; data.url = url;
avatars_.insert(userId, data); avatars_.emplace(userId, data);
} }
void void

10
src/Cache.cc
Unescape View File

@ -155,7 +155,7 @@ Cache::image(const QString &url) const
void void
Cache::setState(const QString &nextBatchToken, Cache::setState(const QString &nextBatchToken,
const QMap<QString, QSharedPointer<RoomState>> &states) const std::map<QString, QSharedPointer<RoomState>> &states)
{ {
if (!isMounted_) if (!isMounted_)
return; return;
@ -165,8 +165,8 @@ Cache::setState(const QString &nextBatchToken,
setNextBatchToken(txn, nextBatchToken); setNextBatchToken(txn, nextBatchToken);
for (auto it = states.constBegin(); it != states.constEnd(); ++it) for (auto const &state : states)
insertRoomState(txn, it.key(), it.value()); insertRoomState(txn, state.first, state.second);
txn.commit(); txn.commit();
} catch (const lmdb::error &e) { } catch (const lmdb::error &e) {
@ -252,7 +252,7 @@ Cache::removeInvite(const QString &room_id)
void void
Cache::states() Cache::states()
{ {
QMap<QString, RoomState> states; std::map<QString, RoomState> states;
auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
auto cursor = lmdb::cursor::open(txn, roomDb_); auto cursor = lmdb::cursor::open(txn, roomDb_);
@ -293,7 +293,7 @@ Cache::states()
qDebug() << members.size() << "members for" << roomid; qDebug() << members.size() << "members for" << roomid;
state.memberships = members; state.memberships = members;
states.insert(roomid, state); states.emplace(roomid, std::move(state));
} }
qDebug() << "Retrieved" << states.size() << "rooms"; qDebug() << "Retrieved" << states.size() << "rooms";

120
src/ChatPage.cc
Unescape View File

@ -161,7 +161,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
return; return;
} }
if (typingUsers_.contains(roomid)) if (typingUsers_.find(roomid) != typingUsers_.end())
users = typingUsers_[roomid]; users = typingUsers_[roomid];
typingDisplay_->setUsers(users); typingDisplay_->setUsers(users);
@ -185,7 +185,7 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
&TimelineViewManager::unreadMessages, &TimelineViewManager::unreadMessages,
this, this,
[=](const QString &roomid, int count) { [=](const QString &roomid, int count) {
if (!roomSettings_.contains(roomid)) { if (roomSettings_.find(roomid) == roomSettings_.end()) {
qWarning() << "RoomId does not have settings" << roomid; qWarning() << "RoomId does not have settings" << roomid;
room_list_->updateUnreadMessageCount(roomid, count); room_list_->updateUnreadMessageCount(roomid, count);
return; return;
@ -331,20 +331,20 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
&MatrixClient::communityProfileRetrieved, &MatrixClient::communityProfileRetrieved,
this, this,
[=](QString communityId, QJsonObject profile) { [=](QString communityId, QJsonObject profile) {
communityManager_[communityId]->parseProfile(profile); communities_[communityId]->parseProfile(profile);
}); });
connect(client_.data(), connect(client_.data(),
&MatrixClient::communityRoomsRetrieved, &MatrixClient::communityRoomsRetrieved,
this, this,
[=](QString communityId, QJsonObject rooms) { [=](QString communityId, QJsonObject rooms) {
communityManager_[communityId]->parseRooms(rooms); communities_[communityId]->parseRooms(rooms);
if (communityId == current_community_) { if (communityId == current_community_) {
if (communityId == "world") { if (communityId == "world") {
room_list_->setFilterRooms(false); room_list_->setFilterRooms(false);
} else { } else {
room_list_->setRoomFilter( room_list_->setRoomFilter(
communityManager_[communityId]->getRoomList()); communities_[communityId]->getRoomList());
} }
} }
}); });
@ -394,12 +394,11 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client,
this, this,
[=](const QString &communityId) { [=](const QString &communityId) {
current_community_ = communityId; current_community_ = communityId;
if (communityId == "world") {
if (communityId == "world")
room_list_->setFilterRooms(false); room_list_->setFilterRooms(false);
} else { else
room_list_->setRoomFilter( room_list_->setRoomFilter(communities_[communityId]->getRoomList());
communityManager_[communityId]->getRoomList());
}
}); });
setGroupViewState(userSettings_->isGroupViewEnabled()); setGroupViewState(userSettings_->isGroupViewEnabled());
@ -427,7 +426,7 @@ ChatPage::logout()
void void
ChatPage::resetUI() ChatPage::resetUI()
{ {
room_avatars_.clear(); roomAvatars_.clear();
room_list_->clear(); room_list_->clear();
roomSettings_.clear(); roomSettings_.clear();
roomStates_.clear(); roomStates_.clear();
@ -538,8 +537,8 @@ ChatPage::initialSyncCompleted(const mtx::responses::Sync &response)
const auto room_id = QString::fromStdString(it->first); const auto room_id = QString::fromStdString(it->first);
roomStates_.insert(room_id, roomState); roomStates_.emplace(room_id, roomState);
roomSettings_.insert(room_id, roomSettings_.emplace(room_id,
QSharedPointer<RoomSettings>(new RoomSettings(room_id))); QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
for (const auto membership : roomState->memberships) { for (const auto membership : roomState->memberships) {
@ -572,7 +571,7 @@ ChatPage::initialSyncCompleted(const mtx::responses::Sync &response)
void void
ChatPage::updateTopBarAvatar(const QString &roomid, const QPixmap &img) ChatPage::updateTopBarAvatar(const QString &roomid, const QPixmap &img)
{ {
room_avatars_.insert(roomid, img); roomAvatars_.emplace(roomid, img);
if (current_room_ != roomid) if (current_room_ != roomid)
return; return;
@ -602,16 +601,16 @@ ChatPage::updateOwnCommunitiesInfo(const QList<QString> &own_communities)
for (int i = 0; i < own_communities.size(); i++) { for (int i = 0; i < own_communities.size(); i++) {
QSharedPointer<Community> community = QSharedPointer<Community>(new Community()); QSharedPointer<Community> community = QSharedPointer<Community>(new Community());
communityManager_[own_communities[i]] = community; communities_[own_communities[i]] = community;
} }
communitiesList_->setCommunities(communityManager_); communitiesList_->setCommunities(communities_);
} }
void void
ChatPage::changeTopRoomInfo(const QString &room_id) ChatPage::changeTopRoomInfo(const QString &room_id)
{ {
if (!roomStates_.contains(room_id)) if (roomStates_.find(room_id) == roomStates_.end())
return; return;
auto state = roomStates_[room_id]; auto state = roomStates_[room_id];
@ -620,8 +619,8 @@ ChatPage::changeTopRoomInfo(const QString &room_id)
top_bar_->updateRoomTopic(state->getTopic()); top_bar_->updateRoomTopic(state->getTopic());
top_bar_->setRoomSettings(roomSettings_[room_id]); top_bar_->setRoomSettings(roomSettings_[room_id]);
if (room_avatars_.contains(room_id)) if (roomAvatars_.find(room_id) != roomAvatars_.end())
top_bar_->updateRoomAvatar(room_avatars_.value(room_id).toImage()); top_bar_->updateRoomAvatar(roomAvatars_[room_id].toImage());
else else
top_bar_->updateRoomAvatarFromName(state->getName()); top_bar_->updateRoomAvatarFromName(state->getName());
@ -648,15 +647,18 @@ ChatPage::loadStateFromCache()
qDebug() << "Restored nextBatchToken" << cache_->nextBatchToken(); qDebug() << "Restored nextBatchToken" << cache_->nextBatchToken();
client_->setNextBatchToken(cache_->nextBatchToken()); client_->setNextBatchToken(cache_->nextBatchToken());
qRegisterMetaType<QMap<QString, RoomState>>(); qRegisterMetaType<std::map<QString, RoomState>>();
QtConcurrent::run(cache_.data(), &Cache::states); QtConcurrent::run(cache_.data(), &Cache::states);
connect(cache_.data(), &Cache::statesLoaded, this, [this](QMap<QString, RoomState> rooms) { connect(
cache_.data(), &Cache::statesLoaded, this, [this](std::map<QString, RoomState> rooms) {
qDebug() << "Cache data loaded"; qDebug() << "Cache data loaded";
for (auto it = rooms.constBegin(); it != rooms.constEnd(); ++it) { std::vector<QString> roomKeys;
auto roomState = QSharedPointer<RoomState>(new RoomState(it.value()));
for (auto const &room : rooms) {
auto roomState = QSharedPointer<RoomState>(new RoomState(room.second));
// Clean up and prepare state for use. // Clean up and prepare state for use.
roomState->removeLeaveMemberships(); roomState->removeLeaveMemberships();
@ -664,21 +666,23 @@ ChatPage::loadStateFromCache()
roomState->resolveAvatar(); roomState->resolveAvatar();
// Save the current room state. // Save the current room state.
roomStates_.insert(it.key(), roomState); roomStates_.emplace(room.first, roomState);
// Create or restore the settings for this room. // Create or restore the settings for this room.
roomSettings_.insert( roomSettings_.emplace(
it.key(), QSharedPointer<RoomSettings>(new RoomSettings(it.key()))); room.first, QSharedPointer<RoomSettings>(new RoomSettings(room.first)));
// Resolve user avatars. // Resolve user avatars.
for (const auto membership : roomState->memberships) { for (auto const &membership : roomState->memberships) {
updateUserDisplayName(membership.second); updateUserDisplayName(membership.second);
updateUserAvatarUrl(membership.second); updateUserAvatarUrl(membership.second);
} }
roomKeys.emplace_back(room.first);
} }
// Initializing empty timelines. // Initializing empty timelines.
view_manager_->initialize(rooms.keys()); view_manager_->initialize(roomKeys);
// Initialize room list from the restored state and settings. // Initialize room list from the restored state and settings.
room_list_->setInitialRooms(roomSettings_, roomStates_); room_list_->setInitialRooms(roomSettings_, roomStates_);
@ -723,14 +727,14 @@ ChatPage::showQuickSwitcher()
quickSwitcherModal_->setColor(QColor(30, 30, 30, 170)); quickSwitcherModal_->setColor(QColor(30, 30, 30, 170));
} }
QMap<QString, QString> rooms; std::map<QString, QString> rooms;
for (auto it = roomStates_.constBegin(); it != roomStates_.constEnd(); ++it) { for (auto const &state : roomStates_) {
QString deambiguator = QString deambiguator =
QString::fromStdString(it.value()->canonical_alias.content.alias); QString::fromStdString(state.second->canonical_alias.content.alias);
if (deambiguator == "") if (deambiguator == "")
deambiguator = it.key(); deambiguator = state.first;
rooms.insert(it.value()->getName() + " (" + deambiguator + ")", it.key()); rooms.emplace(state.second->getName() + " (" + deambiguator + ")", state.first);
} }
quickSwitcher_->setRoomList(rooms); quickSwitcher_->setRoomList(rooms);
@ -740,14 +744,14 @@ ChatPage::showQuickSwitcher()
void void
ChatPage::addRoom(const QString &room_id) ChatPage::addRoom(const QString &room_id)
{ {
if (!roomStates_.contains(room_id)) { if (roomStates_.find(room_id) == roomStates_.end()) {
auto room_state = QSharedPointer<RoomState>(new RoomState); auto room_state = QSharedPointer<RoomState>(new RoomState);
roomStates_.insert(room_id, room_state); roomStates_.emplace(room_id, room_state);
roomSettings_.insert(room_id, roomSettings_.emplace(room_id,
QSharedPointer<RoomSettings>(new RoomSettings(room_id))); QSharedPointer<RoomSettings>(new RoomSettings(room_id)));
room_list_->addRoom(roomSettings_, roomStates_[room_id], room_id); room_list_->addRoom(roomSettings_[room_id], roomStates_[room_id], room_id);
room_list_->highlightSelectedRoom(room_id); room_list_->highlightSelectedRoom(room_id);
changeTopRoomInfo(room_id); changeTopRoomInfo(room_id);
@ -757,8 +761,8 @@ ChatPage::addRoom(const QString &room_id)
void void
ChatPage::removeRoom(const QString &room_id) ChatPage::removeRoom(const QString &room_id)
{ {
roomStates_.remove(room_id); roomStates_.erase(roomStates_.find(room_id));
roomSettings_.remove(room_id); roomSettings_.erase(roomSettings_.find(room_id));
try { try {
cache_->removeRoom(room_id); cache_->removeRoom(room_id);
cache_->removeInvite(room_id); cache_->removeInvite(room_id);
@ -812,7 +816,7 @@ ChatPage::updateTypingUsers(const QString &roomid, const std::vector<std::string
typingDisplay_->setUsers(users); typingDisplay_->setUsers(users);
} }
typingUsers_.insert(roomid, users); typingUsers_.emplace(roomid, users);
} }
void void
@ -833,7 +837,7 @@ ChatPage::updateUserDisplayName(
auto stateKey = QString::fromStdString(membership.state_key); auto stateKey = QString::fromStdString(membership.state_key);
if (!displayName.isEmpty()) if (!displayName.isEmpty())
TimelineViewManager::DISPLAY_NAMES.insert(stateKey, displayName); TimelineViewManager::DISPLAY_NAMES.emplace(stateKey, displayName);
} }
void void
@ -842,7 +846,7 @@ ChatPage::removeLeftRooms(const std::map<std::string, mtx::responses::LeftRoom>
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) { for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first); const auto room_id = QString::fromStdString(it->first);
if (roomStates_.contains(room_id)) if (roomStates_.find(room_id) != roomStates_.end())
removeRoom(room_id); removeRoom(room_id);
} }
} }
@ -865,7 +869,7 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
const auto newTimelineEvents = it->second.timeline; const auto newTimelineEvents = it->second.timeline;
// Merge the new updates for rooms that we are tracking. // Merge the new updates for rooms that we are tracking.
if (roomStates_.contains(roomid)) { if (roomStates_.find(roomid) != roomStates_.end()) {
auto oldState = roomStates_[roomid]; auto oldState = roomStates_[roomid];
oldState->updateFromEvents(newStateEvents.events); oldState->updateFromEvents(newStateEvents.events);
oldState->updateFromEvents(newTimelineEvents.events); oldState->updateFromEvents(newTimelineEvents.events);
@ -881,9 +885,9 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
roomState->resolveName(); roomState->resolveName();
roomState->resolveAvatar(); roomState->resolveAvatar();
roomStates_.insert(roomid, roomState); roomStates_.emplace(roomid, roomState);
roomSettings_.insert( roomSettings_.emplace(
roomid, QSharedPointer<RoomSettings>(new RoomSettings(roomid))); roomid, QSharedPointer<RoomSettings>(new RoomSettings(roomid)));
view_manager_->addRoom(it->second, roomid); view_manager_->addRoom(it->second, roomid);
@ -899,17 +903,17 @@ ChatPage::updateJoinedRooms(const std::map<std::string, mtx::responses::JoinedRo
} }
} }
QMap<QString, QSharedPointer<RoomState>> std::map<QString, QSharedPointer<RoomState>>
ChatPage::generateMembershipDifference( ChatPage::generateMembershipDifference(
const std::map<std::string, mtx::responses::JoinedRoom> &rooms, const std::map<std::string, mtx::responses::JoinedRoom> &rooms,
const QMap<QString, QSharedPointer<RoomState>> &states) const const std::map<QString, QSharedPointer<RoomState>> &states) const
{ {
QMap<QString, QSharedPointer<RoomState>> stateDiff; std::map<QString, QSharedPointer<RoomState>> stateDiff;
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) { for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first); const auto room_id = QString::fromStdString(it->first);
if (!states.contains(room_id)) if (states.find(room_id) == states.end())
continue; continue;
auto all_memberships = getMemberships(it->second.state.events); auto all_memberships = getMemberships(it->second.state.events);
@ -920,17 +924,17 @@ ChatPage::generateMembershipDifference(
all_memberships.emplace(mm->first, mm->second); all_memberships.emplace(mm->first, mm->second);
auto local = QSharedPointer<RoomState>(new RoomState); auto local = QSharedPointer<RoomState>(new RoomState);
local->aliases = states[room_id]->aliases; local->aliases = states.at(room_id)->aliases;
local->avatar = states[room_id]->avatar; local->avatar = states.at(room_id)->avatar;
local->canonical_alias = states[room_id]->canonical_alias; local->canonical_alias = states.at(room_id)->canonical_alias;
local->history_visibility = states[room_id]->history_visibility; local->history_visibility = states.at(room_id)->history_visibility;
local->join_rules = states[room_id]->join_rules; local->join_rules = states.at(room_id)->join_rules;
local->name = states[room_id]->name; local->name = states.at(room_id)->name;
local->power_levels = states[room_id]->power_levels; local->power_levels = states.at(room_id)->power_levels;
local->topic = states[room_id]->topic; local->topic = states.at(room_id)->topic;
local->memberships = all_memberships; local->memberships = all_memberships;
stateDiff.insert(room_id, local); stateDiff.emplace(room_id, local);
} }
return stateDiff; return stateDiff;

50
src/CommunitiesList.cc
Unescape View File

@ -34,7 +34,7 @@ CommunitiesList::CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *p
WorldCommunityListItem *world_list_item = new WorldCommunityListItem(); WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
contentsLayout_->addWidget(world_list_item); contentsLayout_->addWidget(world_list_item);
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item)); communities_.emplace("world", QSharedPointer<CommunitiesListItem>(world_list_item));
connect(world_list_item, connect(world_list_item,
&WorldCommunityListItem::clicked, &WorldCommunityListItem::clicked,
this, this,
@ -57,49 +57,38 @@ CommunitiesList::CommunitiesList(QSharedPointer<MatrixClient> client, QWidget *p
SLOT(updateCommunityAvatar(const QString &, const QPixmap &))); SLOT(updateCommunityAvatar(const QString &, const QPixmap &)));
} }
CommunitiesList::~CommunitiesList() {}
void void
CommunitiesList::setCommunities(const QMap<QString, QSharedPointer<Community>> &communities) CommunitiesList::setCommunities(const std::map<QString, QSharedPointer<Community>> &communities)
{ {
communities_.clear(); communities_.clear();
// TODO: still not sure how to handle the "world" special-case // TODO: still not sure how to handle the "world" special-case
WorldCommunityListItem *world_list_item = new WorldCommunityListItem(); WorldCommunityListItem *world_list_item = new WorldCommunityListItem();
communities_.insert("world", QSharedPointer<CommunitiesListItem>(world_list_item)); communities_.emplace("world", QSharedPointer<CommunitiesListItem>(world_list_item));
connect(world_list_item, connect(world_list_item,
&WorldCommunityListItem::clicked, &WorldCommunityListItem::clicked,
this, this,
&CommunitiesList::highlightSelectedCommunity); &CommunitiesList::highlightSelectedCommunity);
contentsLayout_->insertWidget(0, world_list_item); contentsLayout_->insertWidget(0, world_list_item);
for (auto it = communities.constBegin(); it != communities.constEnd(); it++) { for (const auto &community : communities) {
const auto community_id = it.key(); addCommunity(community.second, community.first);
const auto community = it.value();
addCommunity(community, community_id);
client_->fetchCommunityProfile(community_id); client_->fetchCommunityProfile(community.first);
client_->fetchCommunityRooms(community_id); client_->fetchCommunityRooms(community.first);
} }
world_list_item->setPressedState(true); world_list_item->setPressedState(true);
emit communityChanged("world"); emit communityChanged("world");
} }
void
CommunitiesList::clear()
{
communities_.clear();
}
void void
CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString &community_id) CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString &community_id)
{ {
CommunitiesListItem *list_item = CommunitiesListItem *list_item =
new CommunitiesListItem(community, community_id, scrollArea_); new CommunitiesListItem(community, community_id, scrollArea_);
communities_.insert(community_id, QSharedPointer<CommunitiesListItem>(list_item)); communities_.emplace(community_id, QSharedPointer<CommunitiesListItem>(list_item));
client_->fetchCommunityAvatar(community_id, community->getAvatar()); client_->fetchCommunityAvatar(community_id, community->getAvatar());
@ -114,37 +103,36 @@ CommunitiesList::addCommunity(QSharedPointer<Community> community, const QString
void void
CommunitiesList::removeCommunity(const QString &community_id) CommunitiesList::removeCommunity(const QString &community_id)
{ {
communities_.remove(community_id); communities_.erase(communities_.find(community_id));
} }
void void
CommunitiesList::updateCommunityAvatar(const QString &community_id, const QPixmap &img) CommunitiesList::updateCommunityAvatar(const QString &community_id, const QPixmap &img)
{ {
if (!communities_.contains(community_id)) { if (!communityExists(community_id)) {
qWarning() << "Avatar update on nonexistent community" << community_id; qWarning() << "Avatar update on nonexistent community" << community_id;
return; return;
} }
communities_.value(community_id)->setAvatar(img.toImage()); communities_.find(community_id)->second->setAvatar(img.toImage());
} }
void void
CommunitiesList::highlightSelectedCommunity(const QString &community_id) CommunitiesList::highlightSelectedCommunity(const QString &community_id)
{ {
emit communityChanged(community_id); if (!communityExists(community_id)) {
if (!communities_.contains(community_id)) {
qDebug() << "CommunitiesList: clicked unknown community"; qDebug() << "CommunitiesList: clicked unknown community";
return; return;
} }
for (auto it = communities_.constBegin(); it != communities_.constEnd(); it++) { emit communityChanged(community_id);
if (it.key() != community_id) {
it.value()->setPressedState(false); for (const auto &community : communities_) {
if (community.first != community_id) {
community.second->setPressedState(false);
} else { } else {
it.value()->setPressedState(true); community.second->setPressedState(true);
scrollArea_->ensureWidgetVisible( scrollArea_->ensureWidgetVisible(community.second.data());
qobject_cast<QWidget *>(it.value().data()));
} }
} }
} }

25
src/Community.cc
Unescape View File

@ -6,29 +6,19 @@
void void
Community::parseProfile(const QJsonObject &profile) Community::parseProfile(const QJsonObject &profile)
{ {
if (profile["name"].type() == QJsonValue::Type::String) { if (profile["name"].type() == QJsonValue::Type::String)
name_ = profile["name"].toString(); name_ = profile["name"].toString();
} else { else
name_ = "Unnamed Community"; // TODO: what is correct here? name_ = "Unnamed Community"; // TODO: what is correct here?
}
if (profile["avatar_url"].type() == QJsonValue::Type::String) { if (profile["avatar_url"].type() == QJsonValue::Type::String)
avatar_ = QUrl(profile["avatar_url"].toString()); avatar_ = QUrl(profile["avatar_url"].toString());
} else {
avatar_ = QUrl();
}
if (profile["short_description"].type() == QJsonValue::Type::String) { if (profile["short_description"].type() == QJsonValue::Type::String)
short_description_ = profile["short_description"].toString(); short_description_ = profile["short_description"].toString();
} else {
short_description_ = "";
}
if (profile["long_description"].type() == QJsonValue::Type::String) { if (profile["long_description"].type() == QJsonValue::Type::String)
long_description_ = profile["long_description"].toString(); long_description_ = profile["long_description"].toString();
} else {
long_description_ = "";
}
} }
void void
@ -36,7 +26,8 @@ Community::parseRooms(const QJsonObject &rooms)
{ {
rooms_.clear(); rooms_.clear();
for (auto i = 0; i < rooms["chunk"].toArray().size(); i++) { for (auto const &room : rooms["chunk"].toArray()) {
rooms_.append(rooms["chunk"].toArray()[i].toObject()["room_id"].toString()); if (room.toObject().contains("room_id"))
rooms_.emplace_back(room.toObject()["room_id"].toString());
} }
} }

7
src/QuickSwitcher.cc
Unescape View File

@ -138,10 +138,13 @@ QuickSwitcher::QuickSwitcher(QWidget *parent)
} }
void void
QuickSwitcher::setRoomList(const QMap<QString, QString> &rooms) QuickSwitcher::setRoomList(const std::map<QString, QString> &rooms)
{ {
rooms_ = rooms; rooms_ = rooms;
QStringList items = rooms.keys();
QStringList items;
for (const auto &room : rooms)
items << room.first;
completer_->setModel(new QStringListModel(items)); completer_->setModel(new QStringListModel(items));
} }

162
src/RoomList.cc
Unescape View File

@ -82,16 +82,15 @@ RoomList::clear()
} }
void void
RoomList::addRoom(const QMap<QString, QSharedPointer<RoomSettings>> &settings, RoomList::addRoom(const QSharedPointer<RoomSettings> &settings,
const QSharedPointer<RoomState> &state, const QSharedPointer<RoomState> &state,
const QString &room_id) const QString &room_id)
{ {
RoomInfoListItem *room_item = auto room_item = new RoomInfoListItem(settings, state, room_id, scrollArea_);
new RoomInfoListItem(settings[room_id], state, room_id, scrollArea_);
connect(room_item, &RoomInfoListItem::clicked, this, &RoomList::highlightSelectedRoom); connect(room_item, &RoomInfoListItem::clicked, this, &RoomList::highlightSelectedRoom);
connect(room_item, &RoomInfoListItem::leaveRoom, this, &RoomList::openLeaveRoomDialog); connect(room_item, &RoomInfoListItem::leaveRoom, this, &RoomList::openLeaveRoomDialog);
rooms_.insert(room_id, QSharedPointer<RoomInfoListItem>(room_item)); rooms_.emplace(room_id, QSharedPointer<RoomInfoListItem>(room_item));
if (!state->getAvatar().toString().isEmpty()) if (!state->getAvatar().toString().isEmpty())
updateAvatar(room_id, state->getAvatar().toString()); updateAvatar(room_id, state->getAvatar().toString());
@ -124,21 +123,24 @@ RoomList::updateAvatar(const QString &room_id, const QString &url)
void void
RoomList::removeRoom(const QString &room_id, bool reset) RoomList::removeRoom(const QString &room_id, bool reset)
{ {
rooms_.remove(room_id); rooms_.erase(rooms_.find(room_id));
if (rooms_.isEmpty() || !reset) if (rooms_.empty() || !reset)
return; return;
auto first_room = rooms_.first(); auto room = firstRoom();
first_room->setPressedState(true);
emit roomChanged(rooms_.firstKey()); if (room.second.isNull())
return;
room.second->setPressedState(true);
emit roomChanged(room.first);
} }
void void
RoomList::updateUnreadMessageCount(const QString &roomid, int count) RoomList::updateUnreadMessageCount(const QString &roomid, int count)
{ {
if (!rooms_.contains(roomid)) { if (!roomExists(roomid)) {
qWarning() << "UpdateUnreadMessageCount: Unknown roomid"; qWarning() << "UpdateUnreadMessageCount: Unknown roomid";
return; return;
} }
@ -153,15 +155,17 @@ RoomList::calculateUnreadMessageCount()
{ {
int total_unread_msgs = 0; int total_unread_msgs = 0;
for (const auto &room : rooms_) for (const auto &room : rooms_) {
total_unread_msgs += room->unreadMessageCount(); if (!room.second.isNull())
total_unread_msgs += room.second->unreadMessageCount();
}
emit totalUnreadMessageCountUpdated(total_unread_msgs); emit totalUnreadMessageCountUpdated(total_unread_msgs);
} }
void void
RoomList::setInitialRooms(const QMap<QString, QSharedPointer<RoomSettings>> &settings, RoomList::setInitialRooms(const std::map<QString, QSharedPointer<RoomSettings>> &settings,
const QMap<QString, QSharedPointer<RoomState>> &states) const std::map<QString, QSharedPointer<RoomState>> &states)
{ {
rooms_.clear(); rooms_.clear();
@ -171,22 +175,18 @@ RoomList::setInitialRooms(const QMap<QString, QSharedPointer<RoomSettings>> &set
return; return;
} }
for (auto it = states.constBegin(); it != states.constEnd(); ++it) { for (auto const &state : states)
const auto room_id = it.key(); addRoom(settings.at(state.first), state.second, state.first);
const auto state = it.value();
addRoom(settings, state, room_id);
}
if (rooms_.isEmpty()) if (rooms_.empty())
return; return;
setFilterRooms(filterRooms_); auto room = firstRoom();
if (room.second.isNull())
auto first_room = rooms_.first(); return;
first_room->setPressedState(true);
emit roomChanged(rooms_.firstKey()); room.second->setPressedState(true);
emit roomChanged(room.first);
} }
void void
@ -212,33 +212,30 @@ RoomList::openLeaveRoomDialog(const QString &room_id)
} }
void void
RoomList::sync(const QMap<QString, QSharedPointer<RoomState>> &states, RoomList::sync(const std::map<QString, QSharedPointer<RoomState>> &states,
const QMap<QString, QSharedPointer<RoomSettings>> &settings) const std::map<QString, QSharedPointer<RoomSettings>> &settings)
{ {
for (auto it = states.constBegin(); it != states.constEnd(); ++it) { for (auto const &state : states) {
auto room_id = it.key(); if (!roomExists(state.first))
auto state = it.value(); addRoom(settings.at(state.first), state.second, state.first);
if (!rooms_.contains(room_id)) auto room = rooms_[state.first];
addRoom(settings, state, room_id);
auto room = rooms_[room_id];
auto current_avatar = room->state()->getAvatar(); auto current_avatar = room->state()->getAvatar();
auto new_avatar = state->getAvatar(); auto new_avatar = state.second->getAvatar();
if (current_avatar != new_avatar && !new_avatar.toString().isEmpty()) if (current_avatar != new_avatar && !new_avatar.toString().isEmpty())
updateAvatar(room_id, new_avatar.toString()); updateAvatar(state.first, new_avatar.toString());
room->setState(state); room->setState(state.second);
} }
} }
void void
RoomList::clearRoomMessageCount(const QString &room_id) RoomList::clearRoomMessageCount(const QString &room_id)
{ {
if (!rooms_.contains(room_id)) if (!roomExists(room_id))
return; return;
auto room = rooms_[room_id]; auto room = rooms_[room_id];
@ -252,7 +249,7 @@ RoomList::highlightSelectedRoom(const QString &room_id)
{ {
emit roomChanged(room_id); emit roomChanged(room_id);
if (!rooms_.contains(room_id)) { if (!roomExists(room_id)) {
qDebug() << "RoomList: clicked unknown roomid"; qDebug() << "RoomList: clicked unknown roomid";
return; return;
} }
@ -261,13 +258,15 @@ RoomList::highlightSelectedRoom(const QString &room_id)
calculateUnreadMessageCount(); calculateUnreadMessageCount();
for (auto it = rooms_.constBegin(); it != rooms_.constEnd(); ++it) { for (auto const &room : rooms_) {
if (it.key() != room_id) { if (room.second.isNull())
it.value()->setPressedState(false); continue;
if (room.first != room_id) {
room.second->setPressedState(false);
} else { } else {
it.value()->setPressedState(true); room.second->setPressedState(true);
scrollArea_->ensureWidgetVisible( scrollArea_->ensureWidgetVisible(room.second.data());
qobject_cast<QWidget *>(it.value().data()));
} }
} }
@ -277,12 +276,12 @@ RoomList::highlightSelectedRoom(const QString &room_id)
void void
RoomList::updateRoomAvatar(const QString &roomid, const QPixmap &img) RoomList::updateRoomAvatar(const QString &roomid, const QPixmap &img)
{ {
if (!rooms_.contains(roomid)) { if (!roomExists(roomid)) {
qWarning() << "Avatar update on non existent room" << roomid; qWarning() << "Avatar update on non existent room" << roomid;
return; return;
} }
rooms_.value(roomid)->setAvatar(img.toImage()); rooms_[roomid]->setAvatar(img.toImage());
// Used to inform other widgets for the new image data. // Used to inform other widgets for the new image data.
emit roomAvatarChanged(roomid, img); emit roomAvatarChanged(roomid, img);
@ -291,12 +290,12 @@ RoomList::updateRoomAvatar(const QString &roomid, const QPixmap &img)
void void
RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info) RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info)
{ {
if (!rooms_.contains(roomid)) { if (!roomExists(roomid)) {
qWarning() << "Description update on non existent room" << roomid << info.body; qWarning() << "Description update on non existent room" << roomid << info.body;
return; return;
} }
rooms_.value(roomid)->setDescriptionMessage(info); rooms_[roomid]->setDescriptionMessage(info);
if (underMouse()) { if (underMouse()) {
// When the user hover out of the roomlist a sort will be triggered. // When the user hover out of the roomlist a sort will be triggered.
@ -359,58 +358,53 @@ RoomList::closeJoinRoomDialog(bool isJoining, QString roomAlias)
{ {
joinRoomModal_->fadeOut(); joinRoomModal_->fadeOut();
if (isJoining) { if (isJoining)
client_->joinRoom(roomAlias); client_->joinRoom(roomAlias);
} }
}
void void
RoomList::closeLeaveRoomDialog(bool leaving, const QString &room_id) RoomList::closeLeaveRoomDialog(bool leaving, const QString &room_id)
{ {
leaveRoomModal_->fadeOut(); leaveRoomModal_->fadeOut();
if (leaving) { if (leaving)
client_->leaveRoom(room_id); client_->leaveRoom(room_id);
} }
}
void void
RoomList::setFilterRooms(bool filterRooms) RoomList::setFilterRooms(bool isFilteringEnabled)
{ {
filterRooms_ = filterRooms;
for (int i = 0; i < contentsLayout_->count(); i++) { for (int i = 0; i < contentsLayout_->count(); i++) {
// If roomFilter_ contains the room for the current RoomInfoListItem, // If roomFilter_ contains the room for the current RoomInfoListItem,
// show the list item, otherwise hide it // show the list item, otherwise hide it
RoomInfoListItem *listitem = auto listitem =
(RoomInfoListItem *)contentsLayout_->itemAt(i)->widget(); qobject_cast<RoomInfoListItem *>(contentsLayout_->itemAt(i)->widget());
if (listitem != nullptr) { if (!listitem)
if (!filterRooms) { continue;
contentsLayout_->itemAt(i)->widget()->show();
} else if (roomFilter_.contains(listitem->roomId())) { if (!isFilteringEnabled || filterItemExists(listitem->roomId()))
contentsLayout_->itemAt(i)->widget()->show(); listitem->show();
} else { else
contentsLayout_->itemAt(i)->widget()->hide(); listitem->hide();
}
}
} }
if (filterRooms_ && !roomFilter_.contains(selectedRoom_)) { if (isFilteringEnabled && !filterItemExists(selectedRoom_)) {
RoomInfoListItem *firstVisibleRoom = nullptr; RoomInfoListItem *firstVisibleRoom = nullptr;
for (int i = 0; i < contentsLayout_->count(); i++) { for (int i = 0; i < contentsLayout_->count(); i++) {
QWidget *item = contentsLayout_->itemAt(i)->widget(); QWidget *item = contentsLayout_->itemAt(i)->widget();
if (item != nullptr && item->isVisible()) { if (item != nullptr && item->isVisible()) {
firstVisibleRoom = (RoomInfoListItem *)item; firstVisibleRoom = qobject_cast<RoomInfoListItem *>(item);
break; break;
} }
} }
if (firstVisibleRoom != nullptr) {
if (firstVisibleRoom != nullptr)
highlightSelectedRoom(firstVisibleRoom->roomId()); highlightSelectedRoom(firstVisibleRoom->roomId());
}
} else { } else {
scrollArea_->ensureWidgetVisible( scrollArea_->ensureWidgetVisible(rooms_[selectedRoom_].data());
qobject_cast<QWidget *>(rooms_.value(selectedRoom_).data()));
} }
} }
@ -429,13 +423,13 @@ RoomList::syncInvites(const std::map<std::string, mtx::responses::InvitedRoom> &
for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) { for (auto it = rooms.cbegin(); it != rooms.cend(); ++it) {
const auto room_id = QString::fromStdString(it->first); const auto room_id = QString::fromStdString(it->first);
if (!rooms_.contains(room_id)) if (!roomExists(room_id))
addInvitedRoom(room_id, it->second); addInvitedRoom(room_id, it->second);
} }
} }
void void
RoomList::setRoomFilter(QList<QString> room_ids) RoomList::setRoomFilter(std::vector<QString> room_ids)
{ {
roomFilter_ = room_ids; roomFilter_ = room_ids;
setFilterRooms(true); setFilterRooms(true);
@ -448,10 +442,22 @@ RoomList::addInvitedRoom(const QString &room_id, const mtx::responses::InvitedRo
connect(room_item, &RoomInfoListItem::acceptInvite, this, &RoomList::acceptInvite); connect(room_item, &RoomInfoListItem::acceptInvite, this, &RoomList::acceptInvite);
connect(room_item, &RoomInfoListItem::declineInvite, this, &RoomList::declineInvite); connect(room_item, &RoomInfoListItem::declineInvite, this, &RoomList::declineInvite);
rooms_.insert(room_id, QSharedPointer<RoomInfoListItem>(room_item)); rooms_.emplace(room_id, QSharedPointer<RoomInfoListItem>(room_item));
updateAvatar(room_id, QString::fromStdString(room.avatar())); updateAvatar(room_id, QString::fromStdString(room.avatar()));
int pos = contentsLayout_->count() - 1; int pos = contentsLayout_->count() - 1;
contentsLayout_->insertWidget(pos, room_item); contentsLayout_->insertWidget(pos, room_item);
} }
std::pair<QString, QSharedPointer<RoomInfoListItem>>
RoomList::firstRoom() const
{
auto firstRoom = rooms_.begin();
while (firstRoom->second.isNull() && firstRoom != rooms_.end())
firstRoom++;
return std::pair<QString, QSharedPointer<RoomInfoListItem>>(firstRoom->first,
firstRoom->second);
}

40
src/timeline/TimelineViewManager.cc
Unescape View File

@ -89,7 +89,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid,
const QString &filename, const QString &filename,
const QString &url) const QString &url)
{ {
if (!views_.contains(roomid)) { if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.image message to a non-managed view"; qDebug() << "Cannot send m.image message to a non-managed view";
return; return;
} }
@ -104,7 +104,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid,
const QString &filename, const QString &filename,
const QString &url) const QString &url)
{ {
if (!views_.contains(roomid)) { if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.file message to a non-managed view"; qDebug() << "Cannot send m.file message to a non-managed view";
return; return;
} }
@ -119,7 +119,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
const QString &filename, const QString &filename,
const QString &url) const QString &url)
{ {
if (!views_.contains(roomid)) { if (!timelineViewExists(roomid)) {
qDebug() << "Cannot send m.audio message to a non-managed view"; qDebug() << "Cannot send m.audio message to a non-managed view";
return; return;
} }
@ -129,15 +129,6 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, filename); view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, filename);
} }
void
TimelineViewManager::clearAll()
{
for (auto view : views_)
removeWidget(view.data());
views_.clear();
}
void void
TimelineViewManager::initialize(const mtx::responses::Rooms &rooms) TimelineViewManager::initialize(const mtx::responses::Rooms &rooms)
{ {
@ -147,19 +138,18 @@ TimelineViewManager::initialize(const mtx::responses::Rooms &rooms)
} }
void void
TimelineViewManager::initialize(const QList<QString> &rooms) TimelineViewManager::initialize(const std::vector<QString> &rooms)
{ {
for (const auto &roomid : rooms) { for (const auto &roomid : rooms)
addRoom(roomid); addRoom(roomid);
} }
}
void void
TimelineViewManager::addRoom(const mtx::responses::JoinedRoom &room, const QString &room_id) TimelineViewManager::addRoom(const mtx::responses::JoinedRoom &room, const QString &room_id)
{ {
// Create a history view with the room events. // Create a history view with the room events.
TimelineView *view = new TimelineView(room.timeline, client_, room_id); TimelineView *view = new TimelineView(room.timeline, client_, room_id);
views_.insert(room_id, QSharedPointer<TimelineView>(view)); views_.emplace(room_id, QSharedPointer<TimelineView>(view));
connect(view, connect(view,
&TimelineView::updateLastTimelineMessage, &TimelineView::updateLastTimelineMessage,
@ -179,7 +169,7 @@ TimelineViewManager::addRoom(const QString &room_id)
{ {
// Create a history view without any events. // Create a history view without any events.
TimelineView *view = new TimelineView(client_, room_id); TimelineView *view = new TimelineView(client_, room_id);
views_.insert(room_id, QSharedPointer<TimelineView>(view)); views_.emplace(room_id, QSharedPointer<TimelineView>(view));
connect(view, connect(view,
&TimelineView::updateLastTimelineMessage, &TimelineView::updateLastTimelineMessage,
@ -200,12 +190,12 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) { for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) {
auto roomid = QString::fromStdString(it->first); auto roomid = QString::fromStdString(it->first);
if (!views_.contains(roomid)) { if (!timelineViewExists(roomid)) {
qDebug() << "Ignoring event from unknown room" << roomid; qDebug() << "Ignoring event from unknown room" << roomid;
continue; continue;
} }
auto view = views_.value(roomid); auto view = views_.at(roomid);
int msgs_added = view->addEvents(it->second.timeline); int msgs_added = view->addEvents(it->second.timeline);
@ -223,13 +213,13 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
void void
TimelineViewManager::setHistoryView(const QString &room_id) TimelineViewManager::setHistoryView(const QString &room_id)
{ {
if (!views_.contains(room_id)) { if (!timelineViewExists(room_id)) {
qDebug() << "Room ID from RoomList is not present in ViewManager" << room_id; qDebug() << "Room ID from RoomList is not present in ViewManager" << room_id;
return; return;
} }
active_room_ = room_id; active_room_ = room_id;
auto view = views_.value(room_id); auto view = views_.at(room_id);
setCurrentWidget(view.data()); setCurrentWidget(view.data());
@ -237,7 +227,7 @@ TimelineViewManager::setHistoryView(const QString &room_id)
view->scrollDown(); view->scrollDown();
} }
QMap<QString, QString> TimelineViewManager::DISPLAY_NAMES; std::map<QString, QString> TimelineViewManager::DISPLAY_NAMES;
QString QString
TimelineViewManager::chooseRandomColor() TimelineViewManager::chooseRandomColor()
@ -300,8 +290,8 @@ TimelineViewManager::chooseRandomColor()
QString QString
TimelineViewManager::displayName(const QString &userid) TimelineViewManager::displayName(const QString &userid)
{ {
if (DISPLAY_NAMES.contains(userid)) if (DISPLAY_NAMES.find(userid) != DISPLAY_NAMES.end())
return DISPLAY_NAMES.value(userid); return DISPLAY_NAMES.at(userid);
return userid; return userid;
} }
@ -310,7 +300,7 @@ bool
TimelineViewManager::hasLoaded() const TimelineViewManager::hasLoaded() const
{ {
for (const auto &view : views_) for (const auto &view : views_)
if (!view->hasLoaded()) if (!view.second->hasLoaded())
return false; return false;
return true; return true;

Write Preview
Loading…
Cancel
Save