From 9297f2ef0d84f84124aad0e3dce885a67ddacb91 Mon Sep 17 00:00:00 2001
From: Deathmax <death@deathmax.tk>
Date: Sat, 7 Jan 2012 19:34:27 +0800
Subject: [PATCH] Add REST endpoint

v2 users list - tab-delimited
---
 TShockAPI/Rest/RestManager.cs | 48 ++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs
index 0d5e52f3..44b08003 100644
--- a/TShockAPI/Rest/RestManager.cs
+++ b/TShockAPI/Rest/RestManager.cs
@@ -40,6 +40,7 @@ namespace TShockAPI
 			Rest.Register(new RestCommand("/tokentest", TokenTest) {RequiresToken = true});
 
 			Rest.Register(new RestCommand("/users/activelist", UserList) {RequiresToken = true});
+            Rest.Register(new RestCommand("/v2/users/activelist", UserListV2) { RequiresToken = true });
 			Rest.Register(new RestCommand("/v2/users/read", UserInfoV2) { RequiresToken = true });
 			Rest.Register(new RestCommand("/v2/users/destroy", UserDestroyV2) { RequiresToken = true });
 			Rest.Register(new RestCommand("/v2/users/update", UserUpdateV2) { RequiresToken = true });
@@ -167,23 +168,17 @@ namespace TShockAPI
 
 		#region RestUserMethods
 
-		private object UserList(RestVerbs verbs, IParameterCollection parameters)
-		{
-			var ret = new RestObject("200");
-			string playerlist = "";
-			foreach (var TSPlayer in TShock.Players)
-			{
-				if (playerlist == "")
-				{
-					playerlist += TSPlayer.UserAccountName;
-				} else
-				{
-					playerlist += ", " + TSPlayer.UserAccountName;
-				}
-			}
-			ret["activeuesrs"] = playerlist;
-			return ret;
-		}
+        private object UserListV2(RestVerbs verbs, IParameterCollection parameters)
+        {
+            var ret = new RestObject("200");
+            string playerlist = "";
+            foreach (var TSPlayer in TShock.Players)
+            {
+                playerlist += playerlist == "" ? TSPlayer.UserAccountName : "\t" + TSPlayer.UserAccountName;
+            }
+            ret["activeusers"] = playerlist;
+            return ret;
+        }
 
 		private object UserUpdateV2(RestVerbs verbs, IParameterCollection parameters)
 		{
@@ -718,6 +713,25 @@ namespace TShockAPI
 			return returnBlock;
 		}
 
+        private object UserList(RestVerbs verbs, IParameterCollection parameters)
+        {
+            var ret = new RestObject("200");
+            string playerlist = "";
+            foreach (var TSPlayer in TShock.Players)
+            {
+                if (playerlist == "")
+                {
+                    playerlist += TSPlayer.UserAccountName;
+                }
+                else
+                {
+                    playerlist += ", " + TSPlayer.UserAccountName;
+                }
+            }
+            ret["activeuesrs"] = playerlist;
+            return ret;
+        }
+
 		private object BanDestroy(RestVerbs verbs, IParameterCollection parameters)
 		{
 			var returnBlock = new Dictionary<string, string>();