Updated cosmetics, minor changes

Author: just-rich

README.md

@@ -1,12 +1,16 @@
 # Analyst Poll Bot
 
+Clone of my public [analyst-poll-bot](https://github.com/just-rich/analyst-poll-bot) make any updates to it if any are done here.
+
+## Overview
+
 Analyst Poll Bot is a Discord bot designed to facilitate daily polls in specific channels of a Discord server. It automates the process of collecting user feedback on whether they were "green" or "red" for the day following a specific analyst. The bot also logs these results, providing both daily and all-time statistics for each poll. It stores all the poll results in a database using SQLite.
 
 It updates the poll message in real-time to show the current results. It sends a message to a specified log channel that updates in real-time to show daily & all time results for each channel a poll is in.
 
 ## Features
 
-- **Automated Polls**: Polls are automatically posted daily at 1:15 PM PST in specified channels.
+- **Automated Polls**: Polls are automatically posted Monday-Friday at 1:05 PM PST in specified channels.
 - **Manual Poll Trigger**: Polls can be manually triggered using the `!startpolls` command. *This simulates as if a daily poll has been sent, for testing.*
 - **User Interaction**: Users can interact with the poll by selecting one of the options: "Green", "Red", or "Did not follow/trade".
 - **Result Logging**: Daily and all-time results are logged in a specified channel, including the number of votes and their percentages.

index.js

@@ -15,8 +15,55 @@ let simulatedDayCounter = 0; // Counter to simulate a new day each time !startpo
 client.once('ready', () => {
   console.log(`Logged in as ${client.user.tag}!`);
 
-  // Schedule the poll to be posted daily at 1:15 PM PST
-  cron.schedule('15 13 * * *', () => {
+  // Schedule the poll to be posted Monday-Friday at 1:05 PM PST on weekdays (Monday to Friday)
+  cron.schedule('05 13 * * 1-5', () => {
+    const date = new Date().toISOString().split('T')[0]; // Get current date in YYYY-MM-DD format
+
+    if (lastPollDate !== date) {
+      startPolls(date);
+      lastPollDate = date;
+      console.log('Polls have been started.');
+    } else {
+      console.log('Polls have already been started for today.');
+    }
+  }, {
+    timezone: "America/Los_Angeles"
+  });
+});
+
+// Listen for messages
+client.on('messageCreate', async (message) => {
+  if (message.content === '!startpolls') {
+    // Check if the user has the "Administrator" permission
+    if (!message.member.permissions.has(PermissionsBitField.Flags.Administrator)) {
+      return message.reply('You do not have permission to use this command.');
+    }
+
+    const simulatedDate = new Date().toISOString().split('T')[0] + `-simulated-${simulatedDayCounter++}`;
+    startPolls(simulatedDate);
+    message.channel.send('Polls have been started for simulated date: ' + simulatedDate);
+  }
+});
+
+client.login(config.token);1~const { Client, GatewayIntentBits, PermissionsBitField } = require('discord.js');
+const config = require('./config.json');
+const { startPolls } = require('./pollHandler');
+const cron = require('node-cron');
+
+// Initialize the Discord client
+const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent] });
+
+// Set the client as a global variable to be accessible in other modules
+global.client = client;
+
+let lastPollDate = null; // Store the date of the last started poll
+let simulatedDayCounter = 0; // Counter to simulate a new day each time !startpolls is used
+
+client.once('ready', () => {
+  console.log(`Logged in as ${client.user.tag}!`);
+
+  // Schedule the poll to be posted Monday-Friday at 1:05 PM PST on weekdays (Monday to Friday)
+  cron.schedule('05 13 * * 1-5', () => {
     const date = new Date().toISOString().split('T')[0]; // Get current date in YYYY-MM-DD format
 
     if (lastPollDate !== date) {

pollHandler.js

@@ -8,6 +8,7 @@ async function postPoll(channelId, date) {
   const channel = await client.channels.fetch(channelId);
   const embed = new EmbedBuilder()
     .setTitle('Were you green or red for the day following this analyst?')
+    .setColor('#9cfa05')
     .addFields(
       { name: 'Total', value: '0', inline: false },
       { name: 'Green', value: '0 (0%)', inline: true },
@@ -19,9 +20,9 @@ async function postPoll(channelId, date) {
     embeds: [embed],
     components: [
       new ActionRowBuilder().addComponents(
-        new ButtonBuilder().setCustomId('green').setLabel('Green').setStyle(ButtonStyle.Success),
-        new ButtonBuilder().setCustomId('red').setLabel('Red').setStyle(ButtonStyle.Danger),
-        new ButtonBuilder().setCustomId('no_trade').setLabel('Did not follow/trade').setStyle(ButtonStyle.Secondary)
+        new ButtonBuilder().setCustomId('green').setLabel('📈 Green').setStyle(ButtonStyle.Success),
+        new ButtonBuilder().setCustomId('red').setLabel('📉 Red').setStyle(ButtonStyle.Danger),
+        new ButtonBuilder().setCustomId('no_trade').setLabel('❌ Did not follow/trade').setStyle(ButtonStyle.Secondary)
       )
     ]
   });
@@ -33,7 +34,7 @@ async function postPoll(channelId, date) {
 
   collector.on('collect', async (interaction) => {
     if (userVotes.has(interaction.user.id)) {
-      await interaction.reply({ content: 'You have already voted in this poll.', ephemeral: true });
+      await interaction.reply({ content: 'You have already voted in this poll.', ephemeral: true }).catch(console.error);
       return;
     }
 
@@ -62,16 +63,33 @@ async function startPolls(date) {
 
 async function sendInitialLogMessage(date) {
   const logChannel = await client.channels.fetch(config.logChannelId);
-  let initialContent = `${date} Poll Results\n\n`;
-  for (const channelId of config.pollChannels) {
-    initialContent += `
+  const logEmbeds = [];
+
+  let currentEmbed = new EmbedBuilder().setTitle(`${date} Poll Results`).setColor('#9cfa05');
+  let currentDescription = '';
+
+  for (const [index, channelId] of config.pollChannels.entries()) {
+    currentDescription += `
 Results for <#${channelId}>:
 Green: \`0\` **0%** for the day. (All time: \`0\` **0%**)
 Red: \`0\` **0%** for the day. (All time: \`0\` **0%**)
 Did not follow/trade: \`0\` **0%** for the day. (All time: \`0\` **0%**)\n\n`;
+
+    if ((index + 1) % 10 === 0 || index === config.pollChannels.length - 1) {
+      currentEmbed.setDescription(currentDescription.trim());
+      logEmbeds.push(currentEmbed);
+      currentEmbed = new EmbedBuilder().setTitle(`${date} Poll Results`).setColor('#9cfa05');
+      currentDescription = '';
+    }
+  }
+
+  const logMessagesSent = [];
+  for (const logEmbed of logEmbeds) {
+    const sentMessage = await logChannel.send({ embeds: [logEmbed] });
+    logMessagesSent.push(sentMessage);
   }
-  const logMessage = await logChannel.send(initialContent.trim());
-  logMessages[date] = logMessage;
+
+  logMessages[date] = logMessagesSent;
 }
 
 async function updatePollMessage(pollMessage, channelId, date) {
@@ -87,21 +105,25 @@ async function updatePollMessage(pollMessage, channelId, date) {
 
   const embed = new EmbedBuilder()
     .setTitle('Were you green or red for the day following this analyst?')
+    .setColor('#9cfa05')
     .addFields(
       { name: 'Total', value: `${totalVotes}`, inline: false },
       { name: 'Green', value: `${greenVotes} (${greenPercentage}%)`, inline: true },
       { name: 'Red', value: `${redVotes} (${redPercentage}%)`, inline: true },
       { name: 'Did not follow/trade', value: `${noTradeVotes} (${noTradePercentage}%)`, inline: true }
     );
 
-  await pollMessage.edit({ embeds: [embed] });
+  await pollMessage.edit({ embeds: [embed] }).catch(console.error);
 }
 
 async function updateLogChannel(date) {
-  const logMessage = logMessages[date];
-  let logContent = `${date} Poll Results\n\n`;
+  const logMessagesSent = logMessages[date];
+  const logEmbeds = [];
 
-  for (const channelId of config.pollChannels) {
+  let currentEmbed = new EmbedBuilder().setTitle(`${date} Poll Results`).setColor('#9cfa05');
+  let currentDescription = '';
+
+  for (const [index, channelId] of config.pollChannels.entries()) {
     const results = await getPollResults(channelId, date);
     const totalVotes = results.reduce((acc, result) => acc + result.count, 0);
     const greenVotes = results.find(result => result.answer === 'green')?.count || 0;
@@ -122,18 +144,27 @@ async function updateLogChannel(date) {
     const allTimeRedPercentage = allTimeVotes > 0 ? ((allTimeRed / allTimeVotes) * 100).toFixed(2) : 0;
     const allTimeNoTradePercentage = allTimeVotes > 0 ? ((allTimeNoTrade / allTimeVotes) * 100).toFixed(2) : 0;
 
-    logContent += `
+    currentDescription += `
 Results for <#${channelId}>:
 Green: \`${greenVotes}\` **${greenPercentage}%** for the day. (All time: \`${allTimeGreen}\` **${allTimeGreenPercentage}%**)
 Red: \`${redVotes}\` **${redPercentage}%** for the day. (All time: \`${allTimeRed}\` **${allTimeRedPercentage}%**)
 Did not follow/trade: \`${noTradeVotes}\` **${noTradePercentage}%** for the day. (All time: \`${allTimeNoTrade}\` **${allTimeNoTradePercentage}%**)\n\n`;
+
+    if ((index + 1) % 10 === 0 || index === config.pollChannels.length - 1) {
+      currentEmbed.setDescription(currentDescription.trim());
+      logEmbeds.push(currentEmbed);
+      currentEmbed = new EmbedBuilder().setTitle(`${date} Poll Results`).setColor('#9cfa05');
+      currentDescription = '';
+    }
   }
 
-  await logMessage.edit(logContent.trim());
+  for (let i = 0; i < logMessagesSent.length; i++) {
+    await logMessagesSent[i].edit({ embeds: [logEmbeds[i]] }).catch(console.error);
+  }
 }
 
 async function disablePoll(pollMessage) {
-  await pollMessage.edit({ components: [] });
+  await pollMessage.edit({ components: [] }).catch(console.error);
 }
 
 module.exports = { startPolls, disablePoll };