Rework /feedinfo logic

[blerg.git] / cgi / cgi_blerg.c

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 1bba24d..cfe8031 100644 (file)
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -307,12 +307,12 @@ int main(int argc, char *argv[]) {
                        exit(0);
                }
 
-               if (!auth_login(username, password)) {
+               char *token = auth_login(username, password);
+               if (token == NULL) {
                        respond_JSON_Failure();
                        exit(0);
                }
 
-               char *token = auth_get_token(username);
                printf("Set-Cookie: auth=%s\r\n", token);
                free(token);
 
@@ -327,10 +327,10 @@ int main(int argc, char *argv[]) {
                if (!check_auth(username))
                        exit(0);
 
-               auth_logout(username);
+               const char *given_token = cgi_getcookie("auth");
+               auth_logout(username, given_token);
                respond_JSON_Success();
-       } else if (strncmp(path, "/subscribe", 11) == 0 || strncmp(path, "/unsubscribe", 13) == 0) {
-
+       } else if (strncmp(path, "/subscribe", 10) == 0 || strncmp(path, "/unsubscribe", 12) == 0) {
                const char *username = cgi_getentrystr("username");
                if (!check_auth(username))
                        exit(0);
@@ -381,21 +381,24 @@ int main(int argc, char *argv[]) {
                if (!check_auth(username))
                        exit(0);
 
-               if (path[9] != '/') {
-                       respond_404();
-                       exit(0);
-               }
-
-               ret = parse_url_info(path + 10, &info);
-               if ((ret & URL_INFO_NAME) == 0) {
-                       respond_404();
-                       exit(0);
-               }
-
                yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
                yajl_gen_map_open(g);
-               yajl_gen_string(g, "subscribed", 10);
-               yajl_gen_bool(g, is_subscribed(username, info.name));
+               if (path[9] == 0) {
+                       struct blerg *b = blerg_open(username);
+                       uint64_t subscription_mark = blerg_get_subscription_mark(b);
+                       blerg_close(b);
+
+                       yajl_gen_string(g, "new", 3);
+                       yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
+               } else {
+                       yajl_gen_string(g, "subscribed", 10);
+                       ret = parse_url_info(path + 10, &info);
+                       if ((ret & URL_INFO_NAME) == 1) {
+                               yajl_gen_bool(g, is_subscribed(username, info.name));
+                       } else {
+                               yajl_gen_bool(g, 0);
+                       }
+               }
                yajl_gen_map_close(g);
 
                const unsigned char *ybuf;