Compare commits
4 Commits
36f44f4b41
...
8538fced37
Author | SHA1 | Date | |
---|---|---|---|
8538fced37 | |||
d268f52237 | |||
4f576f9b5d | |||
d8d75c01e8 |
@ -10,7 +10,7 @@ Silvanus is not affiliated with Grow A Tree or Limbo Labs.
|
||||
[Join Discord Server](https://discord.gg/g5JRGn7PxU)
|
||||
|
||||
## Silvanus Support Wiki
|
||||
Find the most up-to-date guides and information about Silvanus at the [Silvanus Support Wiki](https://silvanus.vfsh.dev/).
|
||||
[Silvanus Setup Guide](https://silvanus.vfsh.dev/en/setup)
|
||||
Find the most up-to-date guides and information about Silvanus at the [Silvanus Wiki](https://git.vfsh.dev/voidf1sh/silvanus/wiki).
|
||||
[Silvanus Setup Guide](https://git.vfsh.dev/voidf1sh/silvanus/wiki/Silvanus-Setup-Guide)
|
||||
|
||||
Please find the most up-to-date guides and information at the Silvanus Support Discord Server!
|
||||
Please find the most up-to-date guides and information at the [Silvanus Support Discord Server](https://discord.gg/g5JRGn7PxU)!
|
10
main.js
10
main.js
@ -69,7 +69,7 @@ client.on('interactionCreate', async interaction => {
|
||||
if (client.slashCommands.has(commandName)) {
|
||||
client.slashCommands.get(commandName).execute(interaction);
|
||||
} else {
|
||||
interaction.reply('Sorry, I don\'t have access to that command.');
|
||||
interaction.reply('Sorry, I don\'t have access to that command.').catch(e => console.err(e));
|
||||
console.error('Slash command attempted to run but not found: ' + commandName);
|
||||
}
|
||||
}
|
||||
@ -79,7 +79,7 @@ client.on('interactionCreate', async interaction => {
|
||||
case 'refresh':
|
||||
// console.log(JSON.stringify(interaction));
|
||||
await fn.refresh(interaction).catch(err => {
|
||||
interaction.channel.send(fn.builders.errorEmbed("Oops! Something went wrong!"));
|
||||
interaction.channel.send(fn.builders.errorEmbed("Oops! Something went wrong!")).catch(e => console.err(e));
|
||||
});
|
||||
break;
|
||||
case 'deleteping':
|
||||
@ -103,10 +103,10 @@ client.on('interactionCreate', async interaction => {
|
||||
}
|
||||
} catch(err) {
|
||||
if (err === "Guild doesn't exist in database!") {
|
||||
interaction.channel.send(fn.builders.errorEmbed(strings.error.noGuild));
|
||||
interaction.channel.send(fn.builders.errorEmbed(strings.error.noGuild)).catch(e => console.err(e));
|
||||
console.error(err);
|
||||
} else {
|
||||
interaction.channel.send("Oops! An error occurred... Sorry about that, please contact my owner @vfsh if this keeps happening.");
|
||||
interaction.channel.send("Oops! An error occurred... Sorry about that, please contact my owner @vfsh if this keeps happening.").catch(e => console.err(e));
|
||||
console.error(err);
|
||||
}
|
||||
}
|
||||
@ -117,7 +117,7 @@ client.on('messageUpdate', async (oldMessage, message) => {
|
||||
await fn.messages.updateHandler(message).catch(async e => {
|
||||
switch (e) {
|
||||
case strings.error.noCompareMessage:
|
||||
await message.channel.send(strings.error.noCompareMessage);
|
||||
await message.channel.send(strings.error.noCompareMessage).catch(e => console.err(e));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -615,11 +615,16 @@ const functions = {
|
||||
const indices = [description.indexOf("Your tree is ") + 13, description.indexOf("ft")];
|
||||
const treeHeightStr = description.slice(indices[0], indices[1]);
|
||||
const treeHeightFloat = parseFloat(treeHeightStr).toFixed(1);
|
||||
// Grab the tree's water timestamp
|
||||
const waterTimestampStr = description.match(/<t:[0-9]+:R>/g)[0];
|
||||
const waterTimestamp = waterTimestampStr.match(/[0-9]+/g);
|
||||
if (isDev) console.log(`Water Timestamp: ${waterTimestamp}`);
|
||||
|
||||
// Return the info gathered
|
||||
return {
|
||||
treeName: treeName,
|
||||
treeHeight: treeHeightFloat
|
||||
treeHeight: treeHeightFloat,
|
||||
waterTimestamp: waterTimestamp
|
||||
};
|
||||
} else {
|
||||
return false;
|
||||
@ -696,6 +701,7 @@ const functions = {
|
||||
}
|
||||
},
|
||||
async updateHandler(message) {
|
||||
// If we don't have the entire message yet, fetch it
|
||||
if (message.partial) {
|
||||
message = await message.fetch().catch(e => {
|
||||
throw e;
|
||||
@ -706,7 +712,7 @@ const functions = {
|
||||
// Check and store the message types
|
||||
const isLeaderboard = this.isLeaderboard(message);
|
||||
const isTree = this.isTree(message);
|
||||
// Check if the message is a leaderboard
|
||||
// Check if the message is a leaderboard and handle the update
|
||||
if (isLeaderboard) {
|
||||
if (isDev) console.log(`LU: ${message.guild.name}`);
|
||||
let guildInfo;
|
||||
@ -762,26 +768,35 @@ const functions = {
|
||||
const comparedRankings = await functions.rankings.compare(guildInfo);
|
||||
const embed = functions.builders.comparisonEmbed(comparedRankings, guildInfo);
|
||||
await compareMessage.edit(embed).catch(e => console.error(e));
|
||||
} else if (isTree) {
|
||||
// Check if the message is a tree
|
||||
// if (isDev) console.log(`TU: ${isTree.treeName}: ${isTree.treeHeight}ft`);
|
||||
} else if (isTree) { // Check if the message is a tree
|
||||
if (isDev) console.log(`TU: ${isTree.treeName}: ${isTree.treeHeight}ft`);
|
||||
let guildInfo;
|
||||
// Default to not updating the database
|
||||
let doDbUpdate = false;
|
||||
// Check if the bot has the guildInfo for this Guild already
|
||||
if (message.client.guildInfos.has(message.guildId)) {
|
||||
guildInfo = message.client.guildInfos.get(message.guildId);
|
||||
// If the name or height has changed, update the guildInfo and flag to run a database update
|
||||
if ((guildInfo.treeName != isTree.treeName) || (guildInfo.treeHeight != isTree.treeHeight)) {
|
||||
guildInfo.setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id);
|
||||
doDbUpdate = true;
|
||||
}
|
||||
} else {
|
||||
// If the waterTimestamp has changed, update the database
|
||||
// TODO... lost motivation
|
||||
} else { // If the bot doesn't have a guildInfo for the Guild, we will create one for it and flag a database update
|
||||
guildInfo = new GuildInfo().setIds(message.guildId, message.guild.ownerId)
|
||||
.setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id);
|
||||
doDbUpdate = true;
|
||||
}
|
||||
// If the database update flag is set, update the database and rebuild the guildInfo collection
|
||||
// TODO: This should likely only update the relevant guildInfo in the future.
|
||||
// Actually, rebuilding the collection should be unnecessary, since it's already been updated.
|
||||
if (doDbUpdate) {
|
||||
const query = guildInfo.queryBuilder("setTreeInfo");
|
||||
await dbfn.setGuildInfo(query);
|
||||
await functions.collectionBuilders.guildInfos(message.client);
|
||||
// I've commented this out to see if it breaks anything.
|
||||
// Rebuilding shouldn't be necessary and is a waste of resources.
|
||||
// await functions.collectionBuilders.guildInfos(message.client);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
10
package.json
10
package.json
@ -1,21 +1,21 @@
|
||||
{
|
||||
"name": "silvanus",
|
||||
"version": "1.2.8",
|
||||
"description": "Grow A Tree Companion Bot",
|
||||
"version": "1.3.0",
|
||||
"description": "The ultimate Grow A Tree companion bot!",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/voidf1sh/silvanus.git"
|
||||
"url": "git+https://git.vfsh.dev/voidf1sh/silvanus.git"
|
||||
},
|
||||
"author": "Skylar Grant",
|
||||
"license": "ISC",
|
||||
"bugs": {
|
||||
"url": "https://github.com/voidf1sh/silvanus/issues"
|
||||
"url": "https://git.vfsh.dev/voidf1sh/silvanus/issues"
|
||||
},
|
||||
"homepage": "https://github.com/voidf1sh/silvanus#readme",
|
||||
"homepage": "https://git.vfsh.dev/voidf1sh/silvanus#readme",
|
||||
"dependencies": {
|
||||
"axios": "^1.4.0",
|
||||
"discord.js": "^14.11.0",
|
||||
|
Loading…
Reference in New Issue
Block a user