Remove map pool functionality, add configurable url

Kacper-Kondracki · Oct 27, 2020 · 2db31c8 · 2db31c8
1 parent 0b5b23e
commit 2db31c8
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 85 deletions.
diff --git a/OsuFriendsApi/Entities/Map.cs b/OsuFriendsApi/Entities/Map.cs
diff --git a/OsuFriendsApi/Entities/OsuUser.cs b/OsuFriendsApi/Entities/OsuUser.cs
@@ -14,7 +14,7 @@ internal OsuUser(Guid? key, OsuFriendsClient client)
         {
             Key = key ?? Guid.NewGuid();
             _client = client;
-            UriBuilder uriBuilder = new UriBuilder(OsuFriendsClient.url);
+            UriBuilder uriBuilder = new UriBuilder(client.Url);
             uriBuilder.Path += $"auth/{Key}";
             Url = uriBuilder.Uri;
         }

diff --git a/OsuFriendsApi/Entities/Party.cs b/OsuFriendsApi/Entities/Party.cs
diff --git a/OsuFriendsApi/OsuFriendsClient.cs b/OsuFriendsApi/OsuFriendsClient.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json;
 using OsuFriendsApi.Entities;
 using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -15,7 +14,7 @@ public class OsuFriendsClient
         private string _token;
         private readonly HttpClient _httpClient;
         private readonly ILogger _logger;
-        public const string url = "https://osufriends.ovh/";
+        public Uri Url { get; set; } = new Uri("https://osufriends.ovh/");
 
         public OsuFriendsClient(HttpClient httpClient, ILogger<OsuFriendsClient> logger)
         {
@@ -49,7 +48,7 @@ public OsuUser CreateUser(Guid? key = null)
 
         internal async Task<Status?> GetStatusAsync(OsuUser user)
         {
-            UriBuilder uriBuilder = new UriBuilder(url);
+            UriBuilder uriBuilder = new UriBuilder(Url);
             uriBuilder.Path += "status/";
 
             NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
@@ -67,7 +66,7 @@ public OsuUser CreateUser(Guid? key = null)
 
         internal async Task<OsuUserDetails> GetDetailsAsync(OsuUser user)
         {
-            UriBuilder uriBuilder = new UriBuilder(url);
+            UriBuilder uriBuilder = new UriBuilder(Url);
             uriBuilder.Path += "details/";
 
             NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
@@ -82,36 +81,5 @@ internal async Task<OsuUserDetails> GetDetailsAsync(OsuUser user)
             _logger.LogTrace("Details of {key}: {details}", user.Key, content);
             return JsonConvert.DeserializeObject<OsuUserDetails>(content);
         }
-
-        public async Task<IReadOnlyCollection<Party>> GetPartiesAsync()
-        {
-            UriBuilder uriBuilder = new UriBuilder(url);
-            uriBuilder.Path += "get_parties/";
-
-            NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
-            query["secret"] = _token;
-            uriBuilder.Query = query.ToString();
-
-            HttpResponseMessage response = await _httpClient.GetAsync(uriBuilder.Uri).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            return JsonConvert.DeserializeObject<IReadOnlyCollection<Party>>(content);
-        }
-
-        public async Task<IReadOnlyCollection<Map>> GetMappoolAsync(Party party)
-        {
-            UriBuilder uriBuilder = new UriBuilder(url);
-            uriBuilder.Path += "get_mappool/";
-
-            NameValueCollection query = HttpUtility.ParseQueryString(uriBuilder.Query);
-            query["secret"] = _token;
-            query["party"] = party.Id.ToString();
-            uriBuilder.Query = query.ToString();
-
-            HttpResponseMessage response = await _httpClient.GetAsync(uriBuilder.Uri).ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            return JsonConvert.DeserializeObject<IReadOnlyCollection<Map>>(content);
-        }
     }
 }
diff --git a/OsuFriendsBot/Config.cs b/OsuFriendsBot/Config.cs
@@ -1,11 +1,13 @@
 using Serilog.Events;
+using System;
 
 namespace OsuFriendsBot
 {
     public class Config
     {
         public string Token { get; set; }
         public string OsuFriendsApiToken { get; set; }
+        public Uri OsuFriendsApiUrl { get; set; }
         public string Prefix { get; set; }
         public string ConnectionString { get; set; }
         public string LogPath { get; set; }

diff --git a/OsuFriendsBot/Embeds/InfoEmbed.cs b/OsuFriendsBot/Embeds/InfoEmbed.cs
@@ -12,7 +12,7 @@ public InfoEmbed(RestApplication app)
             ThumbnailUrl = app.IconUrl;
             AddField("Author:", app.Owner);
             AddField("Git repo:", @"https://github.com/AbdShullah/OsuFriendsBot");
-            AddField("Bot Version:", "0.0.9");
+            AddField("Bot Version:", "0.1.0");
             Color = EmbedColors.Info;
         }
     }

diff --git a/OsuFriendsBot/Modules/FunModule.cs b/OsuFriendsBot/Modules/FunModule.cs
@@ -1,10 +1,8 @@
 using Discord;
 using Discord.Commands;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using OsuFriendsApi;
 using OsuFriendsDb.Services;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace OsuFriendsBot.Modules
@@ -32,25 +30,5 @@ public async Task UwuCmd()
             int count = _dbUserData.FindById(Context.User.Id).Uwu;
             await ReplyAsync($"{Format.Bold("What's this?")} | {Context.User.Username}, you've {Format.Bold("uwu")}'d {Format.Code(count.ToString())} times");
         }
-
-        [Command("party")]
-        [Summary("party")]
-        public async Task PartyCmd()
-        {
-            System.Collections.Generic.IReadOnlyCollection<OsuFriendsApi.Entities.Party> parties = await _osuFriends.GetPartiesAsync();
-            await ReplyAsync(JsonConvert.SerializeObject(parties));
-            OsuFriendsApi.Entities.Map x = (await _osuFriends.GetMappoolAsync(parties.First())).First();
-            EmbedBuilder embedBuilder = new EmbedBuilder();
-            embedBuilder
-                .WithTitle(x.Name)
-                .WithDescription(x.Url.ToString())
-                .AddField("Difficulty", x.Difficulty)
-                .AddField("Stars", x.Stars)
-                .AddField("Status", x.Status)
-                .AddField("BPM", x.Bpm)
-                .WithImageUrl(x.Image.ToString());
-
-            await ReplyAsync(embed: embedBuilder.Build());
-        }
     }
 }
diff --git a/OsuFriendsBot/Services/StartupService.cs b/OsuFriendsBot/Services/StartupService.cs
@@ -48,7 +48,13 @@ public async Task StartAsync()
             {
                 throw new Exception("Please enter your api token into the `config.json` file found in the applications root directory.");
             }
+
             _services.GetRequiredService<OsuFriendsClient>().SetToken(_config.OsuFriendsApiToken);
+
+            if (_config.OsuFriendsApiUrl != null)
+            {
+                _services.GetRequiredService<OsuFriendsClient>().Url = _config.OsuFriendsApiUrl;
+            }
             _config.OsuFriendsApiToken = string.Empty;
 
             _logger.LogInformation("Setting Discord Bot token");