From 0d91fcd55df97dd52e0a34c1cc8515160ff6bb70 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 21 Jan 2021 08:28:37 +0100
Subject: [PATCH] Rename /api/list -> /api/domains, /api/adlist ->
 /api/adlists, /api/group -> /api/groups, added /api/clients

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 src/api/list.c   | 27 ++++++++++++++++-----------
 src/api/routes.c | 12 ++++++++----
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/api/list.c b/src/api/list.c
index c0d3e30a..320fe0be 100644
--- a/src/api/list.c
+++ b/src/api/list.c
@@ -290,24 +290,29 @@ int api_list(struct mg_connection *conn)
 	bool can_modify = false;
 	const struct mg_request_info *request = mg_get_request_info(conn);
 	const char *argument = NULL;
-	if((argument = startsWith("/api/group", request->local_uri)) != NULL)
+	if((argument = startsWith("/api/groups", request->local_uri)) != NULL)
 	{
 		listtype = GRAVITY_GROUPS;
 		can_modify = true;
 	}
-	else if((argument = startsWith("/api/adlist", request->local_uri)) != NULL)
+	else if((argument = startsWith("/api/adlists", request->local_uri)) != NULL)
 	{
 		listtype = GRAVITY_ADLISTS;
 		can_modify = true;
 	}
-	else if((argument = startsWith("/api/list/allow", request->local_uri)) != NULL)
+	else if((argument = startsWith("/api/clients", request->local_uri)) != NULL)
 	{
-		if((argument = startsWith("/api/list/allow/exact", request->local_uri)) != NULL)
+		listtype = GRAVITY_CLIENTS;
+		can_modify = true;
+	}
+	else if((argument = startsWith("/api/domains/allow", request->local_uri)) != NULL)
+	{
+		if((argument = startsWith("/api/domains/allow/exact", request->local_uri)) != NULL)
 		{
 			listtype = GRAVITY_DOMAINLIST_ALLOW_EXACT;
 			can_modify = true;
 		}
-		else if((argument = startsWith("/api/list/allow/regex", request->local_uri)) != NULL)
+		else if((argument = startsWith("/api/domains/allow/regex", request->local_uri)) != NULL)
 		{
 			listtype = GRAVITY_DOMAINLIST_ALLOW_REGEX;
 			can_modify = true;
@@ -315,14 +320,14 @@ int api_list(struct mg_connection *conn)
 		else
 			listtype = GRAVITY_DOMAINLIST_ALLOW_ALL;
 	}
-	else if((argument = startsWith("/api/list/deny", request->local_uri)) != NULL)
+	else if((argument = startsWith("/api/domains/deny", request->local_uri)) != NULL)
 	{
-		if((argument = startsWith("/api/list/deny/exact", request->local_uri)) != NULL)
+		if((argument = startsWith("/api/domains/deny/exact", request->local_uri)) != NULL)
 		{
 			listtype = GRAVITY_DOMAINLIST_DENY_EXACT;
 			can_modify = true;
 		}
-		else if((argument = startsWith("/api/list/deny/regex", request->local_uri)) != NULL)
+		else if((argument = startsWith("/api/domains/deny/regex", request->local_uri)) != NULL)
 		{
 			listtype = GRAVITY_DOMAINLIST_DENY_REGEX;
 			can_modify = true;
@@ -332,13 +337,13 @@ int api_list(struct mg_connection *conn)
 	}
 	else
 	{
-		if((argument = startsWith("/api/list/exact", request->local_uri)) != NULL)
+		if((argument = startsWith("/api/domains/exact", request->local_uri)) != NULL)
 			listtype = GRAVITY_DOMAINLIST_ALL_EXACT;
-		else if((argument = startsWith("/api/list/regex", request->local_uri)) != NULL)
+		else if((argument = startsWith("/api/domains/regex", request->local_uri)) != NULL)
 			listtype = GRAVITY_DOMAINLIST_ALL_REGEX;
 		else
 		{
-			argument = startsWith("/api/list", request->local_uri);
+			argument = startsWith("/api/domains", request->local_uri);
 			listtype = GRAVITY_DOMAINLIST_ALL_ALL;
 		}
 	}
diff --git a/src/api/routes.c b/src/api/routes.c
index f9f45be8..14a3bbd7 100644
--- a/src/api/routes.c
+++ b/src/api/routes.c
@@ -37,16 +37,20 @@ int api_handler(struct mg_connection *conn, void *ignored)
 	{
 		ret = api_dns_cacheinfo(conn);
 	}
-	/******************************** /api/list, /api/group, /api/adlist ****************************/
-	else if(startsWith("/api/list", request->local_uri))
+	/*********** /api/domains, /api/groups, /api/adlists, /api/clients *******/
+	else if(startsWith("/api/domains", request->local_uri))
 	{
 		ret = api_list(conn);
 	}
-	else if(startsWith("/api/group", request->local_uri))
+	else if(startsWith("/api/groups", request->local_uri))
 	{
 		ret = api_list(conn);
 	}
-	else if(startsWith("/api/adlist", request->local_uri))
+	else if(startsWith("/api/adlists", request->local_uri))
+	{
+		ret = api_list(conn);
+	}
+	else if(startsWith("/api/clients", request->local_uri))
 	{
 		ret = api_list(conn);
 	}