X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=1e04105a6db0d3fd788308ede8f7e2f08242deeb;hb=29daf9b1a853061c245c6225e5e5ea8f553c87a7;hp=75caba2bfc2d6672636ead4e2af8368491d75522;hpb=89f4300557674bdc63bd83f77fc7cdb6171b83f5;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 75caba2..1e04105 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -58,6 +59,9 @@ import net.pterodactylus.sone.template.SoneAccessor;
 import net.pterodactylus.sone.template.SubstringFilter;
 import net.pterodactylus.sone.template.TrustAccessor;
 import net.pterodactylus.sone.template.UnknownDateFilter;
+import net.pterodactylus.sone.text.Part;
+import net.pterodactylus.sone.text.SonePart;
+import net.pterodactylus.sone.text.SoneTextParser;
 import net.pterodactylus.sone.web.ajax.BookmarkAjaxPage;
 import net.pterodactylus.sone.web.ajax.CreatePostAjaxPage;
 import net.pterodactylus.sone.web.ajax.CreateReplyAjaxPage;
@@ -96,6 +100,7 @@ import net.pterodactylus.util.cache.CacheItem;
 import net.pterodactylus.util.cache.DefaultCacheItem;
 import net.pterodactylus.util.cache.MemoryCache;
 import net.pterodactylus.util.cache.ValueRetriever;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
@@ -151,6 +156,9 @@ public class WebInterface implements CoreListener {
 	/** The template context factory. */
 	private final TemplateContextFactory templateContextFactory;
 
+	/** The Sone text parser. */
+	private final SoneTextParser soneTextParser;
+
 	/** The “new Sone” notification. */
 	private final ListNotification<Sone> newSoneNotification;
 
@@ -160,6 +168,9 @@ public class WebInterface implements CoreListener {
 	/** The “new reply” notification. */
 	private final ListNotification<Reply> newReplyNotification;
 
+	/** The “you have been mentioned” notification. */
+	private final ListNotification<Post> mentionNotification;
+
 	/** The “rescuing Sone” notification. */
 	private final ListNotification<Sone> rescuingSonesNotification;
 
@@ -185,6 +196,7 @@ public class WebInterface implements CoreListener {
 	public WebInterface(SonePlugin sonePlugin) {
 		this.sonePlugin = sonePlugin;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
+		soneTextParser = new SoneTextParser(getCore());
 
 		templateContextFactory = new TemplateContextFactory();
 		templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
@@ -206,7 +218,7 @@ public class WebInterface implements CoreListener {
 		templateContextFactory.addFilter("match", new MatchFilter());
 		templateContextFactory.addFilter("css", new CssClassNameFilter());
 		templateContextFactory.addFilter("js", new JavascriptFilter());
-		templateContextFactory.addFilter("parse", new ParserFilter(getCore(), templateContextFactory));
+		templateContextFactory.addFilter("parse", new ParserFilter(getCore(), templateContextFactory, soneTextParser));
 		templateContextFactory.addFilter("unknown", new UnknownDateFilter(getL10n(), "View.Sone.Text.UnknownDate"));
 		templateContextFactory.addFilter("format", new FormatFilter());
 		templateContextFactory.addFilter("sort", new CollectionSortFilter());
@@ -214,6 +226,7 @@ public class WebInterface implements CoreListener {
 		templateContextFactory.addFilter("in", new ContainsFilter());
 		templateContextFactory.addProvider(Provider.TEMPLATE_CONTEXT_PROVIDER);
 		templateContextFactory.addProvider(new ClassPathTemplateProvider());
+		templateContextFactory.addTemplateObject("webInterface", this);
 		templateContextFactory.addTemplateObject("formPassword", formPassword);
 
 		/* create notifications. */
@@ -224,7 +237,10 @@ public class WebInterface implements CoreListener {
 		newPostNotification = new ListNotification<Post>("new-post-notification", "posts", newPostNotificationTemplate, false);
 
 		Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
-		newReplyNotification = new ListNotification<Reply>("new-replies-notification", "replies", newReplyNotificationTemplate, false);
+		newReplyNotification = new ListNotification<Reply>("new-reply-notification", "replies", newReplyNotificationTemplate, false);
+
+		Template mentionNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/mentionNotification.html"));
+		mentionNotification = new ListNotification<Post>("mention-notification", "posts", mentionNotificationTemplate, false);
 
 		Template rescuingSonesTemplate = TemplateParser.parse(createReader("/templates/notify/rescuingSonesNotification.html"));
 		rescuingSonesNotification = new ListNotification<Sone>("sones-being-rescued-notification", "sones", rescuingSonesTemplate);
@@ -648,11 +664,25 @@ public class WebInterface implements CoreListener {
 		try {
 			return new InputStreamReader(getClass().getResourceAsStream(resourceName), "UTF-8");
 		} catch (UnsupportedEncodingException uee1) {
-			System.out.println("  fail.");
 			return null;
 		}
 	}
 
+	private Set<Sone> getMentionedSones(String text) {
+		/* we need no context to find mentioned Sones. */
+		Set<Sone> mentionedSones = new HashSet<Sone>();
+		try {
+			for (Part part : soneTextParser.parse(null, new StringReader(text))) {
+				if (part instanceof SonePart) {
+					mentionedSones.add(((SonePart) part).getSone());
+				}
+			}
+		} catch (IOException ioe1) {
+			logger.log(Level.WARNING, "Could not parse post text: " + text, ioe1);
+		}
+		return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER);
+	}
+
 	//
 	// CORELISTENER METHODS
 	//
@@ -695,6 +725,9 @@ public class WebInterface implements CoreListener {
 		newPostNotification.add(post);
 		if (!hasFirstStartNotification()) {
 			notificationManager.addNotification(newPostNotification);
+			if (!getMentionedSones(post.getText()).isEmpty()) {
+				mentionNotification.add(post);
+			}
 		} else {
 			getCore().markPostKnown(post);
 		}
@@ -711,6 +744,9 @@ public class WebInterface implements CoreListener {
 		newReplyNotification.add(reply);
 		if (!hasFirstStartNotification()) {
 			notificationManager.addNotification(newReplyNotification);
+			if (!getMentionedSones(reply.getText()).isEmpty()) {
+				mentionNotification.add(reply.getPost());
+			}
 		} else {
 			getCore().markReplyKnown(reply);
 		}
@@ -730,6 +766,7 @@ public class WebInterface implements CoreListener {
 	@Override
 	public void markPostKnown(Post post) {
 		newPostNotification.remove(post);
+		mentionNotification.remove(post);
 	}
 
 	/**
@@ -738,6 +775,15 @@ public class WebInterface implements CoreListener {
 	@Override
 	public void markReplyKnown(Reply reply) {
 		newReplyNotification.remove(reply);
+		mentionNotification.remove(reply.getPost());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void soneRemoved(Sone sone) {
+		newSoneNotification.remove(sone);
 	}
 
 	/**