fix tags encoding on search

Rule-34 · Jul 3, 2023 · 27bdbba · 27bdbba
1 parent be5ddb4
commit 27bdbba
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 42 deletions.
diff --git a/lib/src/boorus/booru_on_rails_handler.dart b/lib/src/boorus/booru_on_rails_handler.dart
@@ -21,7 +21,7 @@ class BooruOnRailsHandler extends BooruHandler {
     if (tags == "" || tags == " "){
       return "*";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/danbooru_handler.dart b/lib/src/boorus/danbooru_handler.dart
@@ -35,7 +35,7 @@ class DanbooruHandler extends BooruHandler {
         booru.baseURL!.contains('danbooru.donmai.us')) {
       tags = tags.toLowerCase().replaceAll('rating:safe', 'rating:general');
     }
-    return tags;
+    return super.validateTags(tags);
   }
 
   @override

diff --git a/lib/src/boorus/furaffinity_handler.dart b/lib/src/boorus/furaffinity_handler.dart
@@ -14,11 +14,6 @@ class FurAffinityHandler extends BooruHandler {
 
   FurAffinityHandler(Booru booru, int limit) : super(booru, limit);
 
-  @override
-  String validateTags(tags) {
-    return tags;
-  }
-
   @override
   List parseListFromResponse(response) {
     final document = parse(response.data);

diff --git a/lib/src/boorus/gelbooru_alikes_handler.dart b/lib/src/boorus/gelbooru_alikes_handler.dart
@@ -183,7 +183,7 @@ class GelbooruAlikesHandler extends BooruHandler {
   Future<void> searchCount(String input) async {
     int result = 0;
     // gelbooru json has count in @attributes, but there is no count data on r34xxx json, so we switch back to xml
-    String url = makeURL(input);
+    String url = makeURL(validateTags(input));
 
     final String cookies = await getCookies() ?? "";
     final Map<String, String> headers = {

diff --git a/lib/src/boorus/gelbooru_handler.dart b/lib/src/boorus/gelbooru_handler.dart
@@ -42,7 +42,7 @@ class GelbooruHandler extends BooruHandler {
     if (tags.toLowerCase().contains('rating:safe')) {
       tags = tags.toLowerCase().replaceAll('rating:safe', 'rating:general');
     }
-    return tags;
+    return super.validateTags(tags);
   }
 
   @override

diff --git a/lib/src/boorus/gelbooruv1_handler.dart b/lib/src/boorus/gelbooruv1_handler.dart
@@ -12,7 +12,7 @@ class GelbooruV1Handler extends BooruHandler {
     if (tags == " " || tags == "") {
       return "all";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/philomena_handler.dart b/lib/src/boorus/philomena_handler.dart
@@ -10,7 +10,7 @@ class PhilomenaHandler extends BooruHandler {
     if (tags == "" || tags == " ") {
       return "*";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/r34hentai_handler.dart b/lib/src/boorus/r34hentai_handler.dart
@@ -20,15 +20,6 @@ class R34HentaiHandler extends ShimmieHandler {
     return headers;
   }
 
-  @override
-  String validateTags(tags) {
-    if (tags == " " || tags == "") {
-      return "";
-    } else {
-      return tags;
-    }
-  }
-
   @override
   List parseListFromResponse(response) {
     var document = parse(response.data);

diff --git a/lib/src/boorus/r34us_handler.dart b/lib/src/boorus/r34us_handler.dart
@@ -17,7 +17,7 @@ class R34USHandler extends BooruHandler {
     if (tags == " " || tags == "") {
       return "all";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/rainbooru_handler.dart b/lib/src/boorus/rainbooru_handler.dart
@@ -16,7 +16,7 @@ class RainbooruHandler extends BooruHandler {
     if (tags == "" || tags == " ") {
       return "*";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/shimmie_handler.dart b/lib/src/boorus/shimmie_handler.dart
@@ -18,7 +18,7 @@ class ShimmieHandler extends BooruHandler {
     if (tags == " " || tags == "") {
       return "*";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/szurubooru_handler.dart b/lib/src/boorus/szurubooru_handler.dart
@@ -13,7 +13,7 @@ class SzurubooruHandler extends BooruHandler {
     if (tags == "" || tags == " ") {
       return "*";
     } else {
-      return tags;
+      return super.validateTags(tags);
     }
   }
 

diff --git a/lib/src/boorus/wildcritters_handler.dart b/lib/src/boorus/wildcritters_handler.dart
@@ -8,11 +8,6 @@ import 'package:lolisnatcher/src/utils/dio_network.dart';
 class WildCrittersHandler extends BooruHandler {
   WildCrittersHandler(Booru booru, int limit) : super(booru, limit);
 
-  @override
-  String validateTags(tags) {
-    return tags;
-  }
-
   @override
   List parseListFromResponse(response) {
     final document = parse(response.data);

diff --git a/lib/src/boorus/worldxyz_handler.dart b/lib/src/boorus/worldxyz_handler.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:get/get.dart';
 
 import 'package:lolisnatcher/src/data/booru.dart';
@@ -10,15 +8,6 @@ import 'package:lolisnatcher/src/utils/dio_network.dart';
 class WorldXyzHandler extends BooruHandler {
   WorldXyzHandler(Booru booru, int limit) : super(booru, limit);
 
-  @override
-  String validateTags(tags) {
-    if (tags == " " || tags == "") {
-      return "";
-    } else {
-      return tags;
-    }
-  }
-
   @override
   List parseListFromResponse(response) {
     Map<String, dynamic> parsedResponse = response.data;

diff --git a/lib/src/handlers/booru_handler.dart b/lib/src/handlers/booru_handler.dart
@@ -83,7 +83,7 @@ abstract class BooruHandler {
     }
 
     // validate tags (usually just convert empty string to current booru "search all" query)
-    tags = validateTags(tags);
+    tags = validateTags(tags.trim());
 
     // if tags are different than previous tags, reset fetched
     if (prevTags != tags) {
@@ -215,7 +215,8 @@ abstract class BooruHandler {
   }
 
   String validateTags(String tags) {
-    return tags;
+    // remember to return super.validateTags(tags) if you override this function
+    return Uri.encodeComponent(tags);
   }
 
   /// [SHOULD BE OVERRIDDEN]