fix(#245): sponsorship message timing

Author: marisademeglio

src/renderer/components/NewJobPane/index.tsx

@@ -18,17 +18,20 @@ import {
 import { externalLinkClick } from 'renderer/utils'
 
 const { App } = window
+// import {}
 import {
     defaultSponsorshipMessage,
     updateSponsorshipMessage,
 } from '../../utils'
 
 // is datestring more than 2 weeks old
-let isExpired = (datestring) => {
-    if (datestring == '') return true
+// datestring is milliseconds (string)
+let isExpired = (dateInMs: number) => {
+    if (dateInMs == 0) return true
 
     const TWOWEEKS_MS = 1209600000
-    let date = new Date(datestring)
+    // const TWOWEEKS_MS = 500 // for testing
+    let date = new Date(dateInMs)
     let now = Date.now()
     if (now - date.getMilliseconds() > TWOWEEKS_MS) {
         return true
@@ -44,19 +47,17 @@ export function NewJobPane({ job }: { job: Job }) {
         isExpired(settings.sponsorshipMessageLastShown)
     )
 
-    // useMemo should only run once per render
+    // useMemo runs once per render (unlike useEffect)
     useMemo(() => {
         const fetchData = async () => {
             let updatedSponsorshipMessage = await updateSponsorshipMessage()
             setSponsorshipMessage({ ...updatedSponsorshipMessage })
         }
-        fetchData().catch()
         if (isExpired(settings.sponsorshipMessageLastShown)) {
+            fetchData().catch()
             setShowSponsorshipMessage(true)
             // update settings with a new date
-            App.store.dispatch(
-                setSponsorshipMessageLastShown(Date.now().toString())
-            )
+            App.store.dispatch(setSponsorshipMessageLastShown(Date.now()))
             App.store.dispatch(save())
         }
     }, [])

src/renderer/utils/sponsorship.ts

@@ -9,17 +9,18 @@ let defaultSponsorshipMessage = {
 
 async function updateSponsorshipMessage() {
     // fetch the latest sponsorship message
-    try {
-        let sponsorshipData = await fetch(
-            'https://dl.daisy.org/tools/sponsorship.json'
-        )
-        if (sponsorshipData) {
-            return sponsorshipData['PipelineApp']['en']
-        } else {
-            return defaultSponsorshipMessage
-        }
-    } catch (err) {
-        return defaultSponsorshipMessage
-    }
+    // try {
+    //     let sponsorshipData = await window.fetch(
+    //         'https://dl.daisy.org/tools/sponsorship.json'
+    //     )
+    //     if (sponsorshipData) {
+    //         return sponsorshipData['PipelineApp']['en']
+    //     } else {
+    //         return defaultSponsorshipMessage
+    //     }
+    // } catch (err) {
+    //     return defaultSponsorshipMessage
+    // }
+    return defaultSponsorshipMessage
 }
 export { defaultSponsorshipMessage, updateSponsorshipMessage }

src/shared/data/slices/settings.ts

@@ -101,7 +101,7 @@ export const settings = createSlice({
         },
         setSponsorshipMessageLastShown: (
             state: ApplicationSettings,
-            action: PayloadAction<string>
+            action: PayloadAction<number>
         ) => {
             state.sponsorshipMessageLastShown = action.payload
         },

src/shared/types/settings.ts

@@ -37,7 +37,7 @@ export type ApplicationSettings = {
     // tts preferred voices
     ttsConfig?: TtsConfig
     autoCheckUpdate?: boolean
-    sponsorshipMessageLastShown?: string
+    sponsorshipMessageLastShown?: number
 }
 
 export function migrateSettings(
@@ -81,7 +81,7 @@ const migrators: Map<string, (prev: any) => any> = new Map<
         (prev: _ApplicationSettings_v140): ApplicationSettings => {
             const { settingsVersion, ...toKeep } = prev
             return {
-                sponsorshipMessageLastShown: '',
+                sponsorshipMessageLastShown: 0,
                 ...toKeep,
             } as ApplicationSettings
         },