commit:74ad5a3fea44e1ae4f142f9dee4e40c708721ed2
author:Chip Black
committer:Chip Black
date:Mon Jun 30 21:48:40 2014 -0500
parents:fa435b6b28d6e700b517f59940e5781451132b9e
Change /feedinfo into /status; add mentioned field
diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
line changes: +42/-19
index becaa96..0a9998a
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -385,34 +385,57 @@ int main(int argc, char *argv[]) {
 		} else {
 			respond_blergref_list(feedlist, recs);
 		}
-
-		struct blerg *b = blerg_open(username);
-		blerg_set_subscription_mark(b);
-		blerg_close(b);
-	} else if (strncmp(path, "/feedinfo", 9) == 0) {
+	} else if (strncmp(path, "/status", 7) == 0) {
 		const char *username = cgi_getentrystr("username");
 		if (!check_auth(username))
 			exit(0);
 
 		yajl_gen g = yajl_gen_alloc(&yajl_c, NULL);
-		yajl_gen_map_open(g);
-		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, (unsigned char *)"new", 3);
-			yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
-		} else {
-			yajl_gen_string(g, (unsigned char *)"subscribed", 10);
-			ret = parse_url_info(path + 10, &info);
-			if ((ret & URL_INFO_NAME) == 1) {
-				yajl_gen_bool(g, is_subscribed(username, info.name));
+		if (strncmp(request_method, "POST", 4) == 0) {
+			const char *clear = cgi_getentrystr("clear");
+
+			if (strncmp(clear, "feed", 4) == 0) {
+				struct blerg *b = blerg_open(username);
+				blerg_set_subscription_mark(b);
+				blerg_close(b);
+				respond_JSON_Success();
+			} else if (strncmp(clear, "mentioned", 9) == 0) {
+				struct blerg *b = blerg_open(username);
+				blerg_set_status(b, BLERGSTATUS_MENTIONED, 0);
+				blerg_close(b);
+				respond_JSON_Success();
 			} else {
-				yajl_gen_bool(g, 0);
+				respond_JSON_Failure();
+			}
+			exit(0);
+		} else if (strncmp(request_method, "GET", 3) == 0) {
+			yajl_gen_map_open(g);
+			if (path[7] == 0) {
+				struct blerg *b = blerg_open(username);
+				uint64_t subscription_mark = blerg_get_subscription_mark(b);
+				int mentioned = blerg_get_status(b, BLERGSTATUS_MENTIONED);
+				blerg_close(b);
+
+				yajl_gen_string(g, (unsigned char *)"feed_new", 7);
+				yajl_gen_integer(g, subscription_count_items(username) - subscription_mark);
+
+				yajl_gen_string(g, (unsigned char *)"mentioned", 9);
+				yajl_gen_bool(g, mentioned);
+			} else {
+				yajl_gen_string(g, (unsigned char *)"subscribed", 10);
+				ret = parse_url_info(path + 8, &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);
+		} else {
+			respond_405();
+			exit(0);
 		}
-		yajl_gen_map_close(g);
 
 		const unsigned char *ybuf;
 		unsigned int content_len;