From 4d6fd5e301bd696daeac86b6e4e992b691ff1907 Mon Sep 17 00:00:00 2001
From: 0x1f595 <0x1f595@users.noreply.github.com>
Date: Fri, 24 Apr 2020 18:28:57 -0600
Subject: [PATCH 1/2] Mangadex - Allow www prefix and page suffix

---
 .../com/rarchives/ripme/ripper/rippers/MangadexRipper.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java
index 6697a45b7..97aa26b02 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java
@@ -2,11 +2,8 @@
 
 import com.rarchives.ripme.ripper.AbstractJSONRipper;
 import com.rarchives.ripme.utils.Http;
-import com.rarchives.ripme.utils.Utils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.jsoup.Connection;
-import org.jsoup.nodes.Document;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -51,10 +48,10 @@ public String getGID(URL url) throws MalformedURLException {
     }
 
     private String getChapterID(String url) {
-        Pattern p = Pattern.compile("https://mangadex.org/chapter/([\\d]+)/?");
+        Pattern p = Pattern.compile("https://(www\\.)?mangadex\\.org/chapter/([\\d]+)/?[\\d]*");
         Matcher m = p.matcher(url);
         if (m.matches()) {
-            return m.group(1);
+            return m.group(2);
         }
         return null;
     }

From d83a9e0612605921624d1c19474fc0b29b4cfae4 Mon Sep 17 00:00:00 2001
From: 0x1f595 <0x1f595@users.noreply.github.com>
Date: Fri, 24 Apr 2020 18:35:06 -0600
Subject: [PATCH 2/2] Adding test case for new Mangadex URL form

---
 .../ripme/tst/ripper/rippers/MangadexRipperTest.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MangadexRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MangadexRipperTest.java
index 70aa5aafe..56b00365c 100644
--- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MangadexRipperTest.java
+++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/MangadexRipperTest.java
@@ -1,15 +1,22 @@
 package com.rarchives.ripme.tst.ripper.rippers;
 
-
 import com.rarchives.ripme.ripper.rippers.MangadexRipper;
 
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.net.URL;
 
 public class MangadexRipperTest extends RippersTest{
+    @Test
     public void testRip() throws IOException {
         MangadexRipper ripper = new MangadexRipper(new URL("https://mangadex.org/chapter/467904/"));
         testRipper(ripper);
     }
 
+    @Test
+    public void testAltUrlRip() throws IOException {
+        MangadexRipper ripper = new MangadexRipper(new URL("https://www.mangadex.org/chapter/804465/1"));
+        testRipper(ripper);
+    }
 }