Merge pull request #133 from oof2win2/bugfix/general-fixes

General fixes

Author: DistroByte

src/base/GrafanaHandler.ts

@@ -183,6 +183,7 @@ class GrafanaHandler {
    * @param {*} server
    */
   handleStatistics(statistics, server) {
+		if (!statistics || typeof statistics !== "string") return
     const json = JSON.parse(statistics.split("\n")[0]);
     const otherStats = json[Object.keys(json)[0]].other;
 

src/commands/Administration/getlogs.ts

@@ -22,7 +22,7 @@ const Rollback: Command<Message> = {
 		if (!message.mentions.channels.first())
 			return message.reply("No channel to get logs of provided!");
 		args.shift(); // remove mention
-		const lineCount = Math.min(Number(args.shift()) || 50, 50)
+		const lineCount = Math.min(Number(args.shift()) || 50, 200)
 		const server = serverJS.find(
 			(server) => server.discordid === message.mentions.channels.first().id
 		);

src/commands/Administration/resetserver.ts

@@ -101,7 +101,7 @@ const Resetserver: Command<Message> = {
       .map(
         (save) => `${client.config.serverpath}/${server.path}/saves/${save}`
       );
-    const latestSavePath = saves[0];
+    const latestSavePath = sortModifiedDate(saves)[0].path;
     // if there are saves, back up latest and remove all after
     if (latestSavePath) {
       const latestSave = latestSavePath.slice(

src/commands/Administration/rollback.ts

@@ -58,10 +58,10 @@ const Rollback: Command<Message> = {
         };
       });
 
-      createPagedEmbed(content, message, null, embed);
+      createPagedEmbed(content, message, undefined, embed);
     } else {
       // specific save provided
-      let save;
+      let save: fs.Stats;
       try {
         save = fs.statSync(
           `${client.config.serverpath}/${server.path}/saves/${args[1]}.zip`
@@ -73,7 +73,7 @@ const Rollback: Command<Message> = {
         message,
         `Are you sure you want to reset the save to \`${
           args[1]
-        }\` from ${new Date(save.mtime).toISOString()}?`
+        }\` from <t:${Math.round(save.mtime.valueOf() / 1000)}>?`
       );
       if (!confirm) return message.channel.send("Rollback cancelled");