Merge branch 'louislam:master' into smtp-subject

server/model/monitor.js

@@ -12,6 +12,7 @@ const { R } = require("redbean-node");
 const { BeanModel } = require("redbean-node/dist/bean-model");
 const { Notification } = require("../notification");
 const version = require("../../package.json").version;
+const apicache = require("../modules/apicache");
 
 /**
  * status:
@@ -333,6 +334,9 @@ class Monitor extends BeanModel {
                             console.log(e);
                         }
                     }
+
+                    // Clear Status Page Cache
+                    apicache.clear();
                 }
 
             } else {

server/server.js

@@ -1041,6 +1041,10 @@ exports.entryPage = "dashboard";
                                 notificationIDList: {},
                             };
 
+                            if (monitorListData[i].pushToken) {
+                                monitor.pushToken = monitorListData[i].pushToken;
+                            }
+
                             let bean = R.dispense("monitor");
 
                             let notificationIDList = monitor.notificationIDList;