X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=d271203fc0b3f0ab755782b3f9260cba696a788b;hb=79f1429cf43a59b6e539934555844b3d3ae6bee7;hp=2787d527db1567dffc9903e60002abf2c13d4e52;hpb=ff0704341bf464cf0d15125962b082e71a038ab7;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 2787d52..d271203 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -123,6 +123,11 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 				continue;
 			}
 			emptyLines = 0;
+			/*
+			 * lineComplete tracks whether the block you are parsing is the
+			 * first block of the line. this is important because sometimes you
+			 * have to add an additional line break.
+			 */
 			boolean lineComplete = true;
 			while (line.length() > 0) {
 				int nextKsk = line.indexOf("KSK@");
@@ -177,12 +182,16 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 				}
 				if (linkType == LinkType.SONE) {
 					if (next > 0) {
-						parts.add(new PlainTextPart(line.substring(0, next)));
+						if (lineComplete && !lastLineEmpty) {
+							parts.add(new PlainTextPart("\n" + line.substring(0, next)));
+						} else {
+							parts.add(new PlainTextPart(line.substring(0, next)));
+						}
 					}
 					if (line.length() >= (next + 7 + 43)) {
 						String soneId = line.substring(next + 7, next + 50);
 						Sone sone = soneProvider.getSone(soneId, false);
-						if (sone != null) {
+						if ((sone != null) && (sone.getName() != null)) {
 							parts.add(new SonePart(sone));
 						} else {
 							parts.add(new PlainTextPart(line.substring(next, next + 50)));
@@ -192,6 +201,7 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 						parts.add(new PlainTextPart(line.substring(next)));
 						line = "";
 					}
+					lineComplete = false;
 					continue;
 				}
 				if (linkType == LinkType.POST) {
@@ -202,8 +212,6 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 						String postId = line.substring(next + 7, next + 43);
 						Post post = postProvider.getPost(postId, false);
 						if ((post != null) && (post.getSone() != null)) {
-							String postText = post.getText();
-							postText = postText.substring(0, Math.min(postText.length(), 20)) + "…";
 							parts.add(new PostPart(post));
 						} else {
 							parts.add(new PlainTextPart(line.substring(next, next + 43)));
@@ -225,7 +233,9 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 					if (!lastLineEmpty && lineComplete) {
 						parts.add(new PlainTextPart("\n" + line.substring(0, next)));
 					} else {
-						parts.add(new PlainTextPart(line.substring(0, next)));
+						if (next > 0) {
+							parts.add(new PlainTextPart(line.substring(0, next)));
+						}
 					}
 					String link = line.substring(next, nextSpace);
 					String name = link;