提交: 115aef624d0834edd743922da2cf8a6bb5575b57 - KancolleSniffer (git)

Commit MetaInfo

• 修订版: 115aef624d0834edd743922da2cf8a6bb5575b57 (tree)
• 时间: 2020-08-30 14:58:21
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

通知周りをMainWindowからNotifierに移す

更改概述

• modified: KancolleSniffer/KancolleSniffer.csproj
• modified: KancolleSniffer/MainForm.cs
• add: KancolleSniffer/Notification/Notifier.cs
• modified: KancolleSniffer/View/HqPanel.cs
• modified: KancolleSniffer/View/UpdateContext.cs

差异

--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -69,6 +69,7 @@
     <Compile Include="Model\QuestCountList.cs" />
     <Compile Include="Model\QuestSpec.cs" />
     <Compile Include="Notification\Formatter.cs" />
+    <Compile Include="Notification\Notifier.cs" />
     <Compile Include="Privacy.cs" />
     <Compile Include="Log\LogProcessor.cs" />
     <Compile Include="Model\Achievement.cs" />

--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -48,7 +48,7 @@ namespace KancolleSniffer
         private readonly ResizableToolTip _tooltipCopy = new ResizableToolTip {ShowAlways = false, AutomaticDelay = 0};
         private readonly ListFormGroup _listFormGroup;
 
-        private readonly Scheduler _notificationScheduler;
+        private readonly Notifier _notifier;
         private bool _started;
         private bool _timerEnabled;
         private string _debugLogFile;
@@ -63,12 +63,6 @@ namespace KancolleSniffer
         public Sniffer Sniffer { get; } = new Sniffer();
         public Config Config { get; } = new Config();
 
-        public interface INotifySubmitter
-        {
-            void Flash();
-            void Enqueue(string key, string subject);
-        }
-
         public MainForm()
         {
             InitializeComponent();
@@ -76,13 +70,13 @@ namespace KancolleSniffer
             Config.Load();
             _configDialog = new ConfigDialog(this);
             _listFormGroup = new ListFormGroup(this);
-            _notificationScheduler = new Scheduler(Alarm);
+            _notifier = new Notifier(FlashWindow, ShowTaster, PlaySound);
             SetupView();
             _proxyManager = new ProxyManager(this);
             _proxyManager.UpdatePacFile();
             _errorLog = new ErrorLog(Sniffer);
             LoadData();
-            Sniffer.RepeatingTimerController = new RepeatingTimerController(this);
+            Sniffer.RepeatingTimerController = _notifier;
         }
 
         private void SetupView()
@@ -105,9 +99,9 @@ namespace KancolleSniffer
             _updateable = new IUpdateContext[]
             {
                 hqPanel, missionPanel, kdockPanel, ndockPanel, materialHistoryPanel, shipInfoPanel, chargeStatus1,
-                chargeStatus2, chargeStatus3, chargeStatus4
+                chargeStatus2, chargeStatus3, chargeStatus4, _notifier
             };
-            var context = new UpdateContext(Sniffer, Config, new NotifySubmitter(_notificationScheduler), () => _now);
+            var context = new UpdateContext(Sniffer, Config, () => _now, () => _prev);
             foreach (var updateable in _updateable)
                 updateable.Context = context;
             _timers = new IUpdateTimers[] {missionPanel, kdockPanel, ndockPanel, shipInfoPanel};
@@ -127,26 +121,6 @@ namespace KancolleSniffer
             Height += questPanel.Height - prevHeight;
         }
 
-        private class NotifySubmitter : INotifySubmitter
-        {
-            private readonly Scheduler _manager;
-
-            public NotifySubmitter(Scheduler manager)
-            {
-                _manager = manager;
-            }
-
-            public void Flash()
-            {
-                _manager.Flush();
-            }
-
-            public void Enqueue(string key, string subject)
-            {
-                _manager.Enqueue(key, subject);
-            }
-        }
-
         private readonly FileSystemWatcher _watcher = new FileSystemWatcher
         {
             Path = AppDomain.CurrentDomain.BaseDirectory,
@@ -182,31 +156,6 @@ namespace KancolleSniffer
             _watcher.EnableRaisingEvents = true;
         }
 
-        private class RepeatingTimerController : Sniffer.IRepeatingTimerController
-        {
-            private readonly Scheduler _manager;
-            private readonly Config _config;
-
-            public RepeatingTimerController(MainForm main)
-            {
-                _manager = main._notificationScheduler;
-                _config = main.Config;
-            }
-
-            public void Stop(string key)
-            {
-                _manager.StopRepeat(key,
-                    (key == "入渠終了" || key == "遠征終了") &&
-                    (_config.Notifications[key].Flags & NotificationType.Cont) != 0);
-            }
-
-            public void Stop(string key, int fleet) => _manager.StopRepeat(key, fleet);
-
-            public void Suspend(string exception = null) => _manager.SuspendRepeat(exception);
-
-            public void Resume() => _manager.ResumeRepeat();
-        }
-
         private void HttpProxy_AfterSessionComplete(HttpProxy.Session session)
         {
             BeginInvoke(new Action<HttpProxy.Session>(ProcessRequest), session);
@@ -301,7 +250,7 @@ namespace KancolleSniffer
                 hqPanel.Login.Visible = false;
                 shipInfoPanel.Guide.Visible = false;
                 _started = true;
-                _notificationScheduler.StopAllRepeat();
+                _notifier.StopAllRepeat();
                 return;
             }
             if (!_started)
@@ -469,16 +418,10 @@ namespace KancolleSniffer
             {
                 Config.Save();
                 ApplyConfig();
-                StopRepeatingTimer(_configDialog.RepeatSettingsChanged);
+                _notifier.StopRepeatingTimer(_configDialog.RepeatSettingsChanged);
             }
         }
 
-        private void StopRepeatingTimer(IEnumerable<string> names)
-        {
-            foreach (var name in names)
-                _notificationScheduler.StopRepeat(name);
-        }
-
         private void PerformZoom()
         {
             if (Config.Zoom == 100)
@@ -533,6 +476,7 @@ namespace KancolleSniffer
             Sniffer.ShipCounter.Margin = Config.MarginShips;
             Sniffer.ItemCounter.Margin = Config.MarginEquips;
             hqPanel.Update();
+            _notifier.NotifyShipItemCount();
             Sniffer.Achievement.ResetHours = Config.ResetHours;
             labelAkashiRepair.Visible = labelAkashiRepairTimer.Visible = Config.UsePresetAkashi;
             Sniffer.WarnBadDamageWithDameCon = Config.WarnBadDamageWithDameCon;
@@ -573,7 +517,7 @@ namespace KancolleSniffer
                 {
                     _now = DateTime.Now;
                     UpdateTimers();
-                    NotifyTimers();
+                    _notifier.NotifyTimers();
                     _prev = _now;
                 }
                 catch (Exception ex)
@@ -624,6 +568,7 @@ namespace KancolleSniffer
         private void UpdateItemInfo()
         {
             hqPanel.Update();
+            _notifier.NotifyShipItemCount();
             materialHistoryPanel.Update();
             if (_listFormGroup.Visible)
                 _listFormGroup.UpdateList();
@@ -633,7 +578,7 @@ namespace KancolleSniffer
         {
             shipInfoPanel.SetCurrentFleet();
             shipInfoPanel.Update();
-            NotifyDamagedShip();
+            _notifier.NotifyDamagedShip();
             UpdateChargeInfo();
             UpdateRepairList();
             UpdateMissionLabels();
@@ -673,15 +618,6 @@ namespace KancolleSniffer
             }
         }
 
-        private void NotifyDamagedShip()
-        {
-            _notificationScheduler.StopRepeat("大破警告");
-            if (!Sniffer.BadlyDamagedShips.Any())
-                return;
-            SetNotification("大破警告", string.Join(" ", Sniffer.BadlyDamagedShips));
-            _notificationScheduler.Flush();
-        }
-
         private void UpdateBattleInfo()
         {
             _listFormGroup.UpdateBattleResult();
@@ -720,119 +656,6 @@ namespace KancolleSniffer
             _timerEnabled = true;
         }
 
-        private void NotifyTimers()
-        {
-            for (var i = 0; i < Sniffer.Missions.Length; i++)
-            {
-                var entry = Sniffer.Missions[i];
-                if (entry.Name == "前衛支援任務" || entry.Name == "艦隊決戦支援任務")
-                    continue;
-                CheckAlarm("遠征終了", entry.Timer, i + 1, entry.Name);
-            }
-            for (var i = 0; i < Sniffer.NDock.Length; i++)
-            {
-                var entry = Sniffer.NDock[i];
-                CheckAlarm("入渠終了", entry.Timer, i, entry.Name);
-            }
-            for (var i = 0; i < Sniffer.KDock.Length; i++)
-            {
-                var timer = Sniffer.KDock[i];
-                CheckAlarm("建造完了", timer, i, "");
-            }
-            NotifyCondTimers();
-            NotifyAkashiTimer();
-            _notificationScheduler.Flush();
-        }
-
-        private void CheckAlarm(string key, AlarmTimer timer, int fleet, string subject)
-        {
-            if (timer.CheckAlarm(_prev, _now))
-            {
-                SetNotification(key, fleet, subject);
-                return;
-            }
-            var pre = TimeSpan.FromSeconds(Config.Notifications[key].PreliminaryPeriod);
-            if (pre == TimeSpan.Zero)
-                return;
-            if (timer.CheckAlarm(_prev + pre, _now + pre))
-                SetPreNotification(key, fleet, subject);
-        }
-
-        private void NotifyCondTimers()
-        {
-            var notice = Sniffer.GetConditionNotice(_prev, _now);
-            var pre = TimeSpan.FromSeconds(Config.Notifications["疲労回復"].PreliminaryPeriod);
-            var preNotice = pre == TimeSpan.Zero
-                ? new int[ShipInfo.FleetCount]
-                : Sniffer.GetConditionNotice(_prev + pre, _now + pre);
-            for (var i = 0; i < ShipInfo.FleetCount; i++)
-            {
-                if (Config.NotifyConditions.Contains(notice[i]))
-                {
-                    SetNotification("疲労回復" + notice[i], i, "cond" + notice[i]);
-                }
-                else if (Config.NotifyConditions.Contains(preNotice[i]))
-                {
-                    SetPreNotification("疲労回復" + preNotice[i], i, "cond" + notice[i]);
-                }
-            }
-        }
-
-        private void NotifyAkashiTimer()
-        {
-            var akashi = Sniffer.AkashiTimer;
-            var msgs = akashi.GetNotice(_prev, _now);
-            if (msgs.Length == 0)
-            {
-                _notificationScheduler.StopRepeat("泊地修理");
-                return;
-            }
-            if (!akashi.CheckRepairing(_now) && !(akashi.CheckPresetRepairing() && Config.UsePresetAkashi))
-            {
-                _notificationScheduler.StopRepeat("泊地修理");
-                return;
-            }
-            var skipPreliminary = false;
-            if (msgs[0].Proceeded == "20分経過しました。")
-            {
-                SetNotification("泊地修理20分経過", msgs[0].Proceeded);
-                msgs[0].Proceeded = "";
-                skipPreliminary = true;
-                // 修理完了がいるかもしれないので続ける
-            }
-            for (var i = 0; i < ShipInfo.FleetCount; i++)
-            {
-                if (msgs[i].Proceeded != "")
-                    SetNotification("泊地修理進行", i, msgs[i].Proceeded);
-                if (msgs[i].Completed != "")
-                    SetNotification("泊地修理完了", i, msgs[i].Completed);
-            }
-            var pre = TimeSpan.FromSeconds(Config.Notifications["泊地修理20分経過"].PreliminaryPeriod);
-            if (skipPreliminary || pre == TimeSpan.Zero)
-                return;
-            if ((msgs = akashi.GetNotice(_prev + pre, _now + pre))[0].Proceeded == "20分経過しました。")
-                SetPreNotification("泊地修理20分経過", 0, msgs[0].Proceeded);
-        }
-
-        private void SetNotification(string key, string subject)
-        {
-            SetNotification(key, 0, subject);
-        }
-
-        private void SetNotification(string key, int fleet, string subject)
-        {
-            var spec = Config.Notifications[_notificationScheduler.KeyToName(key)];
-            _notificationScheduler.Enqueue(key, fleet, subject,
-                (spec.Flags & Config.NotificationFlags & NotificationType.Repeat) == 0 ? 0 : spec.RepeatInterval);
-        }
-
-        private void SetPreNotification(string key, int fleet, string subject)
-        {
-            var spec = Config.Notifications[_notificationScheduler.KeyToName(key)];
-            if ((spec.Flags & NotificationType.Preliminary) != 0)
-                _notificationScheduler.Enqueue(key, fleet, subject, 0, true);
-        }
-
         private void UpdateRepairList()
         {
             panelRepairList.SetRepairList(Sniffer.RepairList);
@@ -843,44 +666,17 @@ namespace KancolleSniffer
         {
             questPanel.Update(Sniffer.Quests);
             labelQuestCount.Text = Sniffer.Quests.Length.ToString();
-            SetQuestNotification();
+            _notifier.NotifyQuestComplete();
         }
 
-        private void SetQuestNotification()
+        private void FlashWindow()
         {
-            Sniffer.GetQuestNotifications(out var notify, out var stop);
-            foreach (var questName in notify)
-                SetNotification("任務達成", 0, questName);
-            foreach (var questName in stop)
-                _notificationScheduler.StopRepeat("任務達成", questName);
-            _notificationScheduler.Flush();
+            Win32API.FlashWindow(Handle);
         }
 
-        private void Alarm(string balloonTitle, string balloonMessage, string name)
+        private void ShowTaster(string title, string message)
         {
-            var flags = Config.Notifications[name].Flags;
-            var effective = Config.NotificationFlags & Config.Notifications[name].Flags;
-            if ((effective & NotificationType.FlashWindow) != 0)
-                Win32API.FlashWindow(Handle);
-            if ((effective & NotificationType.ShowBaloonTip) != 0)
-                notifyIconMain.ShowBalloonTip(20000, balloonTitle, balloonMessage, ToolTipIcon.Info);
-            if ((effective & NotificationType.PlaySound) != 0)
-                PlaySound(Config.Sounds[name], Config.Sounds.Volume);
-            if (Config.Pushbullet.On && (flags & NotificationType.Push) != 0)
-            {
-                Task.Run(() =>
-                {
-                    PushNotification.PushToPushbullet(Config.Pushbullet.Token, balloonTitle, balloonMessage);
-                });
-            }
-            if (Config.Pushover.On && (flags & NotificationType.Push) != 0)
-            {
-                Task.Run(() =>
-                {
-                    PushNotification.PushToPushover(Config.Pushover.ApiKey, Config.Pushover.UserKey,
-                        balloonTitle, balloonMessage);
-                });
-            }
+            notifyIconMain.ShowBalloonTip(20000, title, message, ToolTipIcon.Info);
         }
 
         [DllImport("winmm.dll")]

--- /dev/null
+++ b/KancolleSniffer/Notification/Notifier.cs
@@ -0,0 +1,276 @@
+// Copyright (C) 2020 Kazuhiro Fujieda <[e-mail]>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using KancolleSniffer.Model;
+using KancolleSniffer.Net;
+using KancolleSniffer.View;
+
+namespace KancolleSniffer.Notification
+{
+    public class Notifier : IUpdateContext, Sniffer.IRepeatingTimerController
+    {
+        private readonly Scheduler _scheduler;
+        private readonly Method _method;
+
+        private class Method
+        {
+            public Action FlashWindow;
+            public Action<string, string> ShowToaster;
+            public Action<string, int> PlaySound;
+        }
+
+        public UpdateContext Context { get; set; }
+
+        private DateTime Now => Context.GetNow();
+
+        private DateTime Prev => Context.GetPrev();
+
+        private NotificationConfig Notifications => Context.Config.Notifications;
+
+        public Notifier(Action flashWindow, Action<string, string> showToaster, Action<string, int> playSound)
+        {
+            _method = new Method
+            {
+                FlashWindow = flashWindow,
+                ShowToaster = showToaster,
+                PlaySound = playSound,
+            };
+            _scheduler = new Scheduler(Alarm);
+        }
+
+        public void Stop(string key)
+        {
+            _scheduler.StopRepeat(key,
+                (key == "入渠終了" || key == "遠征終了") &&
+                (Context.Config.Notifications[key].Flags & NotificationType.Cont) != 0);
+        }
+
+        public void Stop(string key, int fleet) => _scheduler.StopRepeat(key, fleet);
+
+        public void Suspend(string exception = null) => _scheduler.SuspendRepeat(exception);
+
+        public void Resume() => _scheduler.ResumeRepeat();
+
+        public void StopAllRepeat() => _scheduler.StopAllRepeat();
+
+        public void StopRepeatingTimer(IEnumerable<string> names)
+        {
+            foreach (var name in names)
+                _scheduler.StopRepeat(name);
+        }
+
+        public void NotifyShipItemCount()
+        {
+            var ship = Context.Sniffer.ShipCounter;
+            if (ship.Alarm)
+            {
+                var message = $"残り{ship.Rest:D}隻";
+                _scheduler.Enqueue("艦娘数超過", message);
+                ship.Alarm = false;
+            }
+            var item = Context.Sniffer.ItemCounter;
+            if (item.Alarm)
+            {
+                var message = $"残り{item.Rest:D}個";
+                _scheduler.Enqueue("装備数超過", message);
+                item.Alarm = false;
+            }
+            _scheduler.Flush();
+        }
+
+        public void NotifyDamagedShip()
+        {
+            _scheduler.StopRepeat("大破警告");
+            if (!Context.Sniffer.BadlyDamagedShips.Any())
+                return;
+            SetNotification("大破警告", string.Join(" ", Context.Sniffer.BadlyDamagedShips));
+            _scheduler.Flush();
+        }
+
+        public void NotifyTimers()
+        {
+            for (var i = 0; i < Context.Sniffer.Missions.Length; i++)
+            {
+                var entry = Context.Sniffer.Missions[i];
+                if (entry.Name == "前衛支援任務" || entry.Name == "艦隊決戦支援任務")
+                    continue;
+                CheckAlarm("遠征終了", entry.Timer, i + 1, entry.Name);
+            }
+            for (var i = 0; i < Context.Sniffer.NDock.Length; i++)
+            {
+                var entry = Context.Sniffer.NDock[i];
+                CheckAlarm("入渠終了", entry.Timer, i, entry.Name);
+            }
+            for (var i = 0; i < Context.Sniffer.KDock.Length; i++)
+            {
+                var timer = Context.Sniffer.KDock[i];
+                CheckAlarm("建造完了", timer, i, "");
+            }
+            NotifyCondTimers();
+            NotifyAkashiTimer();
+            _scheduler.Flush();
+        }
+
+        private void CheckAlarm(string key, AlarmTimer timer, int fleet, string subject)
+        {
+            if (timer.CheckAlarm(Prev, Now))
+            {
+                SetNotification(key, fleet, subject);
+                return;
+            }
+            var pre = TimeSpan.FromSeconds(Notifications[key].PreliminaryPeriod);
+            if (pre == TimeSpan.Zero)
+                return;
+            if (timer.CheckAlarm(Prev + pre, Now + pre))
+                SetPreNotification(key, fleet, subject);
+        }
+
+        private void NotifyCondTimers()
+        {
+            var notice = Context.Sniffer.GetConditionNotice(Prev, Now);
+            var pre = TimeSpan.FromSeconds(Notifications["疲労回復"].PreliminaryPeriod);
+            var preNotice = pre == TimeSpan.Zero
+                ? new int[ShipInfo.FleetCount]
+                : Context.Sniffer.GetConditionNotice(Prev + pre, Now + pre);
+            var conditions = Context.Config.NotifyConditions;
+            for (var i = 0; i < ShipInfo.FleetCount; i++)
+            {
+                if (conditions.Contains(notice[i]))
+                {
+                    SetNotification("疲労回復" + notice[i], i, "cond" + notice[i]);
+                }
+                else if (conditions.Contains(preNotice[i]))
+                {
+                    SetPreNotification("疲労回復" + preNotice[i], i, "cond" + notice[i]);
+                }
+            }
+        }
+
+        private void NotifyAkashiTimer()
+        {
+            var akashi = Context.Sniffer.AkashiTimer;
+            var msgs = akashi.GetNotice(Prev, Now);
+            if (msgs.Length == 0)
+            {
+                _scheduler.StopRepeat("泊地修理");
+                return;
+            }
+            if (!akashi.CheckRepairing(Context.GetNow()) && !(akashi.CheckPresetRepairing() && Context.Config.UsePresetAkashi))
+            {
+                _scheduler.StopRepeat("泊地修理");
+                return;
+            }
+            var skipPreliminary = false;
+            if (msgs[0].Proceeded == "20分経過しました。")
+            {
+                SetNotification("泊地修理20分経過", msgs[0].Proceeded);
+                msgs[0].Proceeded = "";
+                skipPreliminary = true;
+                // 修理完了がいるかもしれないので続ける
+            }
+            for (var i = 0; i < ShipInfo.FleetCount; i++)
+            {
+                if (msgs[i].Proceeded != "")
+                    SetNotification("泊地修理進行", i, msgs[i].Proceeded);
+                if (msgs[i].Completed != "")
+                    SetNotification("泊地修理完了", i, msgs[i].Completed);
+            }
+            var pre = TimeSpan.FromSeconds(Notifications["泊地修理20分経過"].PreliminaryPeriod);
+            if (skipPreliminary || pre == TimeSpan.Zero)
+                return;
+            if ((msgs = akashi.GetNotice(Prev + pre, Now + pre))[0].Proceeded == "20分経過しました。")
+                SetPreNotification("泊地修理20分経過", 0, msgs[0].Proceeded);
+        }
+
+        public void NotifyQuestComplete()
+        {
+            Context.Sniffer.GetQuestNotifications(out var notify, out var stop);
+            foreach (var questName in notify)
+                SetNotification("任務達成", 0, questName);
+            foreach (var questName in stop)
+                _scheduler.StopRepeat("任務達成", questName);
+            _scheduler.Flush();
+        }
+
+        private void SetNotification(string key, string subject)
+        {
+            SetNotification(key, 0, subject);
+        }
+
+        private void SetNotification(string key, int fleet, string subject)
+        {
+            var spec = Spec(key);
+            _scheduler.Enqueue(key, fleet, subject,
+                (spec.Flags & Context.Config.NotificationFlags & NotificationType.Repeat) == 0
+                    ? 0
+                    : spec.RepeatInterval);
+        }
+
+        private void SetPreNotification(string key, int fleet, string subject)
+        {
+            if ((Spec(key).Flags & NotificationType.Preliminary) != 0)
+                _scheduler.Enqueue(key, fleet, subject, 0, true);
+        }
+
+        private NotificationSpec Spec(string key)
+        {
+            return Notifications[_scheduler.KeyToName(key)];
+        }
+
+        private void Alarm(string balloonTitle, string balloonMessage, string name)
+        {
+            if (Check(name, NotificationType.FlashWindow))
+                _method.FlashWindow();
+            if (Check(name, NotificationType.ShowBaloonTip))
+                _method.ShowToaster(balloonTitle, balloonMessage);
+            if (Check(name, NotificationType.PlaySound))
+                _method.PlaySound(Context.Config.Sounds[name], Context.Config.Sounds.Volume);
+            if (Context.Config.Pushbullet.On && CheckPush(name))
+            {
+                Task.Run(() =>
+                {
+                    PushNotification.PushToPushbullet(Context.Config.Pushbullet.Token, balloonTitle,
+                        balloonMessage);
+                });
+            }
+            if (Context.Config.Pushover.On && CheckPush(name))
+            {
+                Task.Run(() =>
+                {
+                    PushNotification.PushToPushover(Context.Config.Pushover.ApiKey, Context.Config.Pushover.UserKey,
+                        balloonTitle, balloonMessage);
+                });
+            }
+        }
+
+        private bool Check(string name, NotificationType type)
+        {
+            return (Flags(name) & type) != 0;
+        }
+
+        private NotificationType Flags(string name)
+        {
+            return Context.Config.NotificationFlags & Notifications[name].Flags;
+        }
+
+        private bool CheckPush(string name)
+        {
+            return (Notifications[name].Flags & NotificationType.Push) != 0;
+        }
+    }
+}
\ No newline at end of file

--- a/KancolleSniffer/View/HqPanel.cs
+++ b/KancolleSniffer/View/HqPanel.cs
@@ -124,7 +124,6 @@ namespace KancolleSniffer.View
         {
             UpdateNumOfShips();
             UpdateNumOfEquips();
-            Context.Submitter.Flash();
             UpdateNumOfBuckets();
             UpdateBucketHistory();
             UpdateAchievement();
@@ -151,12 +150,6 @@ namespace KancolleSniffer.View
             var ship = Context.Sniffer.ShipCounter;
             _numOfShips.Text = $"{ship.Now:D}/{ship.Max:D}";
             _numOfShips.ForeColor = ship.TooMany ? CUDColors.Red : Color.Black;
-            if (ship.Alarm)
-            {
-                var message = $"残り{ship.Rest:D}隻";
-                Context.Submitter.Enqueue("艦娘数超過", message);
-                ship.Alarm = false;
-            }
         }
 
         private void UpdateNumOfEquips()
@@ -164,12 +157,6 @@ namespace KancolleSniffer.View
             var item = Context.Sniffer.ItemCounter;
             _numOfEquips.Text = $"{item.Now:D}/{item.Max:D}";
             _numOfEquips.ForeColor = item.TooMany ? CUDColors.Red : Color.Black;
-            if (item.Alarm)
-            {
-                var message = $"残り{item.Rest:D}個";
-                Context.Submitter.Enqueue("装備数超過", message);
-                item.Alarm = false;
-            }
         }
 
         private void UpdateBucketHistory()

--- a/KancolleSniffer/View/UpdateContext.cs
+++ b/KancolleSniffer/View/UpdateContext.cs
@@ -20,15 +20,15 @@ namespace KancolleSniffer.View
     {
         public Sniffer Sniffer { get; }
         public Config Config { get; }
-        public MainForm.INotifySubmitter Submitter { get; }
         public Func<DateTime> GetNow { get; }
+        public Func<DateTime> GetPrev { get; }
 
-        public UpdateContext(Sniffer sniffer, Config config, MainForm.INotifySubmitter submitter, Func<DateTime> getNow)
+        public UpdateContext(Sniffer sniffer, Config config, Func<DateTime> getNow, Func<DateTime> getPrev)
         {
             Sniffer = sniffer;
             Config = config;
-            Submitter = submitter;
             GetNow = getNow;
+            GetPrev = getPrev;
         }
     }
 }
\ No newline at end of file