From d84c95654a93709998eff649d1815e9e07c747bd Mon Sep 17 00:00:00 2001
From: exsersewo <exsersewo@systemexit.co.uk>
Date: Sat, 4 Apr 2020 01:38:20 +0100
Subject: [PATCH] Remove restease and fix tags

---
 Booru.Net.Tests/Booru.Net.Tests.csproj        |  4 +-
 Booru.Net.Tests/Program.cs                    |  6 +--
 Booru.Net/Booru.Net.csproj                    |  9 ++---
 Booru.Net/Clients/DanbooruClient.cs           | 33 +++++++++-------
 Booru.Net/Clients/E621Client.cs               | 39 ++++++++++++-------
 Booru.Net/Clients/GelbooruClient.cs           | 33 +++++++++-------
 Booru.Net/Clients/KonaChanClient.cs           | 33 +++++++++-------
 Booru.Net/Clients/RealbooruClient.cs          | 37 +++++++++++-------
 Booru.Net/Clients/Rule34Client.cs             | 33 +++++++++-------
 Booru.Net/Clients/SafeBooruClient.cs          | 33 +++++++++-------
 Booru.Net/Clients/YandereClient.cs            | 33 +++++++++-------
 Booru.Net/Interfaces/IIndexBooruClient.cs     | 13 -------
 Booru.Net/Interfaces/IPHPBooruClient.cs       | 13 -------
 Booru.Net/Interfaces/IPostBooruClient.cs      | 13 -------
 Booru.Net/Interfaces/IPostsBooruClient.cs     | 13 -------
 .../Interfaces/IPostsWrappedBooruClient.cs    | 13 -------
 16 files changed, 175 insertions(+), 183 deletions(-)
 delete mode 100644 Booru.Net/Interfaces/IIndexBooruClient.cs
 delete mode 100644 Booru.Net/Interfaces/IPHPBooruClient.cs
 delete mode 100644 Booru.Net/Interfaces/IPostBooruClient.cs
 delete mode 100644 Booru.Net/Interfaces/IPostsBooruClient.cs
 delete mode 100644 Booru.Net/Interfaces/IPostsWrappedBooruClient.cs

diff --git a/Booru.Net.Tests/Booru.Net.Tests.csproj b/Booru.Net.Tests/Booru.Net.Tests.csproj
index eaeb3c5..e232d35 100644
--- a/Booru.Net.Tests/Booru.Net.Tests.csproj
+++ b/Booru.Net.Tests/Booru.Net.Tests.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AssemblyVersion>2020.4.10.0</AssemblyVersion>
-    <FileVersion>2020.4.10.0</FileVersion>
+    <AssemblyVersion>2020.4.28.0</AssemblyVersion>
+    <FileVersion>2020.4.28.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Booru.Net.Tests/Program.cs b/Booru.Net.Tests/Program.cs
index f33329f..b570a6a 100644
--- a/Booru.Net.Tests/Program.cs
+++ b/Booru.Net.Tests/Program.cs
@@ -23,7 +23,7 @@ namespace Booru.Net.Tests
             {
                 Console.WriteLine(client);
 
-                string[] tags = new[] { "corona" };
+                List<string> tags = new List<string>{ "corona", "-cum" };
 
                 switch (client)
                 {
@@ -35,8 +35,8 @@ namespace Booru.Net.Tests
                         break;
                     case 1:
                         {
-                            var p = await new E621Client().GetImagesAsync(tags).ConfigureAwait(false);
-                            Console.WriteLine(p.Posts.All(x => x.Tags.Any(z => z.Value.Any(y => tags.Contains(y)))));
+                            var posts = await new E621Client().GetImagesAsync(tags).ConfigureAwait(false);
+                            Console.WriteLine(posts.All(x => x.Tags.Any(z => z.Value.Any(y => tags.Contains(y)))));
                         }
                         break;
                     case 2:
diff --git a/Booru.Net/Booru.Net.csproj b/Booru.Net/Booru.Net.csproj
index cf33f09..67e57c5 100644
--- a/Booru.Net/Booru.Net.csproj
+++ b/Booru.Net/Booru.Net.csproj
@@ -24,11 +24,11 @@ Yande.re</Description>
     <PackageTags>booru imageboard api wrapper</PackageTags>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>2.0.4</Version>
+    <Version>2.0.5</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <AssemblyVersion>2.0.4.0</AssemblyVersion>
-    <FileVersion>2.0.4.0</FileVersion>
-    <PackageReleaseNotes>Fix E621 Tags</PackageReleaseNotes>
+    <AssemblyVersion>2.0.5.0</AssemblyVersion>
+    <FileVersion>2.0.5.0</FileVersion>
+    <PackageReleaseNotes>Tags now work</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -46,7 +46,6 @@ Yande.re</Description>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="RestEase" Version="1.4.10" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 
diff --git a/Booru.Net/Clients/DanbooruClient.cs b/Booru.Net/Clients/DanbooruClient.cs
index 3f9757a..1186bd2 100644
--- a/Booru.Net/Clients/DanbooruClient.cs
+++ b/Booru.Net/Clients/DanbooruClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class DanbooruClient : IPostsBooruClient<DanbooruImage>, IDisposable
+    public class DanbooruClient : IDisposable
     {
-        IPostsBooruClient<DanbooruImage> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public DanbooruClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://danbooru.donmai.us/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPostsBooruClient<DanbooruImage>>();
         }
 
         public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<DanbooruImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"posts.json?tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<DanbooruImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/E621Client.cs b/Booru.Net/Clients/E621Client.cs
index eea0ee6..3749a0f 100644
--- a/Booru.Net/Clients/E621Client.cs
+++ b/Booru.Net/Clients/E621Client.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,45 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class E621Client : IPostsWrappedBooruClient<WrappedPosts<E621Image>>, IDisposable
+    public class E621Client : IDisposable
     {
-        IPostsWrappedBooruClient<WrappedPosts<E621Image>> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public E621Client()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://e621.net/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPostsWrappedBooruClient<WrappedPosts<E621Image>>>();
         }
 
-        public Task<WrappedPosts<E621Image>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+        public Task<IReadOnlyList<E621Image>> GetImagesAsync(IEnumerable<string> tags)
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public Task<IReadOnlyList<E621Image>> GetImagesAsync(params string[] tags)
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<E621Image>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"posts.json?tags={tags}").ConfigureAwait(false);
 
-        public Task<WrappedPosts<E621Image>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            var posts = JsonConvert.DeserializeObject<WrappedPosts<E621Image>>(content, settings);
+
+            return posts.Posts;
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/GelbooruClient.cs b/Booru.Net/Clients/GelbooruClient.cs
index af0c2ec..d1581cc 100644
--- a/Booru.Net/Clients/GelbooruClient.cs
+++ b/Booru.Net/Clients/GelbooruClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class GelbooruClient : IPHPBooruClient<GelbooruImage>, IDisposable
+    public class GelbooruClient : IDisposable
     {
-        IPHPBooruClient<GelbooruImage> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public GelbooruClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://gelbooru.com/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPHPBooruClient<GelbooruImage>>();
         }
 
         public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<GelbooruImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<GelbooruImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/KonaChanClient.cs b/Booru.Net/Clients/KonaChanClient.cs
index ec96bdf..7901d2a 100644
--- a/Booru.Net/Clients/KonaChanClient.cs
+++ b/Booru.Net/Clients/KonaChanClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class KonaChanClient : IPostBooruClient<KonaChanImage>, IDisposable
+    public class KonaChanClient : IDisposable
     {
-        IPostBooruClient<KonaChanImage> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public KonaChanClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://konachan.com/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPostBooruClient<KonaChanImage>>();
         }
 
         public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<KonaChanImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"post.json?tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<KonaChanImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/RealbooruClient.cs b/Booru.Net/Clients/RealbooruClient.cs
index c82ca45..b15b749 100644
--- a/Booru.Net/Clients/RealbooruClient.cs
+++ b/Booru.Net/Clients/RealbooruClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class RealbooruClient : IPHPBooruClient<RealbooruImage>, IDisposable
+    public class RealbooruClient : IDisposable
     {
-        IPHPBooruClient<RealbooruImage> _api;
+        HttpClient _api;
+        JsonSerializerSettings settings;
 
         public RealbooruClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://realbooru.com/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPHPBooruClient<RealbooruImage>>();
         }
 
-        public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(IEnumerable<string> tags)
-            => await _api.GetImagesAsync(tags).ConfigureAwait(false);
+        public Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(IEnumerable<string> tags)
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(params string[] tags)
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
 
-        public async Task<IReadOnlyList<RealbooruImage>> GetImagesAsync(params string[] tags)
-            => await _api.GetImagesAsync(tags).ConfigureAwait(false);
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<RealbooruImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/Rule34Client.cs b/Booru.Net/Clients/Rule34Client.cs
index b2c0415..596c8d0 100644
--- a/Booru.Net/Clients/Rule34Client.cs
+++ b/Booru.Net/Clients/Rule34Client.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class Rule34Client : IPHPBooruClient<Rule34Image>, IDisposable
+    public class Rule34Client : IDisposable
     {
-        IPHPBooruClient<Rule34Image> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public Rule34Client()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://rule34.xxx/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPHPBooruClient<Rule34Image>>();
         }
 
         public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<Rule34Image>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<Rule34Image>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<Rule34Image>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/SafeBooruClient.cs b/Booru.Net/Clients/SafeBooruClient.cs
index ccbd7a3..be9f130 100644
--- a/Booru.Net/Clients/SafeBooruClient.cs
+++ b/Booru.Net/Clients/SafeBooruClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class SafebooruClient : IPHPBooruClient<SafebooruImage>, IDisposable
+    public class SafebooruClient : IDisposable
     {
-        IPHPBooruClient<SafebooruImage> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public SafebooruClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://safebooru.org/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPHPBooruClient<SafebooruImage>>();
         }
 
         public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<SafebooruImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"index.php?page=dapi&s=post&q=index&json=1&tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<SafebooruImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Clients/YandereClient.cs b/Booru.Net/Clients/YandereClient.cs
index e5d99bb..af2f155 100644
--- a/Booru.Net/Clients/YandereClient.cs
+++ b/Booru.Net/Clients/YandereClient.cs
@@ -1,5 +1,4 @@
 using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -7,35 +6,43 @@ using System.Threading.Tasks;
 
 namespace Booru.Net
 {
-    public class YandereClient : IPostBooruClient<YandereImage>, IDisposable
+    public class YandereClient : IDisposable
     {
-        IPostBooruClient<YandereImage> _api;
+        private readonly HttpClient _api;
+        private readonly JsonSerializerSettings settings;
 
         public YandereClient()
         {
-            var httpClient = new HttpClient
+            _api = new HttpClient
             {
                 BaseAddress = new Uri("https://yande.re/")
             };
-            httpClient.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
+            _api.DefaultRequestHeaders.Add("User-Agent", $"Booru.Net/v{Props.LibraryVersion} (https://github.com/exsersewo/Booru.Net)");
 
-            JsonSerializerSettings settings = new JsonSerializerSettings
+            settings = new JsonSerializerSettings
             {
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            _api = new RestClient(httpClient)
-            {
-                JsonSerializerSettings = settings
-            }.For<IPostBooruClient<YandereImage>>();
         }
 
         public Task<IReadOnlyList<YandereImage>> GetImagesAsync(IEnumerable<string> tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
 
         public Task<IReadOnlyList<YandereImage>> GetImagesAsync(params string[] tags)
-            => _api.GetImagesAsync(tags);
+            => GetImagesAsync(string.Join("%20", tags));
+
+        public async Task<IReadOnlyList<YandereImage>> GetImagesAsync(string tags)
+        {
+            var get = await _api.GetAsync($"post.json?tags={tags}").ConfigureAwait(false);
+
+            if (!get.IsSuccessStatusCode)
+                throw new HttpRequestException($"Response failed with reason: \"({get.StatusCode}) {get.ReasonPhrase}\"");
+
+            var content = await get.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            return JsonConvert.DeserializeObject<IReadOnlyList<YandereImage>>(content, settings);
+        }
 
         public void Dispose()
         {
diff --git a/Booru.Net/Interfaces/IIndexBooruClient.cs b/Booru.Net/Interfaces/IIndexBooruClient.cs
deleted file mode 100644
index 9e51ece..0000000
--- a/Booru.Net/Interfaces/IIndexBooruClient.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using RestEase;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Booru.Net
-{
-    public interface IIndexBooruClient<T> : IDisposable
-    {
-        [Get("index.json")]
-        public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
-    }
-}
diff --git a/Booru.Net/Interfaces/IPHPBooruClient.cs b/Booru.Net/Interfaces/IPHPBooruClient.cs
deleted file mode 100644
index 5e956ca..0000000
--- a/Booru.Net/Interfaces/IPHPBooruClient.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using RestEase;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Booru.Net
-{
-    public interface IPHPBooruClient<T> : IDisposable
-    {
-        [Get("index.php?page=dapi&s=post&q=index&json=1")]
-        public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
-    }
-}
diff --git a/Booru.Net/Interfaces/IPostBooruClient.cs b/Booru.Net/Interfaces/IPostBooruClient.cs
deleted file mode 100644
index 20dbd9b..0000000
--- a/Booru.Net/Interfaces/IPostBooruClient.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using RestEase;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Booru.Net
-{
-    public interface IPostBooruClient<T> : IDisposable
-    {
-        [Get("post.json")]
-        public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
-    }
-}
diff --git a/Booru.Net/Interfaces/IPostsBooruClient.cs b/Booru.Net/Interfaces/IPostsBooruClient.cs
deleted file mode 100644
index 1ec2252..0000000
--- a/Booru.Net/Interfaces/IPostsBooruClient.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using RestEase;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Booru.Net
-{
-    public interface IPostsBooruClient<T> : IDisposable
-    {
-        [Get("posts.json")]
-        public Task<IReadOnlyList<T>> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
-    }
-}
diff --git a/Booru.Net/Interfaces/IPostsWrappedBooruClient.cs b/Booru.Net/Interfaces/IPostsWrappedBooruClient.cs
deleted file mode 100644
index a0ef5ad..0000000
--- a/Booru.Net/Interfaces/IPostsWrappedBooruClient.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using RestEase;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Booru.Net
-{
-    public interface IPostsWrappedBooruClient<T> : IDisposable
-    {
-        [Get("posts.json")]
-        public Task<T> GetImagesAsync([Query("tags")] IEnumerable<string> tags);
-    }
-}