diff --git a/src/Cache.cpp b/src/Cache.cpp index 5ccf92914b9642172ab7a30aa230306ec0a0b6c1..799dd319f168289725b97fa9f8e920dc8dbc9ee1 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -1253,7 +1253,6 @@ Cache::getTimelineMentions() return notifs; } - mtx::responses::Timeline Cache::getTimelineMessages(lmdb::txn &txn, const std::string &room_id) { @@ -2022,7 +2021,8 @@ Cache::saveTimelineMentions(lmdb::txn &txn, int i = 0; for (const auto ¬if : res) { - nhlog::db()->debug("Storing notification " + std::to_string(i++) + " for room " + room_id); + nhlog::db()->debug("Storing notification " + std::to_string(i++) + " for room " + + room_id); const auto event_id = utils::event_id(notif.event); // double check that we have the correct room_id... diff --git a/src/Cache.h b/src/Cache.h index 07ccf79079898f1efa37f6fe85e0f58d5ca39355..97b264fcb4c48ae84917e15225a5b4ab2969c184 100644 --- a/src/Cache.h +++ b/src/Cache.h @@ -482,7 +482,7 @@ private: //! Get timeline items that a user was mentions in for a given room mtx::responses::Notifications getTimelineMentionsForRoom(lmdb::txn &txn, - const std::string &room_id); + const std::string &room_id); QString getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); QString getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 2a02e7400da732c21444e8d82610f6644203134c..54562c82dcbd60db66d5d67c59c0713c6e3b6c9e 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -89,9 +89,9 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom); connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom); - user_info_widget_ = new UserInfoWidget(sideBar_); + user_info_widget_ = new UserInfoWidget(sideBar_); user_mentions_popup_ = new popups::UserMentions(); - room_list_ = new RoomList(sideBar_); + room_list_ = new RoomList(sideBar_); connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom); sideBarLayout_->addWidget(user_info_widget_);