Clean up final nits

2 files changed, 6 insertions, 5 deletions

diff --git a/src/RoomDirectoryModel.cpp b/src/RoomDirectoryModel.cpp

index 5873771f..61c3eb72 100644
--- a/src/RoomDirectoryModel.cpp
+++ b/src/RoomDirectoryModel.cpp
@@ -69,10 +69,8 @@ RoomDirectoryModel::setSearchTerm(const QString &f)
 bool

 RoomDirectoryModel::canJoinRoom(const QByteArray &room)

 {

-        const auto &cache = cache::roomInfo();

         const QString room_id(room);

-        const bool validRoom = !room_id.isNull() && !room_id.isEmpty();

-        return validRoom && !cache.contains(room_id);

+        return !room_id.isEmpty() && !cache::getRoomInfo({room_id.toStdString()}).count(room_id);

 }

 

 std::vector<std::string>

diff --git a/src/RoomDirectoryModel.h b/src/RoomDirectoryModel.h

index b7eda00d..791384fa 100644
--- a/src/RoomDirectoryModel.h
+++ b/src/RoomDirectoryModel.h
@@ -71,11 +71,14 @@ signals:
         void reachedEndOfPaginationChanged();

 

 public slots:

-        void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms,

-                          const std::string &next_batch);

         void setMatrixServer(const QString &s = "");

         void setSearchTerm(const QString &f);

 

+private slots:

+

+        void displayRooms(std::vector<mtx::responses::PublicRoomsChunk> rooms,

+                          const std::string &next_batch);

+

 private:

         static constexpr size_t limit_ = 50;