X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=cabc44e0f8702f39089a847b39ef8fa3f05fc0dd;hb=8ee3de9a7ed7c65b5f695dd60da6e55d94c1125e;hp=4e4f6fa999d6d34e8a6126097a212ef3fd88f74d;hpb=3da1daa6488c642430858a4baacc0aa986a6ebc1;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 4e4f6fa..cabc44e 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -21,7 +21,6 @@ import static com.google.common.collect.FluentIterable.from;
 import static java.util.logging.Logger.getLogger;
 import static net.pterodactylus.util.template.TemplateParser.parse;
 
-import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +35,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -75,7 +73,7 @@ import net.pterodactylus.sone.main.Loaders;
 import net.pterodactylus.sone.main.ReparseFilter;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.sone.notify.ListNotification;
-import net.pterodactylus.sone.notify.ListNotificationFilters;
+import net.pterodactylus.sone.notify.ListNotificationFilter;
 import net.pterodactylus.sone.notify.PostVisibilityFilter;
 import net.pterodactylus.sone.notify.ReplyVisibilityFilter;
 import net.pterodactylus.sone.template.AlbumAccessor;
@@ -201,7 +199,7 @@ public class WebInterface {
 	/** The parser filter. */
 	private final ParserFilter parserFilter;
 
-	private final ListNotificationFilters listNotificationFilters;
+	private final ListNotificationFilter listNotificationFilter;
 	private final PostVisibilityFilter postVisibilityFilter;
 	private final ReplyVisibilityFilter replyVisibilityFilter;
 
@@ -254,10 +252,10 @@ public class WebInterface {
 	 *            The Sone plugin
 	 */
 	@Inject
-	public WebInterface(SonePlugin sonePlugin, Loaders loaders, ListNotificationFilters listNotificationFilters, PostVisibilityFilter postVisibilityFilter, ReplyVisibilityFilter replyVisibilityFilter) {
+	public WebInterface(SonePlugin sonePlugin, Loaders loaders, ListNotificationFilter listNotificationFilter, PostVisibilityFilter postVisibilityFilter, ReplyVisibilityFilter replyVisibilityFilter) {
 		this.sonePlugin = sonePlugin;
 		this.loaders = loaders;
-		this.listNotificationFilters = listNotificationFilters;
+		this.listNotificationFilter = listNotificationFilter;
 		this.postVisibilityFilter = postVisibilityFilter;
 		this.replyVisibilityFilter = replyVisibilityFilter;
 		formPassword = sonePlugin.pluginRespirator().getToadletContainer().getFormPassword();
@@ -475,7 +473,7 @@ public class WebInterface {
 
 	@Nonnull
 	public Collection<Notification> getNotifications(@Nullable Sone currentSone) {
-		return listNotificationFilters.filterNotifications(notificationManager.getNotifications(), currentSone);
+		return listNotificationFilter.filterNotifications(notificationManager.getNotifications(), currentSone);
 	}
 
 	/**
@@ -795,14 +793,10 @@ public class WebInterface {
 	private Collection<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());
-				}
+		for (Part part : soneTextParser.parse(null, text)) {
+			if (part instanceof SonePart) {
+				mentionedSones.add(((SonePart) part).getSone());
 			}
-		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1);
 		}
 		return Collections2.filter(mentionedSones, Sone.LOCAL_SONE_FILTER);
 	}