X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.kt;h=554c19b99eab59afbf75bbda53dbced029b77c06;hp=0063148732a1b09b5c858df59dde1131361179f5;hb=a73938206e78e061bc63db07391623ee6a218845;hpb=c84755453de2f6a59fc20114aff832b94c8ecd83

diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
index 0063148..554c19b 100644
--- a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
@@ -1,22 +1,14 @@
 package net.pterodactylus.sone.text
 
-import freenet.keys.FreenetURI
-import freenet.support.Base64
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.data.impl.IdOnlySone
-import net.pterodactylus.sone.database.PostProvider
-import net.pterodactylus.sone.database.SoneProvider
-import net.pterodactylus.sone.text.LinkType.CHK
-import net.pterodactylus.sone.text.LinkType.FREEMAIL
-import net.pterodactylus.sone.text.LinkType.HTTP
-import net.pterodactylus.sone.text.LinkType.HTTPS
-import net.pterodactylus.sone.text.LinkType.KSK
-import net.pterodactylus.sone.text.LinkType.POST
-import net.pterodactylus.sone.text.LinkType.SONE
-import net.pterodactylus.sone.text.LinkType.SSK
+import freenet.keys.*
+import freenet.support.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.impl.*
+import net.pterodactylus.sone.database.*
+import net.pterodactylus.sone.text.LinkType.*
 import net.pterodactylus.sone.text.LinkType.USK
-import org.bitpedia.util.Base32
-import java.net.MalformedURLException
+import org.bitpedia.util.*
+import java.net.*
 import javax.inject.*
 
 /**
@@ -50,29 +42,39 @@ class SoneTextParser @Inject constructor(private val soneProvider: SoneProvider?
 							}
 			}.map { it.first }.toList()
 
+	private val NextLink.linkWithoutBacklink: String
+		get() {
+			val backlink = link.indexOf("/../")
+			val query = link.indexOf("?")
+			return if ((backlink > -1) && ((query == -1) || (query > -1) && (backlink < query)))
+				link.substring(0, backlink)
+			else
+				link
+		}
+
 	private fun NextLink.toPart(context: SoneTextParserContext?) = when (linkType) {
 		KSK, CHK -> try {
-			FreenetURI(link).let { freenetUri ->
+			FreenetURI(linkWithoutBacklink).let { freenetUri ->
 				FreenetLinkPart(
-						link,
-						if (freenetUri.isKSK) {
-							freenetUri.guessableKey
-						} else {
-							freenetUri.metaString ?: freenetUri.docName ?: link.substring(0, 9)
-						},
-						link.split('?').first()
+						linkWithoutBacklink,
+						freenetUri.allMetaStrings?.lastOrNull { it != "" } ?: freenetUri.docName ?: linkWithoutBacklink.substring(0, 9),
+						linkWithoutBacklink.split('?').first()
 				)
 			}
 		} catch (e: MalformedURLException) {
-			PlainTextPart(link)
+			PlainTextPart(linkWithoutBacklink)
 		}
 		SSK, USK ->
 			try {
-				FreenetURI(link).let { uri ->
-					uri.allMetaStrings?.lastOrNull() ?: uri.docName ?: "${uri.keyType}@${uri.routingKey.freenetBase64}"
-				}.let { FreenetLinkPart(link, it, trusted = context?.routingKey?.contentEquals(FreenetURI(link).routingKey) == true) }
+				FreenetURI(linkWithoutBacklink).let { uri ->
+					uri.allMetaStrings
+							?.takeIf { (it.size > 1) || ((it.size == 1) && (it.single() != "")) }
+							?.lastOrNull()
+							?: uri.docName
+							?: "${uri.keyType}@${uri.routingKey.freenetBase64}"
+				}.let { FreenetLinkPart(linkWithoutBacklink.removeSuffix("/"), it, trusted = context?.routingKey?.contentEquals(FreenetURI(linkWithoutBacklink).routingKey) == true) }
 			} catch (e: MalformedURLException) {
-				PlainTextPart(link)
+				PlainTextPart(linkWithoutBacklink)
 			}
 		SONE -> link.substring(7).let { SonePart(soneProvider?.getSone(it) ?: IdOnlySone(it)) }
 		POST -> postProvider?.getPost(link.substring(7))?.let { PostPart(it) } ?: PlainTextPart(link)