161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix bug where url fragments were considered path elements' (#89) from master into release

Browse Source 
Reviewed-on: https://git.marginalia.nu/marginalia/marginalia.nu/pulls/89
This commit is contained in:
Viktor Lofgren 2022-08-18 16:48:48 +02:00
commit 4435334ebe
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/model/EdgeUrl.java
View File

@ -34,7 +34,7 @@ public class EdgeUrl implements WideHashable {
public static String urlencodeFixer(String url) throws URISyntaxException { public static String urlencodeFixer(String url) throws URISyntaxException {
var s = new StringBuilder(); var s = new StringBuilder();
String goodChars = "&.?:/-;+$"; String goodChars = "&.?:/-;+$#";
String hexChars = "0123456789abcdefABCDEF"; String hexChars = "0123456789abcdefABCDEF";
int pathIdx = findPathIdx(url); int pathIdx = findPathIdx(url);

10
marginalia_nu/src/test/java/nu/marginalia/wmsa/edge/model/EdgeUrlTest.java
View File

@ -4,12 +4,22 @@ import org.junit.jupiter.api.Test;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import static org.junit.jupiter.api.Assertions.assertEquals;
class EdgeUrlTest { class EdgeUrlTest {
@Test @Test
public void testHashCode() throws URISyntaxException { public void testHashCode() throws URISyntaxException {
System.out.println(new EdgeUrl("https://memex.marginalia.nu").hashCode()); System.out.println(new EdgeUrl("https://memex.marginalia.nu").hashCode());
} }
@Test
public void testFragment() throws URISyntaxException {
assertEquals(
new EdgeUrl("https://memex.marginalia.nu/"),
new EdgeUrl("https://memex.marginalia.nu/#here")
);
}
@Test @Test
public void testParam() throws URISyntaxException { public void testParam() throws URISyntaxException {
System.out.println(new EdgeUrl("https://memex.marginalia.nu/index.php?id=1").toString()); System.out.println(new EdgeUrl("https://memex.marginalia.nu/index.php?id=1").toString());