Merge 6f9a5c65cc into ab7e3c301c

app/assets/js/scripts/landing.js

@@ -2,6 +2,8 @@
  * Script for landing.ejs
  */
 // Requirements
+const cp                      = require('child_process')
+const crypto                  = require('crypto')
 const { URL }                 = require('url')
 const { join }                = require('path')
 const {
@@ -826,16 +828,6 @@ function showNewsAlert(){
     $(newsButtonAlert).fadeIn(250)
 }
 
-async function digestMessage(str) {
-    const msgUint8 = new TextEncoder().encode(str)
-    const hashBuffer = await crypto.subtle.digest('SHA-1', msgUint8)
-    const hashArray = Array.from(new Uint8Array(hashBuffer))
-    const hashHex = hashArray
-        .map((b) => b.toString(16).padStart(2, '0'))
-        .join('')
-    return hashHex
-}
-
 /**
  * Initialize News UI. This will load the news and prepare
  * the UI accordingly.
@@ -843,11 +835,13 @@ async function digestMessage(str) {
  * @returns {Promise.<void>} A promise which resolves when the news
  * content has finished loading and transitioning.
  */
-async function initNews(){
+function initNews(){
 
+    return new Promise((resolve, reject) => {
         setNewsLoading(true)
 
-    const news = await loadNews()
+        let news = {}
+        loadNews().then(news => {
 
             newsArr = news?.articles || null
 
@@ -855,9 +849,11 @@ async function initNews(){
                 // News Loading Failed
                 setNewsLoading(false)
 
-        await $('#newsErrorLoading').fadeOut(250).promise()
-        await $('#newsErrorFailed').fadeIn(250).promise()
-
+                $('#newsErrorLoading').fadeOut(250, () => {
+                    $('#newsErrorFailed').fadeIn(250, () => {
+                        resolve()
+                    })
+                })
             } else if(newsArr.length === 0) {
                 // No News Articles
                 setNewsLoading(false)
@@ -869,15 +865,18 @@ async function initNews(){
                 })
                 ConfigManager.save()
 
-        await $('#newsErrorLoading').fadeOut(250).promise()
-        await $('#newsErrorNone').fadeIn(250).promise()
+                $('#newsErrorLoading').fadeOut(250, () => {
+                    $('#newsErrorNone').fadeIn(250, () => {
+                        resolve()
+                    })
+                })
             } else {
                 // Success
                 setNewsLoading(false)
 
                 const lN = newsArr[0]
                 const cached = ConfigManager.getNewsCache()
-        let newHash = await digestMessage(lN.content)
+                let newHash = crypto.createHash('sha1').update(lN.content).digest('hex')
                 let newDate = new Date(lN.date)
                 let isNew = false
 
@@ -924,12 +923,18 @@ async function initNews(){
 
                 document.getElementById('newsNavigateRight').onclick = () => { switchHandler(true) }
                 document.getElementById('newsNavigateLeft').onclick = () => { switchHandler(false) }
-        await $('#newsErrorContainer').fadeOut(250).promise()
+
+                $('#newsErrorContainer').fadeOut(250, () => {
                     displayArticle(newsArr[0], 1)
-        await $('#newsContent').fadeIn(250).promise()
+                    $('#newsContent').fadeIn(250, () => {
+                        resolve()
+                    })
+                })
             }
 
+        })
         
+    })
 }
 
 /**