From 9948521df6779543a26fd260994d5b9029d1eab5 Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Tue, 14 Aug 2018 16:08:48 +0200
Subject: [PATCH] e621: allows /post/search/

---
 src/be/nikiroo/fanfix/supported/E621.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index aa9c8af..36b9dad 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -377,19 +377,28 @@ class E621 extends BasicSupport_Deprecated {
 	protected URL getCanonicalUrl(URL source) {
 		if (isSearch(source)) {
 			// /post?tags=tag1+tag2 -> ../post/index/1/tag1%32tag2
-			String key = "post?tags=";
+			String key = "?tags=";
 			if (source.toString().contains(key)) {
 				int pos = source.toString().indexOf(key);
 				String tags = source.toString().substring(pos + key.length());
 				tags = tags.replace("+", "%20");
+
+				String base = source.toString().substring(0, pos);
+				if (!base.endsWith("/")) {
+					base += "/";
+				}
+				if (base.endsWith("/search/")) {
+					base = base.substring(0, base.indexOf("/search/") + 1);
+				}
+
 				try {
-					return new URL(source.toString().substring(0, pos)
-							+ "post/index/1/" + tags);
+					return new URL(base + "index/1/" + tags);
 				} catch (MalformedURLException e) {
 					Instance.getTraceHandler().error(e);
 				}
 			}
 		}
+
 		return super.getCanonicalUrl(source);
 	}
 
-- 
2.27.0