db.d: simplify room list retrieval

Author: mathiascode

src/db.d

@@ -970,39 +970,48 @@ final class Database
         return RoomType.non_existent;
     }
 
-    string[] rooms(string owner = null,
-                   string member = null,
-                   RoomMemberType member_type = RoomMemberType.any)
+    string[] public_rooms()
     {
-        Appender!string sql;
-        Appender!(string[]) parameters;
+        enum sql = text(
+            "SELECT r.room FROM ", rooms_table, " r",
+            " WHERE r.type = ?;"
+        );
+        enum parameters = [text(cast(uint) RoomType._public)];
 
-        sql ~= text("SELECT r.room FROM ", rooms_table, " r");
+        Appender!(string[]) rooms;
+        foreach (record ; query(sql, parameters)) rooms ~= record[0];
+        return rooms[];
+    }
 
-        if (owner !is null) {
-            sql ~= text(" WHERE r.type = ? AND r.owner = ?");
-            parameters ~= [text(cast(uint) RoomType._private), owner];
-        }
-        else if (member !is null) {
-            sql ~= text(
-                " JOIN ", room_members_table, " m ON r.room = m.room",
-                " WHERE r.type = ? AND m.username = ?"
-            );
-            parameters ~= [text(cast(uint) RoomType._private), member];
+    string[] owned_rooms(string username)
+    {
+        enum sql = text(
+            "SELECT r.room FROM ", rooms_table, " r",
+            " WHERE r.type != ? AND r.owner = ?;"
+        );
+        auto parameters = [text(cast(uint) RoomType._public), username];
 
-            if (member_type != RoomMemberType.any) {
-                sql ~= " AND m.type = ?";
-                parameters ~= text(cast(uint) member_type);
-            }
-        }
-        else {
-            sql ~= text(" WHERE r.type = ?");
-            parameters ~= text(cast(uint) RoomType._public);
+        Appender!(string[]) rooms;
+        foreach (record ; query(sql, parameters)) rooms ~= record[0];
+        return rooms[];
+    }
+
+    string[] member_rooms(RoomMemberType type)(string username)
+    {
+        auto sql = text(
+            "SELECT r.room FROM ", rooms_table, " r",
+            " JOIN ", room_members_table, " m ON r.room = m.room",
+            " WHERE r.type != ? AND m.username = ?"
+        );
+        auto parameters = [text(cast(uint) RoomType._public), username];
+
+        if (type != RoomMemberType.any) {
+            sql ~= " AND m.type = ?";
+            parameters ~= text(cast(uint) type);
         }
-        sql ~= ";";
 
         Appender!(string[]) rooms;
-        foreach (record ; query(sql[], parameters[])) rooms ~= record[0];
+        foreach (record ; query(sql, parameters)) rooms ~= record[0];
         return rooms[];
     }
 

src/server/cmdhandler.d

@@ -154,7 +154,7 @@ final class CommandHandler
         case "rooms":
             Room room;
             Appender!string output;
-            const names = server.db.rooms;
+            const names = server.db.public_rooms;
             output ~= text(names.length, " public rooms.");
             foreach (ref name ; names) {
                 ulong num_users;
@@ -693,7 +693,9 @@ final class CommandHandler
         string rooms(bool is_owner = true) {
             Appender!string output;
             const rooms = is_owner
-                ? server.db.rooms(username) : server.db.rooms(null, username);
+                ? server.db.owned_rooms(username)
+                : server.db.member_rooms!(RoomMemberType.any)(username);
+
             if (rooms.length == 0)
                 return output[];
 

src/server/room.d

@@ -87,7 +87,7 @@ final class Room
 
     bool can_access(string username)
     {
-        return type != RoomType._private
+        return type == RoomType._public
             || is_joined(username)
             || db.can_access_room(name, username);
     }

src/server/server.d

@@ -724,11 +724,44 @@ final class Server
         if (user is null)
             return;
 
-        auto public_rooms = room_stats;
-        auto owned_rooms = room_stats(username);
-        auto member_rooms = room_stats(null, username);
-        auto operated_rooms = db.rooms(
-            null, username, RoomMemberType.operator
+        RoomInfo[] public_room_stats()
+        {
+            Appender!(RoomInfo[]) stats;
+            foreach (ref room_name ; db.public_rooms) {
+                auto room = get_room(room_name);
+
+                if (room !is null)
+                    stats ~= RoomInfo(room_name, cast(uint) room.num_users);
+            }
+            return stats[];
+        }
+
+        RoomInfo[] private_room_stats(string username, bool is_owner = false)
+        {
+            string[] rooms;
+            if (is_owner)
+                rooms = db.owned_rooms(username);
+            else
+                rooms = db.member_rooms!(RoomMemberType.any)(username);
+
+            Appender!(RoomInfo[]) stats;
+            foreach (ref room_name ; rooms) {
+                uint num_users;
+                auto room = get_room(room_name);
+
+                if (room !is null)
+                    num_users = cast(uint) room.num_users;
+
+                stats ~= RoomInfo(room_name, num_users);
+            }
+            return stats[];
+        }
+
+        auto public_rooms = public_room_stats;
+        auto owned_rooms = private_room_stats(username, true);
+        auto member_rooms = private_room_stats(username);
+        auto operated_rooms = db.member_rooms!(RoomMemberType.operator)(
+            username
         );
         scope list_response_msg = new SRoomList(
             public_rooms,
@@ -770,25 +803,6 @@ final class Server
                 user.send_message!(Logging.disabled)(msg);
     }
 
-    private RoomInfo[] room_stats(string owner = null, string member = null)
-    {
-        Room room;
-        Appender!(RoomInfo[]) stats;
-
-        foreach (ref room_name ; db.rooms(owner, member)) {
-            uint num_users;
-            room = get_room(room_name);
-
-            if (room !is null)
-                num_users = cast(uint) room.num_users;
-            else if (owner is null && member is null)
-                continue;
-
-            stats ~= RoomInfo(room_name, num_users);
-        }
-        return stats[];
-    }
-
 
     // Users
 

src/setup/setup.d

@@ -552,11 +552,11 @@ final class Setup
             ? text("until ", privileged_until.toSimpleString) : "no";
         const supporter = (privileged_until > SysTime()) ? "yes" : "no";
         const searchable = db.is_user_unsearchable(username) ? "no" : "yes";
-        const private_rooms_owner = db.rooms(username).join(", ");
-        const private_rooms_member = db.rooms(null, username).join(", ");
-        const private_rooms_operator = db.rooms(
-            null, username, RoomMemberType.operator
-        ).join(", ");
+        const rooms_owner = db.owned_rooms(username).join(", ");
+        const rooms_member = db.member_rooms!(RoomMemberType.any)(
+            username).join(", ");
+        const rooms_operator = db.member_rooms!(RoomMemberType.operator)(
+            username).join(", ");
         const tickers = db.user_tickers!(RoomType.any)(username);
 
         if (banned_until == SysTime.max)
@@ -576,9 +576,9 @@ final class Setup
             "\n\tfiles: ", stats.shared_files,
             "\n\tfolders: ", stats.shared_folders,
             "\n\tupload speed: ", stats.upload_speed,
-            "\n\towned private rooms: ", private_rooms_owner,
-            "\n\tjoined private rooms: ", private_rooms_member,
-            "\n\toperated private rooms: ", private_rooms_operator,
+            "\n\towned rooms: ", rooms_owner,
+            "\n\tmember rooms: ", rooms_member,
+            "\n\toperated rooms: ", rooms_operator,
             "\n\troom tickers: "
         );
 
@@ -633,7 +633,9 @@ final class Setup
         string rooms(bool is_owner = true) {
             Appender!string output;
             const rooms = is_owner
-                ? db.rooms(username) : db.rooms(null, username);
+                ? db.owned_rooms(username)
+                : db.member_rooms!(RoomMemberType.any)(username);
+
             if (rooms.length == 0)
                 return output[];