room list renderer is now aware of which rooms are forum view:

[citadel.git] / webcit-ng / room_functions.c

diff --git a/webcit-ng/room_functions.c b/webcit-ng/room_functions.c
index 006bd287bec95a491ddf87a1da62a4ad02e67e1f..26f35ef5eafabe56c33d973a597f3dcec1aeae53 100644 (file)
--- a/webcit-ng/room_functions.c
+++ b/webcit-ng/room_functions.c
@@ -458,21 +458,22 @@ void room_list(struct http_transaction *h, struct ctdlsession *c) {
        JsonValue *j = NewJsonArray(HKEY("lkra"));
        while (ctdl_readline(c, buf, sizeof(buf)), strcmp(buf, "000")) {
 
+               // 0   |1      |2      |3      |4       |5 |6           |7           |8
                // name|QRflags|QRfloor|QRorder|QRflags2|ra|current_view|default_view|mtime
                JsonValue *jr = NewJsonObject(HKEY("room"));
 
                extract_token(roomname, buf, 0, '|', sizeof roomname);
                JsonObjectAppend(jr, NewJsonPlainString(HKEY("name"), roomname, -1));
 
+               JsonObjectAppend(jr, NewJsonNumber(HKEY("floor"), extract_int(buf, 2)));
+               JsonObjectAppend(jr, NewJsonNumber(HKEY("rorder"), extract_int(buf, 3)));
+
                int ra = extract_int(buf, 5);
                JsonObjectAppend(jr, NewJsonBool(HKEY("known"), (ra & UA_KNOWN)));
                JsonObjectAppend(jr, NewJsonBool(HKEY("hasnewmsgs"), (ra & UA_HASNEWMSGS)));
 
-               int floor = extract_int(buf, 2);
-               JsonObjectAppend(jr, NewJsonNumber(HKEY("floor"), floor));
-
-               int rorder = extract_int(buf, 3);
-               JsonObjectAppend(jr, NewJsonNumber(HKEY("rorder"), rorder));
+               JsonObjectAppend(jr, NewJsonNumber(HKEY("current_view"), extract_int(buf, 6)));
+               JsonObjectAppend(jr, NewJsonNumber(HKEY("default_view"), extract_int(buf, 7)));
 
                JsonArrayAppend(j, jr); // add the room to the array
        }