From 75af3cb864c7e0dd3e9547be22711456315e5fb5 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Tue, 4 Aug 2015 15:45:37 -0300 Subject: [PATCH] Simplified Regions --- Discord.Net/API/DiscordAPI.cs | 4 ++-- Discord.Net/DiscordClient.cs | 2 +- Discord.Net/Region.cs | 38 +++++++++----------------------------- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/Discord.Net/API/DiscordAPI.cs b/Discord.Net/API/DiscordAPI.cs index 5affb594c..745875d17 100644 --- a/Discord.Net/API/DiscordAPI.cs +++ b/Discord.Net/API/DiscordAPI.cs @@ -25,9 +25,9 @@ namespace Discord.API return Http.Post(Endpoints.AuthLogout, options); } - public static Task CreateServer(string name, Region region, HttpOptions options) + public static Task CreateServer(string name, string region, HttpOptions options) { - var request = new CreateServerRequest { Name = name, Region = RegionConverter.Convert(region) }; + var request = new CreateServerRequest { Name = name, Region = region }; return Http.Post(Endpoints.Servers, request, options); } public static Task DeleteServer(string id, HttpOptions options) diff --git a/Discord.Net/DiscordClient.cs b/Discord.Net/DiscordClient.cs index 881cf12fd..0a2fcc6bb 100644 --- a/Discord.Net/DiscordClient.cs +++ b/Discord.Net/DiscordClient.cs @@ -212,7 +212,7 @@ namespace Discord _isClosing = false; } - public Task CreateServer(string name, Region region) + public Task CreateServer(string name, string region) { CheckReady(); return DiscordAPI.CreateServer(name, region, _httpOptions); diff --git a/Discord.Net/Region.cs b/Discord.Net/Region.cs index bbe93767a..89a6e76d0 100644 --- a/Discord.Net/Region.cs +++ b/Discord.Net/Region.cs @@ -1,32 +1,12 @@ -using System; - -namespace Discord +namespace Discord { - public enum Region + public static class Region { - US_West, - US_East, - Singapore, - London, - Sydney, - Amsterdam - } - - internal static class RegionConverter - { - public static string Convert(Region region) - { - switch (region) - { - case Region.US_West: return "us-west"; - case Region.US_East: return "us-east"; - case Region.Singapore: return "singapore"; - case Region.London: return "london"; - case Region.Sydney: return "sydney"; - case Region.Amsterdam: return "amsterdam"; - default: - throw new ArgumentOutOfRangeException("Unknown server region"); - } - } - } + public const string US_West = "us-west"; + public const string US_East = "us-east"; + public const string Singapore = "singapore"; + public const string London = "london"; + public const string Sydney = "sydney"; + public const string Amsterdam = "amsterdam"; + } }