From 74dcff2e21a0434b3692f524d177207826433fc8 Mon Sep 17 00:00:00 2001
From: Prashant Gupta <prashantgupta24@gmail.com>
Date: Mon, 3 Oct 2022 21:37:39 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20multiple=20error=20window?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/mousemover/mouseMover.go      |  5 +++--
 pkg/mousemover/mouseMoverUtil.go  | 12 ++++++++++++
 pkg/mousemover/mouseMover_test.go |  2 ++
 pkg/mousemover/types.go           |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg/mousemover/mouseMover.go b/pkg/mousemover/mouseMover.go
index 06f4ec2..5ce7398 100644
--- a/pkg/mousemover/mouseMover.go
+++ b/pkg/mousemover/mouseMover.go
@@ -68,10 +68,11 @@ func (m *MouseMover) run(heartbeatCh chan *tracker.Heartbeat, activityTracker *t
 						} else {
 							didNotMoveCount := state.getDidNotMoveCount()
 							state.updateDidNotMoveCount(didNotMoveCount + 1)
-							msg := fmt.Sprintf("Mouse pointer cannot be moved at %v. Last moved at %v. Happened %v times. See README for details.",
+							state.updateLastErrorTime(time.Now())
+							msg := fmt.Sprintf("Mouse pointer cannot be moved at %v. Last moved at %v. Happened %v times. (Only notifies once every 24 hours.) See README for details.",
 								time.Now(), state.getLastMouseMovedTime(), state.getDidNotMoveCount())
 							logger.Errorf(msg)
-							if state.getDidNotMoveCount() >= 10 {
+							if state.getDidNotMoveCount() >= 10 && (time.Since(state.lastErrorTime).Hours() > 24) { //show only 1 error in a 24 hour window
 								go func() {
 									robotgo.ShowAlert("Error with Automatic Mouse Mover", msg)
 								}()
diff --git a/pkg/mousemover/mouseMoverUtil.go b/pkg/mousemover/mouseMoverUtil.go
index 3034aa1..03fb1c5 100644
--- a/pkg/mousemover/mouseMoverUtil.go
+++ b/pkg/mousemover/mouseMoverUtil.go
@@ -94,6 +94,18 @@ func (s *state) updateLastMouseMovedTime(time time.Time) {
 	s.lastMouseMovedTime = time
 }
 
+func (s *state) getLastErrorTime() time.Time {
+	s.mutex.RLock()
+	defer s.mutex.RUnlock()
+	return s.lastErrorTime
+}
+
+func (s *state) updateLastErrorTime(time time.Time) {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+	s.lastErrorTime = time
+}
+
 func (s *state) getDidNotMoveCount() int {
 	s.mutex.RLock()
 	defer s.mutex.RUnlock()
diff --git a/pkg/mousemover/mouseMover_test.go b/pkg/mousemover/mouseMover_test.go
index 29e41e2..046d13c 100644
--- a/pkg/mousemover/mouseMover_test.go
+++ b/pkg/mousemover/mouseMover_test.go
@@ -166,6 +166,7 @@ func (suite *TestMover) TestMouseMoveFailure() {
 	assert.False(t, state.isSystemSleeping(), "machine should not be sleeping")
 	assert.True(t, time.Time.IsZero(state.getLastMouseMovedTime()), "should be default")
 	assert.Equal(t, state.getDidNotMoveCount(), 0, "should be 0")
+	assert.True(t, state.getLastErrorTime().IsZero(), "should be default")
 
 	heartbeatCh <- &tracker.Heartbeat{
 		WasAnyActivity: false,
@@ -174,4 +175,5 @@ func (suite *TestMover) TestMouseMoveFailure() {
 	time.Sleep(time.Millisecond * 500) //wait for it to be registered
 	assert.True(t, time.Time.IsZero(state.getLastMouseMovedTime()), "should be default but is ", state.getLastMouseMovedTime())
 	assert.NotEqual(t, state.getDidNotMoveCount(), 0, "should not be 0")
+	assert.NotEqual(t, state.getLastErrorTime(), 0, "should not be 0")
 }
diff --git a/pkg/mousemover/types.go b/pkg/mousemover/types.go
index f7265e7..cea9171 100644
--- a/pkg/mousemover/types.go
+++ b/pkg/mousemover/types.go
@@ -19,6 +19,7 @@ type state struct {
 	isAppRunning       bool
 	isSysSleeping      bool
 	lastMouseMovedTime time.Time
+	lastErrorTime      time.Time
 	didNotMoveCount    int
 	override           *override
 }