voidf1sh/silvanus
voidf1sh/silvanus
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: v1.3.0-waittime #7

Draft
voidf1sh wants to merge 6 commits from v1.3.0-waittime into main
pull from: v1.3.0-waittime
merge into: voidf1sh:main
Conversation 0 Commits 6 Files Changed 6 +48 -30
6 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.dockerignore
View File

@ -1,5 +1,3 @@
node_modules node_modules
npm-debug.log npm-debug.log
env.dev .env*
env.prod
.env

6
README.md
View File

@ -10,7 +10,7 @@ Silvanus is not affiliated with Grow A Tree or Limbo Labs.
[Join Discord Server](https://discord.gg/g5JRGn7PxU) [Join Discord Server](https://discord.gg/g5JRGn7PxU)
## Silvanus Support Wiki ## Silvanus Support Wiki
Find the most up-to-date guides and information about Silvanus at the [Silvanus Support Wiki](https://silvanus.vfsh.dev/). 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://silvanus.vfsh.dev/en/setup) [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)!

6
data/strings.json
View File

@ -5,10 +5,12 @@
"help": { "help": {
"title": "Silvanus Help", "title": "Silvanus Help",
"aboutTitle": "About Silvanus", "aboutTitle": "About Silvanus",
"info": "Silvanus is the ultimate companion bot designed for Grow A Tree, the popular Discord clicker game. With Silvanus by your side, you can take your tree-growing adventure to new heights! Enjoy customizable notifications, effortless tree height comparisons, and handy math features to optimize your gameplay.\n\n[Privacy Policy](https://assets.vfsh.dev/privacy.txt)", "aboutDescription": "Silvanus is a dedicated companion bot designed for Grow A Tree, the popular Discord clicker game. With Silvanus by your side, you can take your tree-growing adventure to new heights! Enjoy customizable notifications, effortless tree height comparisons, and handy math features to optimize your gameplay. Join over 130 servers already benefiting from Silvanus and make your Grow A Tree experience even more exciting!",
"aboutLinks": "**Links**\n* [Website](https://silvanus.vfsh.dev)\n* [Wiki](https://git.vfsh.dev/voidf1sh/silvanus/wiki)\n* [Git Repo](https://git.vfsh.dev/voidf1sh/silvanus)\n* [Support Server](https://discord.gg/g5JRGn7PxU)\n* [Top.gg](https://top.gg/bot/521624335119810561)\n* [Privacy Policy](https://assets.vfsh.dev/privacy.txt)\n* [Terms of Use](https://www.termsfeed.com/live/5e192b88-ece7-4ba3-8b50-7a1f997d781a)",
"info": "Silvanus is the ultimate companion bot designed for Grow A Tree, the popular Discord clicker game. With Silvanus by your side, you can take your tree-growing adventure to new heights! Enjoy customizable notifications, effortless tree height comparisons, and handy math features to optimize your gameplay.",
"topggTitle": "Want to support Silvanus?", "topggTitle": "Want to support Silvanus?",
"topggBody": "Vote and leave a review for Silvanus [on Top.gg](https://top.gg/bot/521624335119810561)", "topggBody": "Vote and leave a review for Silvanus [on Top.gg](https://top.gg/bot/521624335119810561)",
"setup": "For the most up to date guides and information, check out the Silvanus Support Wiki - https://silvanus.vfsh.dev/\n[Silvanus Setup Guide](https://silvanus.vfsh.dev/en/setup)\n\nNeed help and can't reach me on Discord? Send an email to SilvanusDev@gmail.com and I'll get back to you ASAP.", "setup": "For the most up to date guides and information, check out the [Silvanus Support Wiki](https://git.vfsh.dev/voidf1sh/silvanus/wiki)\n\nNeed help and can't reach me on Discord? Send an email to `sky@vfsh.dev` and I'll get back to you ASAP.",
"longDescription": "Silvanus, the ultimate companion bot for Grow A Tree, takes your tree-growing journey to the next level. Are you tired of cluttered channels filled with notifications? Silvanus has you covered! With its unique notification relay system, Silvanus listens for Grow A Tree's notifications in a hidden channel and sends customized, auto-deleting notifications to the channels of your choice. Customize your notifications and keep your server clean and organized.\n\nSilvanus simplifies leaderboard tree height comparisons with a simple command. No more manual calculations or guesswork. Silvanus shows you exactly how far you are from the next tree on the leaderboard, allowing you to gauge your progress effortlessly.", "longDescription": "Silvanus, the ultimate companion bot for Grow A Tree, takes your tree-growing journey to the next level. Are you tired of cluttered channels filled with notifications? Silvanus has you covered! With its unique notification relay system, Silvanus listens for Grow A Tree's notifications in a hidden channel and sends customized, auto-deleting notifications to the channels of your choice. Customize your notifications and keep your server clean and organized.\n\nSilvanus simplifies leaderboard tree height comparisons with a simple command. No more manual calculations or guesswork. Silvanus shows you exactly how far you are from the next tree on the leaderboard, allowing you to gauge your progress effortlessly.",
"allCommands": "</compare:1077058896469966889> - Compare your tree to others on the leaderboard\n</relay set:1077322799032578152> - Setup a Notification Relay for the first time\n</relay update:1077322799032578152> - Update an already configured Notification Relay\n</relay disable:1077322799032578152> - Disable the Notification Relay\n</rolemenu:1077058896469966892> - Send a self-assignable role menu for relay pings\n</watertime:1077058896469966895> - Calculates the time between waters for a tree of a given height\n</timetoheight:1077058896469966894> - Calculates how long it would take a tree to grow to a given height\n</setup compare:1077058896469966893> - Set the channels to use with </compare:1077058896469966889>\n</setup view:1077058896469966893> - View your server's configuration\n</setup reset:1077058896469966893> - Delete your server's configuration\n</help:1077058896469966890> - Displays the bot's help page" "allCommands": "</compare:1077058896469966889> - Compare your tree to others on the leaderboard\n</relay set:1077322799032578152> - Setup a Notification Relay for the first time\n</relay update:1077322799032578152> - Update an already configured Notification Relay\n</relay disable:1077322799032578152> - Disable the Notification Relay\n</rolemenu:1077058896469966892> - Send a self-assignable role menu for relay pings\n</watertime:1077058896469966895> - Calculates the time between waters for a tree of a given height\n</timetoheight:1077058896469966894> - Calculates how long it would take a tree to grow to a given height\n</setup compare:1077058896469966893> - Set the channels to use with </compare:1077058896469966889>\n</setup view:1077058896469966893> - View your server's configuration\n</setup reset:1077058896469966893> - Delete your server's configuration\n</help:1077058896469966890> - Displays the bot's help page"
}, },

10
main.js
View File

@ -69,7 +69,7 @@ client.on('interactionCreate', async interaction => {
if (client.slashCommands.has(commandName)) { if (client.slashCommands.has(commandName)) {
client.slashCommands.get(commandName).execute(interaction); client.slashCommands.get(commandName).execute(interaction);
} else { } 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); console.error('Slash command attempted to run but not found: ' + commandName);
} }
} }
@ -79,7 +79,7 @@ client.on('interactionCreate', async interaction => {
case 'refresh': case 'refresh':
// console.log(JSON.stringify(interaction)); // console.log(JSON.stringify(interaction));
await fn.refresh(interaction).catch(err => { 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; break;
case 'deleteping': case 'deleteping':
@ -103,10 +103,10 @@ client.on('interactionCreate', async interaction => {
} }
} catch(err) { } catch(err) {
if (err === "Guild doesn't exist in database!") { 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); console.error(err);
} else { } 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); console.error(err);
} }
} }
@ -117,7 +117,7 @@ client.on('messageUpdate', async (oldMessage, message) => {
await fn.messages.updateHandler(message).catch(async e => { await fn.messages.updateHandler(message).catch(async e => {
switch (e) { switch (e) {
case strings.error.noCompareMessage: case strings.error.noCompareMessage:
await message.channel.send(strings.error.noCompareMessage); await message.channel.send(strings.error.noCompareMessage).catch(e => console.err(e));
break; break;
default: default:
break; break;

42
modules/functions.js
View File

@ -99,6 +99,12 @@ const functions = {
await dbfn.setGuildInfo(query); await dbfn.setGuildInfo(query);
await functions.collectionBuilders.guildInfos(client); await functions.collectionBuilders.guildInfos(client);
console.log("Disabled notification relay for a guild I'm no longer in: " + guildInfo.guildId); console.log("Disabled notification relay for a guild I'm no longer in: " + guildInfo.guildId);
} else if (e === "ERRNOCHANNEL") {
guildInfo.setReminders(undefined, undefined, undefined, undefined, false);
const query = guildInfo.queryBuilder("setReminders");
await dbfn.setGuildInfo(query);
await functions.collectionBuilders.guildInfos(client);
console.log("Disabled notification relay for a channel I no longer see: " + guildInfo.watchChannelId);
} else { } else {
throw e; throw e;
} }
@ -229,11 +235,8 @@ const functions = {
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setColor(strings.embeds.color) .setColor(strings.embeds.color)
.setTitle(strings.help.aboutTitle) .setTitle(strings.help.aboutTitle)
.setDescription(`${strings.help.info}\n\n${strings.help.longDescription}`) .setDescription(`${strings.help.aboutDescription}\n\n${strings.help.aboutLinks}`)
.setFooter({ text: `v${package.version} - ${strings.embeds.footer}` }); .setFooter({ text: `v${package.version} - ${strings.embeds.footer}` });
embed.addFields([
{ name: strings.help.topggTitle, value: strings.help.topggBody}
]);
const privateBool = private == 'true'; const privateBool = private == 'true';
const messageContents = { embeds: [embed], ephemeral: privateBool }; const messageContents = { embeds: [embed], ephemeral: privateBool };
return messageContents; return messageContents;
@ -615,11 +618,16 @@ const functions = {
const indices = [description.indexOf("Your tree is ") + 13, description.indexOf("ft")]; const indices = [description.indexOf("Your tree is ") + 13, description.indexOf("ft")];
const treeHeightStr = description.slice(indices[0], indices[1]); const treeHeightStr = description.slice(indices[0], indices[1]);
const treeHeightFloat = parseFloat(treeHeightStr).toFixed(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 the info gathered
return { return {
treeName: treeName, treeName: treeName,
treeHeight: treeHeightFloat treeHeight: treeHeightFloat,
waterTimestamp: waterTimestamp
}; };
} else { } else {
return false; return false;
@ -696,6 +704,7 @@ const functions = {
} }
}, },
async updateHandler(message) { async updateHandler(message) {
// If we don't have the entire message yet, fetch it
if (message.partial) { if (message.partial) {
message = await message.fetch().catch(e => { message = await message.fetch().catch(e => {
throw e; throw e;
@ -706,7 +715,7 @@ const functions = {
// Check and store the message types // Check and store the message types
const isLeaderboard = this.isLeaderboard(message); const isLeaderboard = this.isLeaderboard(message);
const isTree = this.isTree(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 (isLeaderboard) {
if (isDev) console.log(`LU: ${message.guild.name}`); if (isDev) console.log(`LU: ${message.guild.name}`);
let guildInfo; let guildInfo;
@ -762,26 +771,35 @@ const functions = {
const comparedRankings = await functions.rankings.compare(guildInfo); const comparedRankings = await functions.rankings.compare(guildInfo);
const embed = functions.builders.comparisonEmbed(comparedRankings, guildInfo); const embed = functions.builders.comparisonEmbed(comparedRankings, guildInfo);
await compareMessage.edit(embed).catch(e => console.error(e)); await compareMessage.edit(embed).catch(e => console.error(e));
} else if (isTree) { } else if (isTree) { // Check if the message is a tree
// Check if the message is a tree if (isDev) console.log(`TU: ${isTree.treeName}: ${isTree.treeHeight}ft`);
// if (isDev) console.log(`TU: ${isTree.treeName}: ${isTree.treeHeight}ft`);
let guildInfo; let guildInfo;
// Default to not updating the database
let doDbUpdate = false; let doDbUpdate = false;
// Check if the bot has the guildInfo for this Guild already
if (message.client.guildInfos.has(message.guildId)) { if (message.client.guildInfos.has(message.guildId)) {
guildInfo = message.client.guildInfos.get(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)) { if ((guildInfo.treeName != isTree.treeName) || (guildInfo.treeHeight != isTree.treeHeight)) {
guildInfo.setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id); guildInfo.setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id);
doDbUpdate = true; 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) guildInfo = new GuildInfo().setIds(message.guildId, message.guild.ownerId)
.setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id); .setTreeInfo(isTree.treeName, isTree.treeHeight, message.channel.id, message.id);
doDbUpdate = true; 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) { if (doDbUpdate) {
const query = guildInfo.queryBuilder("setTreeInfo"); const query = guildInfo.queryBuilder("setTreeInfo");
await dbfn.setGuildInfo(query); 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);
} }
} }
} }
@ -867,7 +885,7 @@ const functions = {
throw "ERRNOGUILD" throw "ERRNOGUILD"
}); });
// Fetch the Channel // Fetch the Channel
const channel = await guild.channels.fetch(guildInfo.watchChannelId); const channel = await guild.channels.fetch(guildInfo.watchChannelId).catch(e => { throw "ERRNOCHANNEL" });
// Create the filter function // Create the filter function
const filter = message => { const filter = message => {
// Discard any messages sent by Silvanus // Discard any messages sent by Silvanus

10
package.json
View File

@ -1,21 +1,21 @@
{ {
"name": "silvanus", "name": "silvanus",
"version": "1.2.8", "version": "1.3.0",
"description": "Grow A Tree Companion Bot", "description": "The ultimate Grow A Tree companion bot!",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/voidf1sh/silvanus.git" "url": "git+https://git.vfsh.dev/voidf1sh/silvanus.git"
}, },
"author": "Skylar Grant", "author": "Skylar Grant",
"license": "ISC", "license": "ISC",
"bugs": { "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": { "dependencies": {
"axios": "^1.4.0", "axios": "^1.4.0",
"discord.js": "^14.11.0", "discord.js": "^14.11.0",