X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=7194b89214dcb89743c6cd615e6cba69bf26a6f9;hb=52c5e4136f8251b504941d662dba7b2ffc33863d;hp=62fc7dc860eab2d7e38bececf94c43651219c773;hpb=d2e57f58efbac24f437afd063a1f4a840d69e71b;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index 62fc7dc..7194b89 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -204,23 +204,17 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 						continue;
 					}
 					if (linkType == LinkType.POST) {
-						if (line.length() >= (7 + 36)) {
-							String postId = line.substring(7, 43);
-							Optional<Post> post = postProvider.getPost(postId);
-							if (post.isPresent()) {
-								parts.add(new PostPart(post.get()));
-							} else {
-								parts.add(new PlainTextPart(line.substring(0, 43)));
-							}
-							line = line.substring(43);
+						Optional<Post> post = postProvider.getPost(link.substring(7));
+						if (post.isPresent()) {
+							parts.add(new PostPart(post.get()));
 						} else {
-							parts.add(new PlainTextPart(line));
-							line = "";
+							parts.add(new PlainTextPart(link));
 						}
+						line = line.substring(link.length());
 						continue;
 					}
 
-					if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
+					if (linkType.isFreenetLink()) {
 						FreenetURI uri;
 						if (name.indexOf('?') > -1) {
 							name = name.substring(0, name.indexOf('?'));
@@ -278,7 +272,7 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 		}
 		for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) {
 			Part part = parts.getPart(partIndex);
-			if (!(part instanceof PlainTextPart) || !"\n".equals(((PlainTextPart) part).getText())) {
+			if (!(part instanceof PlainTextPart) || !"\n".equals(part.getText())) {
 				break;
 			}
 			parts.removePart(partIndex);