Skip to content

Commit ac963e3

Browse files
committed
Ahora fetcheamos la data de servidores de la api que esta en heroku
1 parent 6a0f42a commit ac963e3

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

controllers/discord.js

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const moment = require('moment');
44
const Discord = require('discord.js');
55
const { getOnlineUsersQuantityInServer } = require('../utils/server-configuration');
66
const zl = require("zip-lib");
7-
7+
const fetch = require('node-fetch');
8+
89
function randomIntFromInterval(min, max) { // min and max included
910
return Math.floor(Math.random() * (max - min + 1) + min);
1011
}
@@ -98,20 +99,25 @@ clientDiscord.on('message', message => {
9899

99100
var dateNow = new Date();
100101

101-
102-
global.serversOnlineQuantityUsers.forEach(server => {
103-
const dateMoment = new Date(server.dateTime);
104-
105-
var diff = Math.abs(dateMoment.getTime() - dateNow.getTime()) / 3600000;
106-
if (diff <= 2) {
107-
embed.addField(`${server.serverName} | ${server.ipAndPort} `, `Online: ${server.quantityUsers} - Actualizado ${moment(server.dateTime).format("DD-MM hh:mm a")}.`, true);
108-
embed.addField('\u200B', '\u200B')
109-
} else {
110-
delete server
111-
}
112-
})
113-
114-
message.reply(embed)
102+
fetch('http://api.argentumonline.org/api/v1/servers/getOnlineUsersFromAllServers')
103+
.then(res => res.json())
104+
.then(data => {
105+
data.forEach(server => {
106+
107+
var now = new Date();
108+
var serverLastUpdate = new Date(server.dateTime);
109+
var diffMs = (serverLastUpdate - now); // milliseconds between now & Christmas
110+
var diffMins = Math.round(((diffMs % 86400000) % 3600000) / 60000); // minutes
111+
if (diffMins <= 2) {
112+
embed.addField(`${server.serverName} | ${server.ipAndPort} `, `Online: ${server.quantityUsers} - Actualizado ${moment(server.dateTime).format("DD-MM hh:mm a")}.`, true);
113+
embed.addField('\u200B', '\u200B')
114+
} else {
115+
delete server
116+
}
117+
})
118+
119+
message.reply(embed)
120+
});
115121
}
116122

117123
if (message.content === '/comics') {

controllers/servers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ app.post("/sendUsersOnline", function (req, res) {
1616
});
1717

1818
app.get("/getOnlineUsersFromAllServers", function (req, res) {
19-
return res.status(200).json(global.serversOnlineQuantityUsers);
19+
return res.status(200).json({serversInfo: global.serversOnlineQuantityUsers});
2020
});
2121

2222
module.exports = app;

0 commit comments

Comments
 (0)