Merge pull request #36 from jamiefdhurst/fix-multiple-notices

fix: stop notice from displaying twice

Author: jamiefdhurst

src/__tests__/notice.test.ts

@@ -181,4 +181,15 @@ describe('OrganiserNotice', () => {
 
     expect(inboxGetFiles).not.toHaveBeenCalled();
   });
+
+  it('does nothing for Fri 5pm when just beyond five minute window', () => {
+    const inboxGetFiles = jest.spyOn(inbox, 'getFiles').mockReturnValue([]);
+    settings.inbox = true;
+    settings.period = 'weekly_fri_5pm';
+    now.set({ date: 3, month: 0, year: 2025, hour: 17, minute: 5, second: 0 });
+
+    sut.display();
+
+    expect(inboxGetFiles).not.toHaveBeenCalled();
+  });
 });

src/notice.ts

@@ -39,7 +39,7 @@ export class OrganiserNotice {
       settings.period === 'daily_9am' &&
       !this.now.isBetween(
         this.now.clone().set({ hour: 9, minute: 0, second: 0 }),
-        this.now.clone().set({ hour: 9, minute: 9, second: 59 })
+        this.now.clone().set({ hour: 9, minute: 4, second: 59 })
       )
     ) {
       return;
@@ -48,7 +48,7 @@ export class OrganiserNotice {
       settings.period === 'daily_11am' &&
       !this.now.isBetween(
         this.now.clone().set({ hour: 11, minute: 0, second: 0 }),
-        this.now.clone().set({ hour: 11, minute: 9, second: 59 })
+        this.now.clone().set({ hour: 11, minute: 4, second: 59 })
       )
     ) {
       return;
@@ -57,7 +57,7 @@ export class OrganiserNotice {
       settings.period === 'daily_3pm' &&
       !this.now.isBetween(
         this.now.clone().set({ hour: 15, minute: 0, second: 0 }),
-        this.now.clone().set({ hour: 15, minute: 9, second: 59 })
+        this.now.clone().set({ hour: 15, minute: 4, second: 59 })
       )
     ) {
       return;
@@ -66,7 +66,7 @@ export class OrganiserNotice {
       settings.period === 'daily_5pm' &&
       !this.now.isBetween(
         this.now.clone().set({ hour: 17, minute: 0, second: 0 }),
-        this.now.clone().set({ hour: 17, minute: 9, second: 59 })
+        this.now.clone().set({ hour: 17, minute: 4, second: 59 })
       )
     ) {
       return;
@@ -76,7 +76,7 @@ export class OrganiserNotice {
       (this.now.format('dd') !== 'Mo' ||
         !this.now.isBetween(
           this.now.clone().set({ hour: 9, minute: 0, second: 0 }),
-          this.now.clone().set({ hour: 9, minute: 9, second: 59 })
+          this.now.clone().set({ hour: 9, minute: 4, second: 59 })
         ))
     ) {
       return;
@@ -86,7 +86,7 @@ export class OrganiserNotice {
       (this.now.format('dd') !== 'Mo' ||
         !this.now.isBetween(
           this.now.clone().set({ hour: 17, minute: 0, second: 0 }),
-          this.now.clone().set({ hour: 17, minute: 9, second: 59 })
+          this.now.clone().set({ hour: 17, minute: 4, second: 59 })
         ))
     ) {
       return;
@@ -96,7 +96,7 @@ export class OrganiserNotice {
       (this.now.format('dd') !== 'Fr' ||
         !this.now.isBetween(
           this.now.clone().set({ hour: 9, minute: 0, second: 0 }),
-          this.now.clone().set({ hour: 9, minute: 9, second: 59 })
+          this.now.clone().set({ hour: 9, minute: 4, second: 59 })
         ))
     ) {
       return;
@@ -106,7 +106,7 @@ export class OrganiserNotice {
       (this.now.format('dd') !== 'Fr' ||
         !this.now.isBetween(
           this.now.clone().set({ hour: 17, minute: 0, second: 0 }),
-          this.now.clone().set({ hour: 17, minute: 9, second: 59 })
+          this.now.clone().set({ hour: 17, minute: 4, second: 59 })
         ))
     ) {
       return;