fix: treat path as encoded (#250)

GeopJr · May 15, 2023 · 7d90f1a · 7d90f1a
1 parent 028b743
commit 7d90f1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/API/Tag.vala b/src/API/Tag.vala
@@ -51,6 +51,6 @@ public class Tuba.API.Tag : Entity, Widgetizable {
 	}
 
 	protected void on_activated () {
-		app.main_window.open_view (new Views.Hashtag (name, following));
+		app.main_window.open_view (new Views.Hashtag (name, following, Path.get_basename (url)));
 	}
 }
diff --git a/src/Services/Network/Request.vala b/src/Services/Network/Request.vala
@@ -157,7 +157,7 @@ public class Tuba.Request : GLib.Object {
 		} else {
 			Uri t_uri;
 			try {
-				t_uri = Uri.parse (url + parameters, UriFlags.ENCODED_QUERY);
+				t_uri = Uri.parse (url + parameters, UriFlags.ENCODED_PATH | UriFlags.ENCODED_QUERY);
 			} catch (GLib.UriError e) {
 				warning (e.message);
 				return this;

diff --git a/src/Views/Hashtag.vala b/src/Views/Hashtag.vala
@@ -2,9 +2,9 @@ public class Tuba.Views.Hashtag : Views.Timeline {
 
     bool t_following = false;
     string t_tag = "";
-    public Hashtag (string tag, bool? following = null) {
+    public Hashtag (string tag, bool? following = null, string? url_basename = null) {
         Object (
-            url: @"/api/v1/timelines/tag/$tag",
+            url: @"/api/v1/timelines/tag/$(url_basename ?? tag)",
             label: "#"+tag
         );
 

diff --git a/src/Widgets/RichLabel.vala b/src/Widgets/RichLabel.vala
@@ -101,9 +101,9 @@ public class Tuba.Widgets.RichLabel : Adw.Bin {
 		}
 
 		if ("/tags/" in url) {
-			var encoded = url.split ("/tags/")[1];
-			var tag = Uri.unescape_string (encoded);
-			app.main_window.open_view (new Views.Hashtag (tag ?? encoded, null));
+			var from_url = url.split ("/tags/")[1];
+			var decoded = Uri.unescape_string (from_url) ?? from_url;
+			app.main_window.open_view (new Views.Hashtag (decoded, null));
 			return true;
 		}