From acb889b256303945ce8155849822c3e4d1f22d79 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 25 Apr 2019 23:01:01 -0400 Subject: [PATCH] march mode list is loaded and works, now just need to filter it --- webcit-ng/api.txt | 2 +- webcit-ng/room_functions.c | 2 +- webcit-ng/static/css/webcit.css | 2 +- webcit-ng/static/js/main.js | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/webcit-ng/api.txt b/webcit-ng/api.txt index 4621f9bec..dc5ebc00d 100644 --- a/webcit-ng/api.txt +++ b/webcit-ng/api.txt @@ -9,6 +9,6 @@ GET /ctdl/r/ROOMNAME/ Returns information about the room (name, view, etc.) in GET /ctdl/r/ROOMNAME/msgs.all JSON array of message list in room GET /ctdl/r/ROOMNAME/msgs.new JSON array of message list in room (new messages) GET /ctdl/c/info Returns a JSON representation of the output of an INFO server command -POST /ctdl/a/login +POST /ctdl/a/login Send it a your credentials and it will log you in GET /ctdl/a/whoami GET /ctdl/u/USERNAME/userpic Returns an image containing the photo/avatar of the specified user diff --git a/webcit-ng/room_functions.c b/webcit-ng/room_functions.c index 75ef7bcf5..4f8b231e2 100644 --- a/webcit-ng/room_functions.c +++ b/webcit-ng/room_functions.c @@ -1,7 +1,7 @@ /* * Room functions * - * Copyright (c) 1996-2018 by the citadel.org team + * Copyright (c) 1996-2019 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css index 6c157d1e7..f2cc68abc 100644 --- a/webcit-ng/static/css/webcit.css +++ b/webcit-ng/static/css/webcit.css @@ -1,4 +1,4 @@ -/* Copyright (c) 1996-2018 by Art Cancro and the citadel.org team. +/* Copyright (c) 1996-2019 by Art Cancro and the citadel.org team. ** This program is open source software. You can redistribute it and/or ** modify it under the terms of the GNU General Public License, version 3. */ diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js index 5c200b310..5f02ec0c3 100644 --- a/webcit-ng/static/js/main.js +++ b/webcit-ng/static/js/main.js @@ -207,9 +207,11 @@ function gotoroom_2(data) { // Goto next room with unread messages +// function gotonext() { console.log("march list contains " + march_list.length ); if (march_list.length == 0) { + load_new_march_list(); march_list = [ {"rorder":0,"name":"CitaNews","known":true,"hasnewmsgs":true,"floor":0} , {"rorder":0,"name":"Hot Rodding","known":true,"hasnewmsgs":true,"floor":0} , @@ -220,6 +222,23 @@ function gotonext() { else { next_room = march_list[0].name; march_list.splice(0, 1); + console.log("going to " + next_room); gotoroom(next_room); } } + + +// Called by gotonext() when the march list is empty. +// +function load_new_march_list() { + var request = new XMLHttpRequest(); + request.open("GET", "/ctdl/r/", true); + request.onreadystatechange = function() { + if ((this.readyState === 4) && ((this.status / 100) == 2)) { + march_list = (JSON.parse(this.responseText)); + gotonext(); // yes , we recurse right back FIXME sort and filter this data + } + }; + request.send(); + request = null; +} -- 2.30.2