X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=b5f6dfbb46ab459a3c99d50022ff590e9c24eca7;hb=927de326e0af0f11a27b3444f4e25b0796c877db;hp=c2bb1c8ebe93f2c015a9596787ba798d701479af;hpb=bdbd75eb4ef763f7d821e4e5c49b48eac0564cc4;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 c2bb1c8..b5f6dfb 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -380,7 +380,7 @@ public class WebInterface implements CoreListener {
 	 *         currently logged in
 	 */
 	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
-		Set<Sone> localSones = getCore().getLocalSones();
+		Collection<Sone> localSones = getCore().getLocalSones();
 		if (localSones.size() == 1) {
 			return localSones.iterator().next();
 		}
@@ -733,8 +733,8 @@ public class WebInterface implements CoreListener {
 	}
 
 	/**
-	 * Returns all {@link Core#isLocalSone(Sone) local Sone}s that are
-	 * referenced by {@link SonePart}s in the given text (after parsing it using
+	 * Returns all {@link Core#getLocalSones() local Sone}s that are referenced
+	 * by {@link SonePart}s in the given text (after parsing it using
 	 * {@link SoneTextParser}).
 	 *
 	 * @param text
@@ -797,15 +797,14 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newPostFound(Post post) {
-		boolean isLocal = getCore().isLocalSone(post.getSone());
-		if (isLocal) {
+		if (post.getSone().isLocal()) {
 			localPostNotification.add(post);
 		} else {
 			newPostNotification.add(post);
 		}
 		if (!hasFirstStartNotification()) {
-			notificationManager.addNotification(isLocal ? localPostNotification : newPostNotification);
-			if (!getMentionedSones(post.getText()).isEmpty() && !isLocal) {
+			notificationManager.addNotification(post.getSone().isLocal() ? localPostNotification : newPostNotification);
+			if (!getMentionedSones(post.getText()).isEmpty() && !post.getSone().isLocal()) {
 				mentionNotification.add(post);
 				notificationManager.addNotification(mentionNotification);
 			}
@@ -819,15 +818,14 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void newReplyFound(PostReply reply) {
-		boolean isLocal = getCore().isLocalSone(reply.getSone());
-		if (isLocal) {
+		if (reply.getSone().isLocal()) {
 			localReplyNotification.add(reply);
 		} else {
 			newReplyNotification.add(reply);
 		}
 		if (!hasFirstStartNotification()) {
-			notificationManager.addNotification(isLocal ? localReplyNotification : newReplyNotification);
-			if (!getMentionedSones(reply.getText()).isEmpty() && !isLocal && (reply.getPost().getSone() != null) && (reply.getTime() <= System.currentTimeMillis())) {
+			notificationManager.addNotification(reply.getSone().isLocal() ? localReplyNotification : newReplyNotification);
+			if (!getMentionedSones(reply.getText()).isEmpty() && !reply.getSone().isLocal() && (reply.getPost().getSone() != null) && (reply.getTime() <= System.currentTimeMillis())) {
 				mentionNotification.add(reply.getPost());
 				notificationManager.addNotification(mentionNotification);
 			}