Fixed file encoding issue & statistics command when guild has empty statistics

This commit is contained in:
Christer Warén 2020-03-31 10:23:46 +03:00
parent 3da41e44cb
commit 20d5d8b3bd
2 changed files with 17 additions and 15 deletions

View File

@ -7,24 +7,26 @@ module.exports = {
category: 'info', category: 'info',
execute(msg, args, client, Discord, command) { execute(msg, args, client, Discord, command) {
let stations = client.stations; let stations = client.stations;
let currentGuildStatistics = client.datastore.getEntry(msg.guild.id).statistics; let currentGuild = client.datastore.getEntry(msg.guild.id);
let statistics; let statistics;
let i = 0; let i = 0;
if(currentGuild.statistics){
Object.keys(client.stations).forEach(function(station) { Object.keys(client.stations).forEach(function(station) {
if(currentGuildStatistics[stations[station].name]){ if(currentGuild.statistics[stations[station].name]){
if(i > 0){ if(i > 0){
statistics += "**" + station + " " + stations[station].name + "** \n"; statistics += "**" + station + " " + stations[station].name + "** \n";
statistics += "Time: " + msToTime(currentGuildStatistics[stations[station].name].time, "hh:mm:ss") + "\n"; statistics += "Time: " + msToTime(currentGuild.statistics[stations[station].name].time, "hh:mm:ss") + "\n";
statistics += "Used: " + currentGuildStatistics[stations[station].name].used + "\n"; statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
} else { } else {
statistics = "**" + station + " " + stations[station].name + "** \n"; statistics = "**" + station + " " + stations[station].name + "** \n";
statistics += "Time: " + msToTime(currentGuildStatistics[stations[station].name].time, "hh:mm:ss") + "\n"; statistics += "Time: " + msToTime(currentGuild.statistics[stations[station].name].time, "hh:mm:ss") + "\n";
statistics += "Used: " + currentGuildStatistics[stations[station].name].used + "\n"; statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
} }
i++; i++;
} }
}); });
}
if(!statistics){ if(!statistics){
statistics = "You have not listened any radio station"; statistics = "You have not listened any radio station";

View File

@ -76,7 +76,7 @@ module.exports = class {
saveEntry(file, data) { saveEntry(file, data) {
data = JSON.stringify(data, null, 4); data = JSON.stringify(data, null, 4);
fs.writeFile(path.join(path.dirname(__dirname), 'datastore') + "/" + file + ".json", data, function(err) { fs.writeFile(path.join(path.dirname(__dirname), 'datastore') + "/" + file + ".json", data, 'utf8', function(err) {
if (err) { if (err) {
//console.log(err); //console.log(err);
} }