Update Japanese translation.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 10 Jun 2014 10:50:48 +0000 (12:50 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 10 Jun 2014 10:50:48 +0000 (12:50 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
src/main/java/net/pterodactylus/sone/web/WebInterface.java

index ecb5857..500995d 100644 (file)
@@ -994,10 +994,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
                                return;
                        }
                        /* find removed posts. */
+                       Collection<Post> removedPosts = new ArrayList<Post>();
+                       Collection<Post> newPosts = new ArrayList<Post>();
                        Collection<Post> existingPosts = database.getPosts(sone.getId());
                        for (Post oldPost : existingPosts) {
                                if (!sone.getPosts().contains(oldPost)) {
-                                       eventBus.post(new PostRemovedEvent(oldPost));
+                                       removedPosts.add(oldPost);
                                }
                        }
                        /* find new posts. */
@@ -1008,15 +1010,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
                                if (newPost.getTime() < getSoneFollowingTime(sone)) {
                                        newPost.setKnown(true);
                                } else if (!newPost.isKnown()) {
-                                       eventBus.post(new NewPostFoundEvent(newPost));
+                                       newPosts.add(newPost);
                                }
                        }
                        /* store posts. */
                        database.storePosts(sone, sone.getPosts());
+                       Collection<PostReply> newPostReplies = new ArrayList<PostReply>();
+                       Collection<PostReply> removedPostReplies = new ArrayList<PostReply>();
                        if (!soneRescueMode) {
                                for (PostReply reply : storedSone.get().getReplies()) {
                                        if (!sone.getReplies().contains(reply)) {
-                                               eventBus.post(new PostReplyRemovedEvent(reply));
+                                               removedPostReplies.add(reply);
                                        }
                                }
                        }
@@ -1028,7 +1032,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
                                if (reply.getTime() < getSoneFollowingTime(sone)) {
                                        reply.setKnown(true);
                                } else if (!reply.isKnown()) {
-                                       eventBus.post(new NewPostReplyFoundEvent(reply));
+                                       newPostReplies.add(reply);
                                }
                        }
                        database.storePostReplies(sone, sone.getReplies());
@@ -1038,6 +1042,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
                                        database.removeImage(image);
                                }
                        }
+                       for (Post removedPost : removedPosts) {
+                               eventBus.post(new PostRemovedEvent(removedPost));
+                       }
+                       for (Post newPost : newPosts) {
+                               eventBus.post(new NewPostFoundEvent(newPost));
+                       }
+                       for (PostReply removedPostReply : removedPostReplies) {
+                               eventBus.post(new PostReplyRemovedEvent(removedPostReply));
+                       }
+                       for (PostReply newPostReply : newPostReplies) {
+                               eventBus.post(new NewPostReplyFoundEvent(newPostReply));
+                       }
                        for (Album album : sone.getRootAlbum().getAlbums()) {
                                database.storeAlbum(album);
                                for (Image image : album.getImages()) {
index 8b25954..67ea671 100644 (file)
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.database.memory;
 
 import static com.google.common.base.Optional.fromNullable;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static net.pterodactylus.sone.data.Reply.TIME_COMPARATOR;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,8 +30,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -38,7 +37,6 @@ import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.AlbumBuilderImpl;
 import net.pterodactylus.sone.data.impl.ImageBuilderImpl;
@@ -54,6 +52,8 @@ import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
 import com.google.common.util.concurrent.AbstractService;
@@ -79,10 +79,10 @@ public class MemoryDatabase extends AbstractService implements Database {
        private final Map<String, Post> allPosts = new HashMap<String, Post>();
 
        /** All posts by their Sones. */
-       private final Map<String, Collection<Post>> sonePosts = new HashMap<String, Collection<Post>>();
+       private final Multimap<String, Post> sonePosts = HashMultimap.create();
 
        /** All posts by their recipient. */
-       private final Map<String, Collection<Post>> recipientPosts = new HashMap<String, Collection<Post>>();
+       private final Multimap<String, Post> recipientPosts = HashMultimap.create();
 
        /** Whether posts are known. */
        private final Set<String> knownPosts = new HashSet<String>();
@@ -97,10 +97,16 @@ public class MemoryDatabase extends AbstractService implements Database {
                public int compare(String leftString, String rightString) {
                        return leftString.compareTo(rightString);
                }
-       }, PostReply.TIME_COMPARATOR);
+       }, TIME_COMPARATOR);
 
        /** Replies by post. */
-       private final Map<String, SortedSet<PostReply>> postReplies = new HashMap<String, SortedSet<PostReply>>();
+       private final SortedSetMultimap<String, PostReply> postReplies = TreeMultimap.create(new Comparator<String>() {
+
+               @Override
+               public int compare(String leftString, String rightString) {
+                       return leftString.compareTo(rightString);
+               }
+       }, TIME_COMPARATOR);
 
        /** Whether post replies are known. */
        private final Set<String> knownPostReplies = new HashSet<String>();
@@ -256,8 +262,8 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        /* remove all posts by the Sone. */
-                       getPostsFrom(sone.getId()).clear();
-                       for (Post post : posts) {
+                       Collection<Post> oldPosts = getPostsFrom(sone.getId());
+                       for (Post post : oldPosts) {
                                allPosts.remove(post.getId());
                                if (post.getRecipientId().isPresent()) {
                                        getPostsTo(post.getRecipientId().get()).remove(post);
@@ -345,13 +351,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                lock.writeLock().lock();
                try {
                        allPostReplies.put(postReply.getId(), postReply);
-                       if (postReplies.containsKey(postReply.getPostId())) {
-                               postReplies.get(postReply.getPostId()).add(postReply);
-                       } else {
-                               TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                               replies.add(postReply);
-                               postReplies.put(postReply.getPostId(), replies);
-                       }
+                       postReplies.put(postReply.getPostId(), postReply);
                } finally {
                        lock.writeLock().unlock();
                }
@@ -377,13 +377,7 @@ public class MemoryDatabase extends AbstractService implements Database {
                        for (PostReply postReply : postReplies) {
                                allPostReplies.put(postReply.getId(), postReply);
                                sonePostReplies.put(postReply.getSone().getId(), postReply);
-                               if (this.postReplies.containsKey(postReply.getPostId())) {
-                                       this.postReplies.get(postReply.getPostId()).add(postReply);
-                               } else {
-                                       TreeSet<PostReply> replies = new TreeSet<PostReply>(Reply.TIME_COMPARATOR);
-                                       replies.add(postReply);
-                                       this.postReplies.put(postReply.getPostId(), replies);
-                               }
+                               this.postReplies.put(postReply.getPostId(), postReply);
                        }
                } finally {
                        lock.writeLock().unlock();
@@ -398,9 +392,6 @@ public class MemoryDatabase extends AbstractService implements Database {
                        allPostReplies.remove(postReply.getId());
                        if (postReplies.containsKey(postReply.getPostId())) {
                                postReplies.get(postReply.getPostId()).remove(postReply);
-                               if (postReplies.get(postReply.getPostId()).isEmpty()) {
-                                       postReplies.remove(postReply.getPostId());
-                               }
                        }
                } finally {
                        lock.writeLock().unlock();
@@ -608,26 +599,12 @@ public class MemoryDatabase extends AbstractService implements Database {
         * @return All posts
         */
        private Collection<Post> getPostsFrom(String soneId) {
-               Collection<Post> posts = null;
                lock.readLock().lock();
                try {
-                       posts = sonePosts.get(soneId);
+                       return sonePosts.get(soneId);
                } finally {
                        lock.readLock().unlock();
                }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       sonePosts.put(soneId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
        }
 
        /**
@@ -639,26 +616,12 @@ public class MemoryDatabase extends AbstractService implements Database {
         * @return All posts
         */
        private Collection<Post> getPostsTo(String recipientId) {
-               Collection<Post> posts = null;
                lock.readLock().lock();
                try {
-                       posts = recipientPosts.get(recipientId);
+                       return recipientPosts.get(recipientId);
                } finally {
                        lock.readLock().unlock();
                }
-               if (posts != null) {
-                       return posts;
-               }
-
-               posts = new HashSet<Post>();
-               lock.writeLock().lock();
-               try {
-                       recipientPosts.put(recipientId, posts);
-               } finally {
-                       lock.writeLock().unlock();
-               }
-
-               return posts;
        }
 
        /** Loads the known posts. */
@@ -709,10 +672,7 @@ public class MemoryDatabase extends AbstractService implements Database {
        private Collection<PostReply> getRepliesFrom(String id) {
                lock.readLock().lock();
                try {
-                       if (sonePostReplies.containsKey(id)) {
-                               return Collections.unmodifiableCollection(sonePostReplies.get(id));
-                       }
-                       return Collections.emptySet();
+                       return Collections.unmodifiableCollection(sonePostReplies.get(id));
                } finally {
                        lock.readLock().unlock();
                }
index 593193c..f21d256 100644 (file)
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.util.template.TemplateParser.parse;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -125,6 +127,7 @@ import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.sone.web.page.PageToadlet;
 import net.pterodactylus.sone.web.page.PageToadletFactory;
+import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.NotificationManager;
@@ -143,7 +146,6 @@ import net.pterodactylus.util.template.ReplaceFilter;
 import net.pterodactylus.util.template.StoreFilter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContextFactory;
-import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.TemplateProvider;
 import net.pterodactylus.util.template.XmlFilter;
 import net.pterodactylus.util.web.RedirectPage;
@@ -287,40 +289,49 @@ public class WebInterface {
                templateContextFactory.addTemplateObject("formPassword", formPassword);
 
                /* create notifications. */
-               Template newSoneNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newSoneNotification.html"));
+               Template newSoneNotificationTemplate = parseTemplate("/templates/notify/newSoneNotification.html");
                newSoneNotification = new ListNotification<Sone>("new-sone-notification", "sones", newSoneNotificationTemplate, false);
 
-               Template newPostNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newPostNotification.html"));
+               Template newPostNotificationTemplate = parseTemplate("/templates/notify/newPostNotification.html");
                newPostNotification = new ListNotification<Post>("new-post-notification", "posts", newPostNotificationTemplate, false);
 
-               Template localPostNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newPostNotification.html"));
+               Template localPostNotificationTemplate = parseTemplate("/templates/notify/newPostNotification.html");
                localPostNotification = new ListNotification<Post>("local-post-notification", "posts", localPostNotificationTemplate, false);
 
-               Template newReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
+               Template newReplyNotificationTemplate = parseTemplate("/templates/notify/newReplyNotification.html");
                newReplyNotification = new ListNotification<PostReply>("new-reply-notification", "replies", newReplyNotificationTemplate, false);
 
-               Template localReplyNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/newReplyNotification.html"));
+               Template localReplyNotificationTemplate = parseTemplate("/templates/notify/newReplyNotification.html");
                localReplyNotification = new ListNotification<PostReply>("local-reply-notification", "replies", localReplyNotificationTemplate, false);
 
-               Template mentionNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/mentionNotification.html"));
+               Template mentionNotificationTemplate = parseTemplate("/templates/notify/mentionNotification.html");
                mentionNotification = new ListNotification<Post>("mention-notification", "posts", mentionNotificationTemplate, false);
 
-               Template lockedSonesTemplate = TemplateParser.parse(createReader("/templates/notify/lockedSonesNotification.html"));
+               Template lockedSonesTemplate = parseTemplate("/templates/notify/lockedSonesNotification.html");
                lockedSonesNotification = new ListNotification<Sone>("sones-locked-notification", "sones", lockedSonesTemplate);
 
-               Template newVersionTemplate = TemplateParser.parse(createReader("/templates/notify/newVersionNotification.html"));
+               Template newVersionTemplate = parseTemplate("/templates/notify/newVersionNotification.html");
                newVersionNotification = new TemplateNotification("new-version-notification", newVersionTemplate);
 
-               Template insertingImagesTemplate = TemplateParser.parse(createReader("/templates/notify/inserting-images-notification.html"));
+               Template insertingImagesTemplate = parseTemplate("/templates/notify/inserting-images-notification.html");
                insertingImagesNotification = new ListNotification<Image>("inserting-images-notification", "images", insertingImagesTemplate);
 
-               Template insertedImagesTemplate = TemplateParser.parse(createReader("/templates/notify/inserted-images-notification.html"));
+               Template insertedImagesTemplate = parseTemplate("/templates/notify/inserted-images-notification.html");
                insertedImagesNotification = new ListNotification<Image>("inserted-images-notification", "images", insertedImagesTemplate);
 
-               Template imageInsertFailedTemplate = TemplateParser.parse(createReader("/templates/notify/image-insert-failed-notification.html"));
+               Template imageInsertFailedTemplate = parseTemplate("/templates/notify/image-insert-failed-notification.html");
                imageInsertFailedNotification = new ListNotification<Image>("image-insert-failed-notification", "images", imageInsertFailedTemplate);
        }
 
+       private Template parseTemplate(String resourceName) {
+               Reader reader = createReader(resourceName);
+               try {
+                       return parse(reader);
+               } finally {
+                       Closer.close(reader);
+               }
+       }
+
        //
        // ACCESSORS
        //
@@ -509,7 +520,7 @@ public class WebInterface {
         */
        public void setFirstStart(boolean firstStart) {
                if (firstStart) {
-                       Template firstStartNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/firstStartNotification.html"));
+                       Template firstStartNotificationTemplate = parseTemplate("/templates/notify/firstStartNotification.html");
                        Notification firstStartNotification = new TemplateNotification("first-start-notification", firstStartNotificationTemplate);
                        notificationManager.addNotification(firstStartNotification);
                }
@@ -524,7 +535,7 @@ public class WebInterface {
         */
        public void setNewConfig(boolean newConfig) {
                if (newConfig && !hasFirstStartNotification()) {
-                       Template configNotReadNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/configNotReadNotification.html"));
+                       Template configNotReadNotificationTemplate = parseTemplate("/templates/notify/configNotReadNotification.html");
                        Notification configNotReadNotification = new TemplateNotification("config-not-read-notification", configNotReadNotificationTemplate);
                        notificationManager.addNotification(configNotReadNotification);
                }
@@ -555,7 +566,7 @@ public class WebInterface {
                registerToadlets();
 
                /* notification templates. */
-               Template startupNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/startupNotification.html"));
+               Template startupNotificationTemplate = parseTemplate("/templates/notify/startupNotification.html");
 
                final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
                notificationManager.addNotification(startupNotification);
@@ -568,7 +579,7 @@ public class WebInterface {
                        }
                }, 2, TimeUnit.MINUTES);
 
-               Template wotMissingNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/wotMissingNotification.html"));
+               Template wotMissingNotificationTemplate = parseTemplate("/templates/notify/wotMissingNotification.html");
                final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
                ticker.scheduleAtFixedRate(new Runnable() {
 
@@ -601,36 +612,36 @@ public class WebInterface {
         * Register all toadlets.
         */
        private void registerToadlets() {
-               Template emptyTemplate = TemplateParser.parse(new StringReader(""));
-               Template loginTemplate = TemplateParser.parse(createReader("/templates/login.html"));
-               Template indexTemplate = TemplateParser.parse(createReader("/templates/index.html"));
-               Template newTemplate = TemplateParser.parse(createReader("/templates/new.html"));
-               Template knownSonesTemplate = TemplateParser.parse(createReader("/templates/knownSones.html"));
-               Template createSoneTemplate = TemplateParser.parse(createReader("/templates/createSone.html"));
-               Template createPostTemplate = TemplateParser.parse(createReader("/templates/createPost.html"));
-               Template createReplyTemplate = TemplateParser.parse(createReader("/templates/createReply.html"));
-               Template bookmarksTemplate = TemplateParser.parse(createReader("/templates/bookmarks.html"));
-               Template searchTemplate = TemplateParser.parse(createReader("/templates/search.html"));
-               Template editProfileTemplate = TemplateParser.parse(createReader("/templates/editProfile.html"));
-               Template editProfileFieldTemplate = TemplateParser.parse(createReader("/templates/editProfileField.html"));
-               Template deleteProfileFieldTemplate = TemplateParser.parse(createReader("/templates/deleteProfileField.html"));
-               Template viewSoneTemplate = TemplateParser.parse(createReader("/templates/viewSone.html"));
-               Template viewPostTemplate = TemplateParser.parse(createReader("/templates/viewPost.html"));
-               Template deletePostTemplate = TemplateParser.parse(createReader("/templates/deletePost.html"));
-               Template deleteReplyTemplate = TemplateParser.parse(createReader("/templates/deleteReply.html"));
-               Template deleteSoneTemplate = TemplateParser.parse(createReader("/templates/deleteSone.html"));
-               Template imageBrowserTemplate = TemplateParser.parse(createReader("/templates/imageBrowser.html"));
-               Template createAlbumTemplate = TemplateParser.parse(createReader("/templates/createAlbum.html"));
-               Template deleteAlbumTemplate = TemplateParser.parse(createReader("/templates/deleteAlbum.html"));
-               Template deleteImageTemplate = TemplateParser.parse(createReader("/templates/deleteImage.html"));
-               Template noPermissionTemplate = TemplateParser.parse(createReader("/templates/noPermission.html"));
-               Template optionsTemplate = TemplateParser.parse(createReader("/templates/options.html"));
-               Template rescueTemplate = TemplateParser.parse(createReader("/templates/rescue.html"));
-               Template aboutTemplate = TemplateParser.parse(createReader("/templates/about.html"));
-               Template invalidTemplate = TemplateParser.parse(createReader("/templates/invalid.html"));
-               Template postTemplate = TemplateParser.parse(createReader("/templates/include/viewPost.html"));
-               Template replyTemplate = TemplateParser.parse(createReader("/templates/include/viewReply.html"));
-               Template openSearchTemplate = TemplateParser.parse(createReader("/templates/xml/OpenSearch.xml"));
+               Template emptyTemplate = parse(new StringReader(""));
+               Template loginTemplate = parseTemplate("/templates/login.html");
+               Template indexTemplate = parseTemplate("/templates/index.html");
+               Template newTemplate = parseTemplate("/templates/new.html");
+               Template knownSonesTemplate = parseTemplate("/templates/knownSones.html");
+               Template createSoneTemplate = parseTemplate("/templates/createSone.html");
+               Template createPostTemplate = parseTemplate("/templates/createPost.html");
+               Template createReplyTemplate = parseTemplate("/templates/createReply.html");
+               Template bookmarksTemplate = parseTemplate("/templates/bookmarks.html");
+               Template searchTemplate = parseTemplate("/templates/search.html");
+               Template editProfileTemplate = parseTemplate("/templates/editProfile.html");
+               Template editProfileFieldTemplate = parseTemplate("/templates/editProfileField.html");
+               Template deleteProfileFieldTemplate = parseTemplate("/templates/deleteProfileField.html");
+               Template viewSoneTemplate = parseTemplate("/templates/viewSone.html");
+               Template viewPostTemplate = parseTemplate("/templates/viewPost.html");
+               Template deletePostTemplate = parseTemplate("/templates/deletePost.html");
+               Template deleteReplyTemplate = parseTemplate("/templates/deleteReply.html");
+               Template deleteSoneTemplate = parseTemplate("/templates/deleteSone.html");
+               Template imageBrowserTemplate = parseTemplate("/templates/imageBrowser.html");
+               Template createAlbumTemplate = parseTemplate("/templates/createAlbum.html");
+               Template deleteAlbumTemplate = parseTemplate("/templates/deleteAlbum.html");
+               Template deleteImageTemplate = parseTemplate("/templates/deleteImage.html");
+               Template noPermissionTemplate = parseTemplate("/templates/noPermission.html");
+               Template optionsTemplate = parseTemplate("/templates/options.html");
+               Template rescueTemplate = parseTemplate("/templates/rescue.html");
+               Template aboutTemplate = parseTemplate("/templates/about.html");
+               Template invalidTemplate = parseTemplate("/templates/invalid.html");
+               Template postTemplate = parseTemplate("/templates/include/viewPost.html");
+               Template replyTemplate = parseTemplate("/templates/include/viewReply.html");
+               Template openSearchTemplate = parseTemplate("/templates/xml/OpenSearch.xml");
 
                PageToadletFactory pageToadletFactory = new PageToadletFactory(sonePlugin.pluginRespirator().getHLSimpleClient(), "/Sone/");
                pageToadlets.add(pageToadletFactory.createPageToadlet(new RedirectPage<FreenetRequest>("", "index.html")));
@@ -788,7 +799,7 @@ public class WebInterface {
                synchronized (soneInsertNotifications) {
                        TemplateNotification templateNotification = soneInsertNotifications.get(sone);
                        if (templateNotification == null) {
-                               templateNotification = new TemplateNotification(TemplateParser.parse(createReader("/templates/notify/soneInsertNotification.html")));
+                               templateNotification = new TemplateNotification(parseTemplate("/templates/notify/soneInsertNotification.html"));
                                templateNotification.set("insertSone", sone);
                                soneInsertNotifications.put(sone, templateNotification);
                        }
@@ -796,6 +807,23 @@ public class WebInterface {
                }
        }
 
+       private boolean localSoneMentionedInNewPostOrReply(Post post) {
+               if (!post.getSone().isLocal()) {
+                       if (!getMentionedSones(post.getText()).isEmpty() && !post.isKnown()) {
+                               return true;
+                       }
+               }
+               for (PostReply postReply : getCore().getReplies(post.getId())) {
+                       if (postReply.getSone().isLocal()) {
+                               continue;
+                       }
+                       if (!getMentionedSones(postReply.getText()).isEmpty() && !postReply.isKnown()) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
        //
        // EVENT HANDLERS
        //
@@ -857,7 +885,7 @@ public class WebInterface {
                }
                if (!hasFirstStartNotification()) {
                        notificationManager.addNotification(isLocal ? localReplyNotification : newReplyNotification);
-                       if (!getMentionedSones(reply.getText()).isEmpty() && !isLocal && reply.getPost().isPresent() && (reply.getTime() <= System.currentTimeMillis())) {
+                       if (reply.getPost().isPresent() && localSoneMentionedInNewPostOrReply(reply.getPost().get())) {
                                mentionNotification.add(reply.getPost().get());
                                notificationManager.addNotification(mentionNotification);
                        }
@@ -887,7 +915,9 @@ public class WebInterface {
        public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
                newPostNotification.remove(markPostKnownEvent.post());
                localPostNotification.remove(markPostKnownEvent.post());
-               mentionNotification.remove(markPostKnownEvent.post());
+               if (!localSoneMentionedInNewPostOrReply(markPostKnownEvent.post())) {
+                       mentionNotification.remove(markPostKnownEvent.post());
+               }
        }
 
        /**
@@ -898,9 +928,12 @@ public class WebInterface {
         */
        @Subscribe
        public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
-               newReplyNotification.remove(markPostReplyKnownEvent.postReply());
-               localReplyNotification.remove(markPostReplyKnownEvent.postReply());
-               mentionNotification.remove(markPostReplyKnownEvent.postReply().getPost().get());
+               PostReply postReply = markPostReplyKnownEvent.postReply();
+               newReplyNotification.remove(postReply);
+               localReplyNotification.remove(postReply);
+               if (postReply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(postReply.getPost().get())) {
+                       mentionNotification.remove(postReply.getPost().get());
+               }
        }
 
        /**
@@ -924,7 +957,9 @@ public class WebInterface {
        public void postRemoved(PostRemovedEvent postRemovedEvent) {
                newPostNotification.remove(postRemovedEvent.post());
                localPostNotification.remove(postRemovedEvent.post());
-               mentionNotification.remove(postRemovedEvent.post());
+               if (!localSoneMentionedInNewPostOrReply(postRemovedEvent.post())) {
+                       mentionNotification.remove(postRemovedEvent.post());
+               }
        }
 
        /**
@@ -938,14 +973,8 @@ public class WebInterface {
                PostReply reply = postReplyRemovedEvent.postReply();
                newReplyNotification.remove(reply);
                localReplyNotification.remove(reply);
-               if (!getMentionedSones(reply.getText()).isEmpty() && reply.getPost().isPresent()) {
-                       boolean isMentioned = false;
-                       for (PostReply existingReply : getCore().getReplies(reply.getPostId())) {
-                               isMentioned |= !reply.isKnown() && !getMentionedSones(existingReply.getText()).isEmpty();
-                       }
-                       if (!isMentioned) {
-                               mentionNotification.remove(reply.getPost().get());
-                       }
+               if (reply.getPost().isPresent() && !localSoneMentionedInNewPostOrReply(reply.getPost().get())) {
+                       mentionNotification.remove(reply.getPost().get());
                }
        }