From 24b97bc5b0f8fdf5926b509397dd9dd1df20b0ce Mon Sep 17 00:00:00 2001 From: Bradley Bickford Date: Tue, 29 Nov 2022 19:47:07 -0500 Subject: [PATCH] Adding some modifications to increase reuseability --- commands/googlecalendar/addcalendar.js | 42 +++------- commands/googlecalendar/deletecalendar.js | 27 +++++++ commands/googlecalendar/listcalendar.js | 19 +---- utilities/googlecalendar.js | 99 +++++++++++++++++++++++ 4 files changed, 137 insertions(+), 50 deletions(-) create mode 100644 utilities/googlecalendar.js diff --git a/commands/googlecalendar/addcalendar.js b/commands/googlecalendar/addcalendar.js index e6f0db0..e3b70db 100644 --- a/commands/googlecalendar/addcalendar.js +++ b/commands/googlecalendar/addcalendar.js @@ -1,8 +1,5 @@ -const { SlashCommandBuilder } = require('discord.js'); -const { google } = require('googleapis'); -const { googlePrivateKey, googleClientEmail, googleProjectNumber } = require('../../config.json'); -const { stdout } = require('node:process'); -const SCOPES = ['https://www.googleapis.com/auth/calendar']; +const { SlashCommandBuilder, EmbedBuilder } = require('discord.js'); +const { addCalendar } = require('../../utilities/googlecalendar.js'); module.exports = { data: new SlashCommandBuilder() @@ -22,34 +19,13 @@ module.exports = { const name = interaction.options.getString('name'); - const jwtClient = new google.auth.JWT( - googleClientEmail, - './keyfile.json', - googlePrivateKey, - SCOPES, - ); - - const calendar = new google.calendar({ - version: 'v3', - project: googleProjectNumber, - auth: jwtClient, - }); - - calendar.calendars.insert({ - resource: { - summary: name, - }, - }, // eslint-disable-next-line no-unused-vars - async (err, res) => { - if (err) { - await interaction.editReply('Failed to create calendar ' + name + '\nAsk Bradley to check Breadbot console'); - stdout.write('[ERROR]: '); - console.log(err.errors); - return; - } - await interaction.editReply('New Calendar ' + name + ' Created'); - }, - ); + addCalendar(name, async (success, message, extra) => { + const embedResponse = new EmbedBuilder() + .setColor(success ? 0x00FF00 : 0xFF0000) + .setTitle(message); + + await interaction.editReply({ embeds: [ embedResponse ] }); + }); }, }; \ No newline at end of file diff --git a/commands/googlecalendar/deletecalendar.js b/commands/googlecalendar/deletecalendar.js index e69de29..65e12b9 100644 --- a/commands/googlecalendar/deletecalendar.js +++ b/commands/googlecalendar/deletecalendar.js @@ -0,0 +1,27 @@ +const { SlashCommandBuilder, EmbedBuilder } = require('discord.js'); +const { deleteCalendar } = require('../../utilities/googlecalendar.js'); + +module.exports = { + data: new SlashCommandBuilder() + .setName('deletecalendar') + .setDescription('Permanently deletes a calendar and it\'s associated events') + .addStringOption(option => + option + .setName('name') + .setDescription('The name of the calendar you want to delete') + .setRequired(true)), + async execute(interaction) { + await interaction.deferReply({ ephemeral: true }); + + const name = interaction.options.getString('name'); + + // eslint-disable-next-line no-unused-vars + deleteCalendar(name, async (success, message, extra) => { + const embedResponse = new EmbedBuilder() + .setColor(success ? 0x0FF00 : 0xFF0000) + .setTitle(message); + + await interaction.editReply({ embeds: [ embedResponse ] }); + }); + }, +}; \ No newline at end of file diff --git a/commands/googlecalendar/listcalendar.js b/commands/googlecalendar/listcalendar.js index 8f616d2..c5d37fe 100644 --- a/commands/googlecalendar/listcalendar.js +++ b/commands/googlecalendar/listcalendar.js @@ -1,8 +1,6 @@ const { SlashCommandBuilder, EmbedBuilder } = require('discord.js'); -const { google } = require('googleapis'); -const { googlePrivateKey, googleClientEmail, googleProjectNumber } = require('../../config.json'); +const { getListOfCalendars } = require('../../utilities/googlecalendar'); const { stdout } = require('node:process'); -const SCOPES = ['https://www.googleapis.com/auth/calendar']; module.exports = { data: new SlashCommandBuilder() @@ -11,20 +9,7 @@ module.exports = { async execute(interaction) { await interaction.deferReply({ ephemeral: true }); - const jwtClient = new google.auth.JWT( - googleClientEmail, - './keyfile.json', - googlePrivateKey, - SCOPES, - ); - - const calendar = new google.calendar({ - version: 'v3', - project: googleProjectNumber, - auth: jwtClient, - }); - - calendar.calendarList.list({}, async (err, res) => { + getListOfCalendars({}, async (err, res) => { if (err) { const errorEmbed = new EmbedBuilder() .setColor(0xFF0000) diff --git a/utilities/googlecalendar.js b/utilities/googlecalendar.js new file mode 100644 index 0000000..ffa3fcb --- /dev/null +++ b/utilities/googlecalendar.js @@ -0,0 +1,99 @@ +const { google } = require('googleapis'); +const { googlePrivateKey, googleClientEmail, googleProjectNumber } = require('../config.json'); +const { stdout } = require('node:process'); +const SCOPES = ['https://www.googleapis.com/auth/calendar']; + +async function getCalendarReference() { + const jwtClient = new google.auth.JWT( + googleClientEmail, + '../keyfile.json', + googlePrivateKey, + SCOPES, + ); + + return new google.calendar({ + version: 'v3', + project: googleProjectNumber, + auth: jwtClient, + }); +} + +async function doesCalendarExist(calendarName) { + const calendarReference = await getCalendarReference(); + const listResults = await calendarReference.calendarList.list({}); + console.log(listResults); + console.log(listResults.data.items); + + for (const item of listResults.data.items) { + console.log(item); + console.log('[DEBUG]: Calendar Item Summary: ' + item.summary); + if (item.summary === calendarName) { + console.log('[DEBUG]: The previous item is causing doesCalendarExist to return true'); + return item; + } + } + + return null; +} + +// TODO This needs to be changed so that it uses the common callback +// format that I've created +async function getListOfCalendars(options, callback) { + const calendarReference = await getCalendarReference(); + calendarReference.calendarList.list(options, callback); +} + +async function addCalendar(calendarName, callback) { + const calendarReference = await getCalendarReference(); + calendarReference.calendars.insert({ + resource: { + summary: calendarName, + }, + }, + // eslint-disable-next-line no-unused-vars + async (err, res) => { + if (err) { + callback(false, 'Failed to create new calendar ' + calendarName + '\nAsk Bradley to check Breadbat console', err); + stdout.write('[ERROR]: '); + console.log(err.errors); + return; + } + + callback(true, 'Successfully created new calendar ' + calendarName, null); + }); +} + +async function deleteCalendar(calendarName, callback) { + const exists = await doesCalendarExist(calendarName); + + if (exists) { + const calendarReference = await getCalendarReference(); + calendarReference.calendars.delete({ + resource: { + calendarId: exists.id, + }, + }, + // eslint-disable-next-line no-unused-vars + async (err, res) => { + if (err) { + callback(false, 'Failed to delete ' + calendarName + '\nAsk Bradley to check Breadbot console', err); + stdout.write('[ERROR]: '); + console.log(err.errors); + return; + } + + callback(true, 'Successfully deleted ' + calendarName, null); + }); + } + else { + callback(false, 'The calendar name specified doesn\'t exist', null); + } +} + +module.exports = { + getCalendarReference, + getListOfCalendars, + doesCalendarExist, + deleteCalendar, + addCalendar, +}; \ No newline at end of file