From a034e3245eda6e1449cf1c033612a7085944c49e Mon Sep 17 00:00:00 2001 From: vlofgren Date: Thu, 18 Aug 2022 16:43:34 +0200 Subject: [PATCH 1/3] Fix fragment bug. --- .../src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java index 579b6cf4..2e451ba1 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java @@ -34,7 +34,7 @@ public class EdgeUrl implements WideHashable { public static String urlencodeFixer(String url) throws URISyntaxException { var s = new StringBuilder(); - String goodChars = "&.?:/-;+$"; + String goodChars = "&.?:/-;+$#"; String hexChars = "0123456789abcdefABCDEF"; int pathIdx = findPathIdx(url); From 2bc81e8e9a32b0d52e0921072a336d719d21b50c Mon Sep 17 00:00:00 2001 From: vlofgren Date: Thu, 18 Aug 2022 16:45:51 +0200 Subject: [PATCH 2/3] Fix fragment bug. --- .../java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java b/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java index 953fd473..dd5a797b 100644 --- a/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java +++ b/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java @@ -10,6 +10,12 @@ class EdgeUrlTest { public void testHashCode() throws URISyntaxException { System.out.println(new EdgeUrl("https://memex.marginalia.nu").hashCode()); } + + @Test + public void testFragment() throws URISyntaxException { + var url = new EdgeUrl("https://memex.marginalia.nu/#here"); + System.out.println(url.path); + } @Test public void testParam() throws URISyntaxException { System.out.println(new EdgeUrl("https://memex.marginalia.nu/index.php?id=1").toString()); From 5cd552458a944a4281b46972f3fb50f92ea635db Mon Sep 17 00:00:00 2001 From: vlofgren Date: Thu, 18 Aug 2022 16:47:59 +0200 Subject: [PATCH 3/3] Fix fragment bug. --- .../java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java b/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java index dd5a797b..09498160 100644 --- a/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java +++ b/marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test; import java.net.URISyntaxException; +import static org.junit.jupiter.api.Assertions.assertEquals; + class EdgeUrlTest { @Test @@ -13,8 +15,10 @@ class EdgeUrlTest { @Test public void testFragment() throws URISyntaxException { - var url = new EdgeUrl("https://memex.marginalia.nu/#here"); - System.out.println(url.path); + assertEquals( + new EdgeUrl("https://memex.marginalia.nu/"), + new EdgeUrl("https://memex.marginalia.nu/#here") + ); } @Test public void testParam() throws URISyntaxException {