Merge pull request #17 from petercort/add-wax-utilities

Add wax utilities

Author: petercort

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+### Version 1.0.0
+
+#### feature
+* PR [#17](https://github.com/petercort/FBF-Buddy/pull/17) - Add wax utilities
+
+
+
 ### Version 0.0.5
 
 #### feature

config/event-buddy-deployment.yaml

@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: event-buddy
+spec:
+  replicas: 1
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: event-buddy
+  template:
+    metadata:
+      labels:
+        app: event-buddy
+    spec:
+      containers:
+        - image: ghcr.io/petercort/event-buddy:0.0.5
+          name: event-buddy
+          ports:
+          - containerPort: 80
+          volumeMounts:
+          - name: azure-secrets-store
+            mountPath: "/mnt/secrets-store"
+            readOnly: true
+      volumes:
+        - name: azure-secrets-store
+          csi:
+            driver: secrets-store.csi.k8s.io
+            readOnly: true
+            volumeAttributes:
+              secretProviderClass: "sc-demo-keyvault-csi"

package-lock.json

@@ -16,15 +16,16 @@
     "license": "MIT",
     "dependencies": {
         "@sequelize/postgres": "^7.0.0-alpha.43",
+        "axios": "^1.7.9",
         "discord-interactions": "^4.0.0",
         "discord.js": "^14.16.3",
-        "dotenv": "^16.4.5",
+        "dotenv": "^16.4.7",
         "express": "^4.18.2",
         "fbf-event-buddy": "file:",
         "sequelize": "^6.37.5",
         "sqlite3": "^5.1.7"
     },
     "devDependencies": {
-        "nodemon": "^3.0.0"
+        "nodemon": "^3.1.9"
     }
 }

package.json

@@ -2,7 +2,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { Client, Collection, Events, GatewayIntentBits } = require('discord.js');
 const { Op } = require('sequelize');
-const { EventsTable } = require('./dbObjects.js');
+const { EventsTable, UsersTable, BikesTable } = require('./dbObjects.js');
 const { exec } = require('node:child_process');
 const { execute } = require('./commands/utility/create_event.js');
 const discordToken = fs.readFileSync("/mnt/secrets-store/discordToken", 'utf8');
@@ -31,6 +31,10 @@ for (const folder of commandFolders) {
 client.once(Events.ClientReady, readyClient => {
 	console.log('Syncing database...');
 	EventsTable.sync({ alter: true });
+	//UsersTable.sync({ alter: true, force: true });
+	UsersTable.sync();
+	//BikesTable.sync({ alter: true, force: true });
+	BikesTable.sync();
 	console.log(`Ready! Logged in as ${readyClient.user.tag}`);
 });
 
@@ -55,8 +59,7 @@ client.on(Events.InteractionCreate, async interaction => {
 	}
 });
 
-try {
-	client.login(discordToken);
-} catch (error) {
-	console.error(error);
-}
+// Start the Strava webhook server
+require('./strava_webhook.js');
+
+client.login(discordToken);

src/app.js

@@ -12,6 +12,7 @@ const foldersPath = path.join(__dirname, 'commands');
 const commandFolders = fs.readdirSync(foldersPath);
 
 for (const folder of commandFolders) {
+	console.log(`[INFO] Processing commands in folder: ${folder}`);
 	// Grab all the command files from the commands directory you created earlier
 	const commandsPath = path.join(foldersPath, folder);
 	const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
@@ -40,7 +41,10 @@ const rest = new REST().setToken(discordToken);
 			Routes.applicationGuildCommands(appId, guildId),
 			{ body: commands },
 		);
-
+		await rest.put(
+			Routes.applicationCommands(appId),
+			{ body: commands },
+		);
 		console.log(`Successfully reloaded ${data.length} application (/) commands.`);
 	} catch (error) {
 		// And of course, make sure you catch and log any errors!

src/commands.js

@@ -0,0 +1,30 @@
+const { SlashCommandBuilder } = require('@discordjs/builders');
+const { EmbedBuilder } = require('discord.js');
+const axios = require('axios');
+const { UsersTable } = require('../../dbObjects.js'); // Assuming you have a UsersTable to store user data
+const fs = require('node:fs');
+const path = require('node:path');
+// load strava configuration
+const STRAVA_CLIENT_ID = fs.readFileSync("/mnt/secrets-store/STRAVA_CLIENT_ID", 'utf8');
+const STRAVA_REDIRECT_URI = fs.readFileSync("/mnt/secrets-store/STRAVA_REDIRECT_URI", 'utf8');
+
+
+module.exports = {
+    data: new SlashCommandBuilder()
+        .setName('connect_strava')
+        .setDescription('Connect your Strava account to collect ride data.'),
+    async execute(interaction) {
+        const userId = interaction.user.id;
+        const stravaAuthUrl = `https://www.strava.com/oauth/authorize?client_id=${STRAVA_CLIENT_ID}&response_type=code&redirect_uri=${STRAVA_REDIRECT_URI}/${userId}&scope=read,activity:read_all,profile:read_all`;
+
+        const embed = new EmbedBuilder()
+            .setTitle('Connect Strava')
+            .setDescription(`[Click here to connect your Strava account](${stravaAuthUrl})`)
+            .setColor('#FC4C02');
+
+        await interaction.reply({ embeds: [embed], ephemeral: true });
+
+        // Save the user ID to the database to track the connection process
+        await UsersTable.upsert({ userId, strava_connected: false });
+    },
+};

src/commands/utility/connect_strava.js

@@ -0,0 +1,24 @@
+const { SlashCommandBuilder } = require('discord.js');
+const { BikesTable } = require('../../dbObjects.js');
+module.exports = {
+	data: new SlashCommandBuilder()
+		.setName('get_all_bikes')
+		.setDescription('Get all your bikes!'),
+    async execute(interaction) {
+      const userId = interaction.user.id;
+
+      try {
+          // Query the BikesTable to get all bikes for the user
+          const bikes = await BikesTable.findAll({ where: { userId } });
+
+          if (bikes.length === 0) {
+              return await interaction.reply('No bikes found.');
+          }
+          const bikeList = bikes.map(bike => `${bike.name} (${bike.brand} ${bike.model})`).join('\n');
+          return await interaction.reply(`Your bikes:\n${bikeList}`);
+      } catch (error) {
+          console.error('Error fetching bikes:', error);
+          return await interaction.reply('There was an error fetching your bikes.');
+      }
+  },
+};

src/commands/utility/get_all_bikes.js

@@ -0,0 +1,30 @@
+const { SlashCommandBuilder } = require('discord.js');
+const { BikesTable } = require('../../dbObjects.js');
+module.exports = {
+	data: new SlashCommandBuilder()
+		.setName('get_bike_by_name')
+		.setDescription('Get a bike by it\'s name!')
+    .addStringOption(option => 
+      option.setName('name')
+          .setDescription('The name of the bike')
+          .setRequired(true)),
+    async execute(interaction) {
+      const userId = interaction.user.id;
+      const bikeName = interaction.options.getString('name')
+      try {
+        // Query the BikesTable to get the bike by name for the user
+        const bike = await BikesTable.findOne({ where: { userId, name: bikeName } });
+
+        if (!bike) {
+            return await interaction.reply('No bike found with that name.');
+        }
+        const miles = Math.round(bike.lastWaxedDistance * 0.000621371); // equivilant meters to miles
+        const bikeInfo = `Bike information:\nName: ${bike.name}\nBrand: ${bike.brand}\nModel: ${bike.model}.\nCurrent Mileage: ${Math.round(bike.distance * 0.000621371)}\nThis chain was last waxed on ${bike.lastWaxedDate} at ${miles} miles.`;
+
+        return await interaction.reply(bikeInfo);
+    } catch (error) {
+        console.error('Error fetching bike:', error);
+        return await interaction.reply('There was an error fetching your bike.');
+    }
+  }
+};

src/commands/utility/get_bike_by_name.js

@@ -0,0 +1,41 @@
+const { SlashCommandBuilder } = require('@discordjs/builders');
+const { EmbedBuilder } = require('discord.js');
+const axios = require('axios');
+const getStravaAuthentication = require('../../shared_library/strava_authentication.js');
+
+module.exports = {
+    data: new SlashCommandBuilder()
+        .setName('get_latest_ride')
+        .setDescription('Get your latest ride from Strava.'),
+    async execute(interaction) {
+        const userId = interaction.user.id;
+        
+        // do some logic here to determine if hte access token is expired if so refresh it and then use it
+        const strava_access_token = await getStravaAuthentication(userId);
+        if (!strava_access_token) {
+          return interaction.reply({ content: 'You need to connect your Strava account first.', ephemeral: true });
+        }
+        try {
+            const response = await axios.get('https://www.strava.com/api/v3/athlete/activities', {
+                headers: { Authorization: `Bearer ${strava_access_token}` },
+                params: { per_page: 1 }
+            });
+
+            const latestRide = response.data[0];
+
+            if (!latestRide) {
+                return interaction.reply({ content: 'No rides found.', ephemeral: true });
+            }
+
+            const embed = new EmbedBuilder()
+                .setTitle('Latest Ride')
+                .setDescription(`**Distance:** ${latestRide.distance} meters\n**Date:** ${new Date(latestRide.start_date).toLocaleString()}`)
+                .setColor('#FC4C02');
+
+            return interaction.reply({ embeds: [embed], ephemeral: true });
+        } catch (error) {
+            console.error('Error fetching latest ride:', error);
+            return interaction.reply({ content: 'There was an error fetching your latest ride.', ephemeral: true });
+        }
+    },
+};

src/commands/utility/get_last_ride.js

@@ -0,0 +1,52 @@
+const { SlashCommandBuilder } = require('@discordjs/builders');
+const { BikesTable } = require('../../dbObjects.js');
+
+module.exports = {
+    data: new SlashCommandBuilder()
+        .setName('i_waxed_my_chain')
+        .setDescription('Update the date of when you last waxed your chain for a specific bike.')
+        .addStringOption(option => 
+            option.setName('bike_name')
+                .setDescription('The name of the bike')
+                .setRequired(true))
+        .addStringOption(option => 
+            option.setName('date')
+                .setDescription('The date you last waxed your chain (YYYY-MM-DD). If nothing is entered, assuming today.')
+                .setRequired(false))
+        .addStringOption(option => 
+            option.setName('mileage')
+                .setDescription('The mileage you waxed your chain at. If nothing is entered, assuming current mileage.')
+                .setRequired(false)),
+    async execute(interaction) {
+        const userId = interaction.user.id;
+        const bikeName = interaction.options.getString('bike_name');
+        // if date is null use today
+        let date = interaction.options.getString('date')
+        if (!interaction.options.getString('date')) {
+            const currentDate = new Date();
+            const month = currentDate.getMonth() + 1; // Months are zero-based, so add 1
+            const day = currentDate.getDate();
+            const year = currentDate.getFullYear();
+            date = `${month}/${day}/${year}`;
+        }
+        const bike = await BikesTable.findOne({ where: { userId: userId, name: bikeName } });  
+        var mileage = ""
+        if (interaction.options.getString('mileage')) {
+            mileage = interaction.options.getString('mileage') * 1609.344;
+        } else {
+            mileage = bike.distance;
+        }
+        
+        try {
+            const output = await BikesTable.update(
+                { lastWaxedDate: date, lastWaxedDistance: mileage},
+                { where: { userId: userId, bikeId: bike.bikeId } }
+            );
+            const distanceMiles = Math.round(mileage * 0.000621371192);
+            await interaction.reply({ content: `Successfully updated the last waxed date for bike ID ${bike.bikeId} to ${date}, at ${distanceMiles} miles.`});
+        } catch (error) {
+            console.error('Error updating waxed chain date:', error);
+            await interaction.reply({ content: 'There was an error updating the waxed chain date.', ephemeral: true });
+        }
+    },
+};

src/commands/utility/i_waxed_my_chain.js

@@ -0,0 +1,31 @@
+const { SlashCommandBuilder } = require('discord.js');
+
+module.exports = {
+	category: 'utility',
+	data: new SlashCommandBuilder()
+		.setName('reload')
+		.setDescription('Reloads a command.')
+		.addStringOption(option =>
+			option.setName('command')
+				.setDescription('The command to reload.')
+				.setRequired(true)),
+	async execute(interaction) {
+		const commandName = interaction.options.getString('command', true).toLowerCase();
+		const command = interaction.client.commands.get(commandName);
+
+		if (!command) {
+			return interaction.reply(`There is no command with name \`${commandName}\`!`);
+		}
+
+		delete require.cache[require.resolve(`../${command.category}/${command.data.name}.js`)];
+
+		try {
+	        const newCommand = require(`../${command.category}/${command.data.name}.js`);
+	        interaction.client.commands.set(newCommand.data.name, newCommand);
+	        await interaction.reply(`Command \`${newCommand.data.name}\` was reloaded!`);
+		} catch (error) {
+	        console.error(error);
+	        await interaction.reply(`There was an error while reloading a command \`${command.data.name}\`:\n\`${error.message}\``);
+		}
+	},
+};