Refactor rustplus time

Author: alexemanuelol

src/handlers/rustPlusInfoHandler.ts

@@ -75,10 +75,10 @@ export async function handler(rpInstance: RustPlusInstance, info: rp.AppInfo) {
     }
 
     if (rpInfo.isPlayersChanged(info)) {
-        log.info(`${fn} players changed, ` +
-            `old: ${rpInfo?.appInfo.players}, ` +
-            `new: ${info.players}`,
-            logParam);
+        //log.info(`${fn} players changed, ` +
+        //    `old: ${rpInfo?.appInfo.players}, ` +
+        //    `new: ${info.players}`,
+        //    logParam);
     }
 
     if (rpInfo.isMaxPlayersChanged(info)) {
@@ -89,10 +89,10 @@ export async function handler(rpInstance: RustPlusInstance, info: rp.AppInfo) {
     }
 
     if (rpInfo.isQueuedPlayersChanged(info)) {
-        log.info(`${fn} queuedPlayers changed, ` +
-            `old: ${rpInfo?.appInfo.queuedPlayers}, ` +
-            `new: ${info.queuedPlayers}`,
-            logParam);
+        //log.info(`${fn} queuedPlayers changed, ` +
+        //    `old: ${rpInfo?.appInfo.queuedPlayers}, ` +
+        //    `new: ${info.queuedPlayers}`,
+        //    logParam);
     }
 
     if (rpInfo.isSeedChanged(info)) {

src/handlers/rustPlusTimeHandler.ts

@@ -28,41 +28,41 @@ export async function handler(rpInstance: RustPlusInstance, time: rp.AppTime) {
     const fn = '[rustPlusTimeHandler: handler]';
     const logParam = {
         guildId: rpInstance.guildId,
-        serverId: rpInstance.serverId,
-        serverName: rpInstance.serverName
+        serverId: rpInstance.serverId
     };
+    const rpTime = rpInstance.rpTime as RustPlusTime;
 
-    if ((rpInstance.rpTime as RustPlusTime).isDayLengthMinutesChanged(time)) {
+    if (rpTime.isDayLengthMinutesChanged(time)) {
         log.info(`${fn} dayLengthMinutes changed, ` +
-            `old: ${rpInstance.rpTime?.appTime.dayLengthMinutes}, ` +
+            `old: ${rpTime?.appTime.dayLengthMinutes}, ` +
             `new: ${time.dayLengthMinutes}`,
             logParam);
     }
 
-    if ((rpInstance.rpTime as RustPlusTime).isTimeScaleChanged(time)) {
+    if (rpTime.isTimeScaleChanged(time)) {
         log.info(`${fn} timeScale changed, ` +
-            `old: ${rpInstance.rpTime?.appTime.timeScale}, ` +
+            `old: ${rpTime?.appTime.timeScale}, ` +
             `new: ${time.timeScale}`,
             logParam);
     }
 
-    if ((rpInstance.rpTime as RustPlusTime).isSunriseChanged(time)) {
+    if (rpTime.isSunriseChanged(time)) {
         log.info(`${fn} sunrise changed, ` +
-            `old: ${rpInstance.rpTime?.appTime.sunrise}, ` +
+            `old: ${rpTime?.appTime.sunrise}, ` +
             `new: ${time.sunrise}`,
             logParam);
     }
 
-    if ((rpInstance.rpTime as RustPlusTime).isSunsetChanged(time)) {
+    if (rpTime.isSunsetChanged(time)) {
         log.info(`${fn} sunset changed, ` +
-            `old: ${rpInstance.rpTime?.appTime.sunset}, ` +
+            `old: ${rpTime?.appTime.sunset}, ` +
             `new: ${time.sunset}`,
             logParam);
     }
 
-    if ((rpInstance.rpTime as RustPlusTime).isTimeChanged(time)) {
+    if (rpTime.isTimeChanged(time)) {
         //log.info(`${fn} time changed, ` +
-        //    `old: ${rpInstance.rpTime?.appTime.time}, ` +
+        //    `old: ${rpTime?.appTime.time}, ` +
         //    `new: ${time.time}`,
         //    logParam);
     }
@@ -71,11 +71,11 @@ export async function handler(rpInstance: RustPlusInstance, time: rp.AppTime) {
      * Custom handlers
      */
 
-    if ((rpInstance.rpTime as RustPlusTime).isTurnedDay(time)) {
+    if (rpTime.isTurnedDay(time)) {
         log.info(`${fn} Just turned day.`, logParam);
     }
 
-    if ((rpInstance.rpTime as RustPlusTime).isTurnedNight(time)) {
+    if (rpTime.isTurnedNight(time)) {
         log.info(`${fn} Just turned night.`, logParam);
     }
 }

src/structures/rustPlusTime.ts

@@ -87,6 +87,10 @@ export class RustPlusTime {
         return this.appTime.time !== appTime.time;
     }
 
+    /**
+     * Other methods
+     */
+
     public isTurnedDay(appTime: rp.AppTime): boolean {
         return this.isNight() && appTime.time >= appTime.sunrise && appTime.time < appTime.sunset;
     }
@@ -111,13 +115,13 @@ export class RustPlusTime {
         let isDay = this.isDay();
 
         /* Can't calculate time till sunrise or sunset, so use the default time table */
-        if ((this.isDay() && (this.latestSunrise === null || server.dayDurationSeconds === null)) ||
-            this.isNight() && (this.latestSunset === null || server.nightDurationSeconds === null)) {
+        if ((isDay && (this.latestSunrise === null || server.dayDurationSeconds === null)) ||
+            !isDay && (this.latestSunset === null || server.nightDurationSeconds === null)) {
             const closestTimeKey = getClosestTimeKey(this.appTime.time);
             seconds = timeTable[closestTimeKey];
             isDay = (this.appTime.time >= sunrise) && (this.appTime.time < sunset)
         }
-        else if (this.isDay()) {
+        else if (isDay) {
             const currentTimeSeconds = (new Date()).getTime() / 1000;
             const latestSunriseSeconds = (this.latestSunrise as Date).getTime() / 1000;
             seconds = (server.dayDurationSeconds as number) - (currentTimeSeconds - latestSunriseSeconds);
@@ -135,8 +139,7 @@ export class RustPlusTime {
         const fn = '[RustPlusTime: updateVariables]';
         const logParam = {
             guildId: this.rpInstance.guildId,
-            serverId: this.rpInstance.serverId,
-            serverName: this.rpInstance.serverName
+            serverId: this.rpInstance.serverId
         };
 
         const gInstance = gim.getGuildInstance(this.rpInstance.guildId) as GuildInstance;