Translated untranslated Japanese string

[Sone.git] / src / main / java / net / pterodactylus / sone / web / WebInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 18aebed..593193c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -32,6 +32,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+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;
 
@@ -142,7 +146,6 @@ 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.thread.Ticker;
 import net.pterodactylus.util.web.RedirectPage;
 import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.util.web.TemplatePage;
@@ -213,7 +216,7 @@ public class WebInterface {
        private final Map<Sone, TemplateNotification> soneInsertNotifications = new HashMap<Sone, TemplateNotification>();
 
        /** Sone locked notification ticker objects. */
-       private final Map<Sone, Object> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, Object>());
+       private final Map<Sone, ScheduledFuture<?>> lockedSonesTickerObjects = Collections.synchronizedMap(new HashMap<Sone, ScheduledFuture<?>>());
 
        /** The “Sone locked” notification. */
        private final ListNotification<Sone> lockedSonesNotification;
@@ -230,6 +233,9 @@ public class WebInterface {
        /** The “image insert failed” notification. */
        private final ListNotification<Image> imageInsertFailedNotification;
 
+       /** Scheduled executor for time-based notifications. */
+       private final ScheduledExecutorService ticker = Executors.newScheduledThreadPool(1);
+
        /**
         * Creates a new web interface.
         *
@@ -554,17 +560,17 @@ public class WebInterface {
                final TemplateNotification startupNotification = new TemplateNotification("startup-notification", startupNotificationTemplate);
                notificationManager.addNotification(startupNotification);
 
-               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (120 * 1000), new Runnable() {
+               ticker.schedule(new Runnable() {
 
                        @Override
                        public void run() {
                                startupNotification.dismiss();
                        }
-               }, "Sone Startup Notification Remover");
+               }, 2, TimeUnit.MINUTES);
 
                Template wotMissingNotificationTemplate = TemplateParser.parse(createReader("/templates/notify/wotMissingNotification.html"));
                final TemplateNotification wotMissingNotification = new TemplateNotification("wot-missing-notification", wotMissingNotificationTemplate);
-               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), new Runnable() {
+               ticker.scheduleAtFixedRate(new Runnable() {
 
                        @Override
                        @SuppressWarnings("synthetic-access")
@@ -574,10 +580,9 @@ public class WebInterface {
                                } else {
                                        notificationManager.addNotification(wotMissingNotification);
                                }
-                               Ticker.getInstance().registerEvent(System.currentTimeMillis() + (15 * 1000), this, "Sone WoT Connector Checker");
                        }
 
-               }, "Sone WoT Connector Checker");
+               }, 15, 15, TimeUnit.SECONDS);
        }
 
        /**
@@ -585,7 +590,7 @@ public class WebInterface {
         */
        public void stop() {
                unregisterToadlets();
-               Ticker.getInstance().stop();
+               ticker.shutdownNow();
        }
 
        //
@@ -852,8 +857,8 @@ public class WebInterface {
                }
                if (!hasFirstStartNotification()) {
                        notificationManager.addNotification(isLocal ? localReplyNotification : newReplyNotification);
-                       if (!getMentionedSones(reply.getText()).isEmpty() && !isLocal && (reply.getPost().getSone() != null) && (reply.getTime() <= System.currentTimeMillis())) {
-                               mentionNotification.add(reply.getPost());
+                       if (!getMentionedSones(reply.getText()).isEmpty() && !isLocal && reply.getPost().isPresent() && (reply.getTime() <= System.currentTimeMillis())) {
+                               mentionNotification.add(reply.getPost().get());
                                notificationManager.addNotification(mentionNotification);
                        }
                } else {
@@ -895,7 +900,7 @@ public class WebInterface {
        public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
                newReplyNotification.remove(markPostReplyKnownEvent.postReply());
                localReplyNotification.remove(markPostReplyKnownEvent.postReply());
-               mentionNotification.remove(markPostReplyKnownEvent.postReply().getPost());
+               mentionNotification.remove(markPostReplyKnownEvent.postReply().getPost().get());
        }
 
        /**
@@ -933,13 +938,13 @@ public class WebInterface {
                PostReply reply = postReplyRemovedEvent.postReply();
                newReplyNotification.remove(reply);
                localReplyNotification.remove(reply);
-               if (!getMentionedSones(reply.getText()).isEmpty()) {
+               if (!getMentionedSones(reply.getText()).isEmpty() && reply.getPost().isPresent()) {
                        boolean isMentioned = false;
-                       for (PostReply existingReply : getCore().getReplies(reply.getPost())) {
+                       for (PostReply existingReply : getCore().getReplies(reply.getPostId())) {
                                isMentioned |= !reply.isKnown() && !getMentionedSones(existingReply.getText()).isEmpty();
                        }
                        if (!isMentioned) {
-                               mentionNotification.remove(reply.getPost());
+                               mentionNotification.remove(reply.getPost().get());
                        }
                }
        }
@@ -953,16 +958,15 @@ public class WebInterface {
        @Subscribe
        public void soneLocked(SoneLockedEvent soneLockedEvent) {
                final Sone sone = soneLockedEvent.sone();
-               Object tickerObject = Ticker.getInstance().registerEvent(System.currentTimeMillis() + (5 * 60) * 1000, new Runnable() {
+               ScheduledFuture<?> tickerObject = ticker.schedule(new Runnable() {
 
                        @Override
                        @SuppressWarnings("synthetic-access")
                        public void run() {
                                lockedSonesNotification.add(sone);
-                               lockedSonesTickerObjects.remove(sone);
                                notificationManager.addNotification(lockedSonesNotification);
                        }
-               }, "Sone Locked Notification");
+               }, 5, TimeUnit.MINUTES);
                lockedSonesTickerObjects.put(sone, tickerObject);
        }
 
@@ -975,7 +979,7 @@ public class WebInterface {
        @Subscribe
        public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
                lockedSonesNotification.remove(soneUnlockedEvent.sone());
-               Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()));
+               lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()).cancel(false);
        }
 
        /**