Add filter to requests

Xwilarg · Aug 17, 2022 · 68b76c4 · 68b76c4
1 parent 1113461
commit 68b76c4
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 22 deletions.
diff --git a/BooruSharp/Booru/ABooru.cs b/BooruSharp/Booru/ABooru.cs
@@ -152,7 +152,7 @@ public async Task CheckAvailabilityAsync()
         /// Add booru authentification to current request
         /// </summary>
         /// <param name="message">The request that is going to be sent</param>
-        protected virtual void AddAuth(HttpRequestMessage message)
+        protected virtual void PreRequest(HttpRequestMessage message)
         { }
 
         /// <summary>
@@ -244,10 +244,7 @@ private protected async Task<string> GetJsonAsync(string url)
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 
             var message = new HttpRequestMessage(HttpMethod.Get, url);
-            if (Auth != null)
-            {
-                AddAuth(message);
-            }
+            PreRequest(message);
             var msg = await HttpClient.SendAsync(message);
 
             if (msg.StatusCode == HttpStatusCode.Forbidden)

diff --git a/BooruSharp/Booru/Derpibooru.cs b/BooruSharp/Booru/Derpibooru.cs
@@ -16,5 +16,8 @@ public Derpibooru() : base("derpibooru.org")
 
         /// <inheritdoc/>
         public override bool IsSafe => false;
+
+        /// <inheritdoc/>
+        protected override int FilterID => 56027;
     }
 }
diff --git a/BooruSharp/Booru/Ponybooru.cs b/BooruSharp/Booru/Ponybooru.cs
@@ -16,5 +16,8 @@ public Ponybooru() : base("ponybooru.org")
 
         /// <inheritdoc/>
         public override bool IsSafe => false;
+
+        /// <inheritdoc/>
+        protected override int FilterID => 2;
     }
 }
diff --git a/BooruSharp/Booru/Template/BooruOnRails.cs b/BooruSharp/Booru/Template/BooruOnRails.cs
@@ -29,12 +29,21 @@ protected BooruOnRails(string domain, BooruOptions options = BooruOptions.None)
                   | BooruOptions.NoLastComments | BooruOptions.NoWiki | BooruOptions.NoRelated)
         { }
 
+        /// <summary>
+        /// ID used to set filter and have access to as many posts as possible
+        /// </summary>
+        protected abstract int FilterID { get; }
+
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
             var uriBuilder = new UriBuilder(message.RequestUri.AbsoluteUri);
             var query = HttpUtility.ParseQueryString(uriBuilder.Query);
-            query["key"] = Auth.PasswordHash;
+            query["filter_id"] = $"{FilterID}";
+            if (Auth != null)
+            {
+                query["key"] = Auth.PasswordHash;
+            }
             uriBuilder.Query = query.ToString();
             message.RequestUri = new Uri(uriBuilder.ToString());
         }

diff --git a/BooruSharp/Booru/Template/Danbooru.cs b/BooruSharp/Booru/Template/Danbooru.cs
@@ -27,9 +27,12 @@ protected Danbooru(string domain, BooruOptions options = BooruOptions.None)
         { }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
-            message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            if (Auth != null)
+            {
+                message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            }
         }
 
         private protected override JToken ParseFirstPostSearchResult(object json)

diff --git a/BooruSharp/Booru/Template/E621.cs b/BooruSharp/Booru/Template/E621.cs
@@ -28,10 +28,13 @@ protected E621(string domain, BooruOptions options = BooruOptions.None)
         { }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
-            string encoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(Auth.UserId + ":" + Auth.PasswordHash));
-            message.Headers.Add("Authorization", $"Basic {encoded}");
+            if (Auth != null)
+            {
+                string encoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(Auth.UserId + ":" + Auth.PasswordHash));
+                message.Headers.Add("Authorization", $"Basic {encoded}");
+            }
         }
 
         private protected override JToken ParseFirstPostSearchResult(object json)

diff --git a/BooruSharp/Booru/Template/Gelbooru.cs b/BooruSharp/Booru/Template/Gelbooru.cs
@@ -34,9 +34,12 @@ protected Gelbooru(string domain, BooruOptions options = BooruOptions.None)
         { }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
-            message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            if (Auth != null)
+            {
+                message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            }
         }
 
         /// <inheritdoc/>

diff --git a/BooruSharp/Booru/Template/Gelbooru02.cs b/BooruSharp/Booru/Template/Gelbooru02.cs
@@ -30,9 +30,12 @@ protected Gelbooru02(string domain, BooruOptions options = BooruOptions.None)
         }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
-            message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            if (Auth != null)
+            {
+                message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            }
         }
 
         private protected override JToken ParseFirstPostSearchResult(object json)

diff --git a/BooruSharp/Booru/Template/Moebooru.cs b/BooruSharp/Booru/Template/Moebooru.cs
@@ -26,9 +26,12 @@ protected Moebooru(string domain, BooruOptions options = BooruOptions.None)
         { }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
-            message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            if (Auth != null)
+            {
+                message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            }
         }
 
         private protected override JToken ParseFirstPostSearchResult(object json)

diff --git a/BooruSharp/Booru/Template/Philomena.cs b/BooruSharp/Booru/Template/Philomena.cs
@@ -29,12 +29,21 @@ protected Philomena(string domain, BooruOptions options = BooruOptions.None)
                   | BooruOptions.NoLastComments | BooruOptions.NoWiki | BooruOptions.NoRelated)
         { }
 
+        /// <summary>
+        /// ID used to set filter and have access to as many posts as possible
+        /// </summary>
+        protected abstract int FilterID { get; }
+
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message)
+        protected override void PreRequest(HttpRequestMessage message)
         {
             var uriBuilder = new UriBuilder(message.RequestUri.AbsoluteUri);
             var query = HttpUtility.ParseQueryString(uriBuilder.Query);
-            query["key"] = Auth.PasswordHash;
+            query["filter_id"] = $"{FilterID}";
+            if (Auth != null)
+            {
+                query["key"] = Auth.PasswordHash;
+            }
             uriBuilder.Query = query.ToString();
             message.RequestUri = new Uri(uriBuilder.ToString());
         }

diff --git a/BooruSharp/Booru/Template/Sankaku.cs b/BooruSharp/Booru/Template/Sankaku.cs
@@ -27,9 +27,12 @@ protected Sankaku(string domain, BooruOptions options = BooruOptions.None)
         { }
 
         /// <inheritdoc/>
-        protected override void AddAuth(HttpRequestMessage message) // TODO: Doesn't work rn
+        protected override void PreRequest(HttpRequestMessage message) // TODO: Doesn't work rn
         {
-            message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            if (Auth != null)
+            {
+                message.Headers.Add("Cookie", "user_id=" + Auth.UserId + ";pass_hash=" + Auth.PasswordHash);
+            }
         }
 
         private protected override JToken ParseFirstPostSearchResult(object json)

diff --git a/BooruSharp/Booru/Twibooru.cs b/BooruSharp/Booru/Twibooru.cs
@@ -16,5 +16,8 @@ public Twibooru() : base("twibooru.org")
 
         /// <inheritdoc/>
         public override bool IsSafe => false;
+
+        /// <inheritdoc/>
+        protected override int FilterID => 2;
     }
 }