oreolek/discord-bot-rss-feed
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prevent checking of feeds for guilds the bot is no longer in

Browse source 
Plus fix a couple related issues
This commit is contained in:
benji7425 2017-10-02 00:52:36 +01:00
parent ef5f455d4d
commit fd650dd981
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/index.js
View file

@ -10,14 +10,14 @@ const token = require("../" + process.argv[2]).token,
const client = new Core.Client(token, dataFile, __dirname + "/commands", GuildData); const client = new Core.Client(token, dataFile, __dirname + "/commands", GuildData);
client.on("beforeLogin", () => { client.on("beforeLogin", () => {
setInterval(() => checkFeedsInGuilds(client.guildsData), Config.feedCheckIntervalSec * 1000); setInterval(() => checkFeedsInGuilds(), Config.feedCheckIntervalSec * 1000);
}); });
client.on("ready", () => { client.on("ready", () => {
doUpgradeJSON(); doUpgradeJSON();
parseLinksInGuilds(client.guilds, client.guildsData) parseLinksInGuilds()
.then(() => checkFeedsInGuilds(client.guildsData)); .then(() => checkFeedsInGuilds());
client.on("message", message => { client.on("message", message => {
const guildData = client.guildsData[message.guild.id]; const guildData = client.guildsData[message.guild.id];
@ -32,16 +32,20 @@ client.on("ready", () => {
client.bootstrap(); client.bootstrap();
//INTERNAL FUNCTIONS// //INTERNAL FUNCTIONS//
function checkFeedsInGuilds(guildsData) { function checkFeedsInGuilds() {
Object.keys(guildsData).forEach(key => guildsData[key].checkFeeds(client.guilds)); client.guilds.forEach(guild => {
const guildData = client.guildsData[guild.id];
if (guildData)
guildData.checkFeeds(guild);
});
} }
function parseLinksInGuilds(guilds, guildsData) { function parseLinksInGuilds() {
const promises = []; const promises = [];
for (let guildId of guilds.keys()) { for (let guildId of client.guilds.keys()) {
const guildData = guildsData[guildId]; const guildData = client.guildsData[guildId];
if (guildData) if (guildData)
promises.push(guildData.cachePastPostedLinks(guilds.get(guildId))); promises.push(guildData.cachePastPostedLinks(client.guilds.get(guildId)));
} }
return Promise.all(promises); return Promise.all(promises);
} }
@ -60,7 +64,7 @@ function doUpgradeJSON() {
if (feed.channelName) { if (feed.channelName) {
feed.channelID = client.guilds.get(id).channels.find(x => x.name.toLowerCase() === feed.channelName.toLowerCase()).id; feed.channelID = client.guilds.get(id).channels.find(x => x.name.toLowerCase() === feed.channelName.toLowerCase()).id;
delete feed.channelID; delete feed.channelName;
} }
}); });
}); });

4
app/models/guild-data.js
View file

@ -21,7 +21,7 @@ module.exports = class GuildData extends Core.BaseGuildData {
return Promise.all(promises); return Promise.all(promises);
} }
checkFeeds(guilds) { checkFeeds(guild) {
this.feeds.forEach(feed => feed.fetchLatest(guilds.get(this.id))); this.feeds.forEach(feed => feed.fetchLatest(guild));
} }
}; };