X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FFreenetLinkParser.java;h=24eac3b3f18fe89c62acb178965d8dc3dd3688de;hb=70546a3f04e9019495f8d62691f760b0d58fb046;hp=85bda1a588fd9f28b37b576524e3e9e84babc0b6;hpb=f3beba50c66473b89594743c7e790e49fd4d9ad9;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java index 85bda1a..24eac3b 100644 --- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java +++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java @@ -26,6 +26,7 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import net.pterodactylus.sone.data.Sone; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.template.TemplateFactory; @@ -40,7 +41,7 @@ public class FreenetLinkParser implements Parser { private static final Logger logger = Logging.getLogger(FreenetLinkParser.class); /** Pattern to detect whitespace. */ - private static final Pattern whitespacePattern = Pattern.compile("[\\p{javaWhitespace}]"); + private static final Pattern whitespacePattern = Pattern.compile("[\\u000a\u0020\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u200c\u200d\u202f\u205f\u2060\u2800\u3000]"); /** * Enumeration for all recognized link types. @@ -59,13 +60,22 @@ public class FreenetLinkParser implements Parser { SSK, /** Link is a USK. */ - USK + USK, + + /** Link is HTTP. */ + HTTP, + + /** Link is HTTPS. */ + HTTPS; } /** The template factory. */ private final TemplateFactory templateFactory; + /** The Sone that posted the currently parsed text. */ + private Sone postingSone; + /** * Creates a new freenet link parser. * @@ -77,6 +87,22 @@ public class FreenetLinkParser implements Parser { } // + // ACCESSORS + // + + /** + * Sets the Sone that posted the text that will be parsed in the next call + * to {@link #parse(Reader)}. You need to synchronize calling this method + * and {@link #parse(Reader)}! + * + * @param sone + * The Sone that posted the text + */ + public void setPostingSone(Sone sone) { + postingSone = sone; + } + + // // PART METHODS // @@ -95,7 +121,9 @@ public class FreenetLinkParser implements Parser { int nextChk = line.indexOf("CHK@"); int nextSsk = line.indexOf("SSK@"); int nextUsk = line.indexOf("USK@"); - if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1)) { + int nextHttp = line.indexOf("http://"); + int nextHttps = line.indexOf("https://"); + if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1) && (nextHttp == -1) && (nextHttps == -1)) { parts.add(createPlainTextPart(line)); break; } @@ -117,6 +145,14 @@ public class FreenetLinkParser implements Parser { next = nextUsk; linkType = LinkType.USK; } + if ((nextHttp > -1) && (nextHttp < next)) { + next = nextHttp; + linkType = LinkType.HTTP; + } + if ((nextHttps > -1) && (nextHttps < next)) { + next = nextHttps; + linkType = LinkType.HTTPS; + } if ((next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) { next -= 8; line = line.substring(0, next) + line.substring(next + 8); @@ -127,12 +163,50 @@ public class FreenetLinkParser implements Parser { parts.add(createPlainTextPart(line.substring(0, next))); String link = line.substring(next, nextSpace); String name = link; - logger.log(Level.FINER, "Found link: " + link); + logger.log(Level.FINER, "Found link: %s", link); logger.log(Level.FINEST, "Next: %d, CHK: %d, SSK: %d, USK: %d", new Object[] { next, nextChk, nextSsk, nextUsk }); - if (((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (link.length() > 98) && (link.charAt(47) == ',') && (link.charAt(91) == ',') && (link.charAt(99) == '/')) { - name = link.substring(0, 47) + "…" + link.substring(99); + if (linkType == LinkType.KSK) { + name = link.substring(4); + } else if ((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) { + if (name.indexOf('/') > -1) { + if (!name.endsWith("/")) { + name = name.substring(name.lastIndexOf('/') + 1); + } else { + if (name.indexOf('/') != name.lastIndexOf('/')) { + name = name.substring(name.lastIndexOf('/', name.lastIndexOf('/') - 1)); + } else { + /* shorten to 5 chars. */ + name = name.substring(4, 9); + } + } + } + if (name.indexOf('?') > -1) { + name = name.substring(0, name.indexOf('?')); + } + boolean fromPostingSone = false; + if ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) { + fromPostingSone = link.substring(4, 47).equals(postingSone.getId()); + } + parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name)); + } else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) { + name = link.substring(linkType == LinkType.HTTP ? 7 : 8); + int firstSlash = name.indexOf('/'); + int lastSlash = name.lastIndexOf('/'); + if ((lastSlash - firstSlash) > 3) { + name = name.substring(0, firstSlash + 1) + "…" + name.substring(lastSlash); + } + if (name.endsWith("/")) { + name = name.substring(0, name.length() - 1); + } + if (((name.indexOf('/') > -1) && (name.indexOf('.') < name.lastIndexOf('.', name.indexOf('/'))) || ((name.indexOf('/') == -1) && (name.indexOf('.') < name.lastIndexOf('.')))) && name.startsWith("www.")) { + name = name.substring(4); + } + if (name.indexOf('?') > -1) { + name = name.substring(0, name.indexOf('?')); + } + link = "?_CHECKED_HTTP_=" + link; + parts.add(createInternetLinkPart(link, name)); } - parts.add(createLinkPart(link, name)); line = line.substring(nextSpace); } else { parts.add(createPlainTextPart(line.substring(0, next + 4))); @@ -159,7 +233,36 @@ public class FreenetLinkParser implements Parser { } /** - * Creates a new link part based on a template. + * Creates a new part based on a template that links to a site within the + * normal internet. + * + * @param link + * The target of the link + * @param name + * The name of the link + * @return The part that displays the link + */ + private Part createInternetLinkPart(String link, String name) { + return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + } + + /** + * Creates a new part based on a template that links to a site within + * freenet. + * + * @param link + * The target of the link + * @param name + * The name of the link + * @return The part that displays the link + */ + private Part createFreenetLinkPart(String link, String name) { + return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); + } + + /** + * Creates a new part based on a template that links to a page in the + * poster’s keyspace. * * @param link * The target of the link @@ -167,8 +270,8 @@ public class FreenetLinkParser implements Parser { * The name of the link * @return The part that displays the link */ - private Part createLinkPart(String link, String name) { - return new TemplatePart(templateFactory.createTemplate(new StringReader("\"><% name|html>"))).set("link", link).set("name", name); + private Part createTrustedFreenetLinkPart(String link, String name) { + return new TemplatePart(templateFactory.createTemplate(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name); } }