X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.kt;h=ad9bca4dece9ca858038a506dcd40b5a26a0fd15;hp=64125c1d50dee77d3863f3c250048633635f332a;hb=c28013c8a4bcb9776a1e2d82ffd6c4c8297ffb62;hpb=6f1f26e3998cfef155b0cf59152827accea70d30

diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
index 64125c1..ad9bca4 100644
--- a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
@@ -15,14 +15,14 @@ import net.pterodactylus.sone.text.LinkType.POST
 import net.pterodactylus.sone.text.LinkType.SONE
 import net.pterodactylus.sone.text.LinkType.SSK
 import net.pterodactylus.sone.text.LinkType.USK
-import net.pterodactylus.sone.utils.let
 import org.bitpedia.util.Base32
 import java.net.MalformedURLException
+import javax.inject.*
 
 /**
  * [Parser] implementation that can recognize Freenet URIs.
  */
-class SoneTextParser(private val soneProvider: SoneProvider?, private val postProvider: PostProvider?) {
+class SoneTextParser @Inject constructor(private val soneProvider: SoneProvider?, private val postProvider: PostProvider?) {
 
 	fun parse(source: String, context: SoneTextParserContext?) =
 			source.split("\n")
@@ -68,7 +68,13 @@ class SoneTextParser(private val soneProvider: SoneProvider?, private val postPr
 		}
 		SSK, USK ->
 			try {
-				 FreenetLinkPart(link, FreenetURI(link).docName, trusted = context?.routingKey?.contentEquals(FreenetURI(link).routingKey) == true)
+				FreenetURI(link).let { uri ->
+					uri.allMetaStrings
+							?.takeIf { (it.size > 1) || ((it.size == 1) && (it.single() != ""))}
+							?.lastOrNull()
+							?: uri.docName
+							?: "${uri.keyType}@${uri.routingKey.freenetBase64}"
+				}.let { FreenetLinkPart(link.removeSuffix("/"), it, trusted = context?.routingKey?.contentEquals(FreenetURI(link).routingKey) == true) }
 			} catch (e: MalformedURLException) {
 				PlainTextPart(link)
 			}
@@ -195,3 +201,5 @@ private fun isPunctuation(char: Char) = char in punctuationChars
 private val whitespace = Regex("[\\u000a\u0020\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u200c\u200d\u202f\u205f\u2060\u2800\u3000]")
 
 private data class NextLink(val position: Int, val linkType: LinkType, val link: String, val remainder: String)
+
+private val ByteArray.freenetBase64 get() = Base64.encode(this)!!