From 07849d331acd3985248af91282e2e6ad21618277 Mon Sep 17 00:00:00 2001 From: Sammy Date: Sat, 17 Jun 2023 12:00:14 +0200 Subject: [PATCH] move scheduling of pollclose task to startup Also moved check function to closepoll.ts --- server/commands/closepoll.ts | 32 ++++++++++++++- server/events/guildScheduledEventCreate.ts | 45 +--------------------- server/events/guildScheduledEventUpdate.ts | 1 + server/structures/client.ts | 13 ++++++- 4 files changed, 44 insertions(+), 47 deletions(-) diff --git a/server/commands/closepoll.ts b/server/commands/closepoll.ts index b254f38..1de84bb 100644 --- a/server/commands/closepoll.ts +++ b/server/commands/closepoll.ts @@ -1,13 +1,13 @@ +import { addDays, format, isAfter, toDate } from 'date-fns' import { Guild, GuildScheduledEvent, GuildScheduledEventEditOptions, GuildScheduledEventSetStatusArg, GuildScheduledEventStatus, Message, MessageCreateOptions, TextChannel } from 'discord.js' import { v4 as uuid } from 'uuid' import { client } from '../..' import { config } from '../configuration' import { Emotes } from '../events/guildScheduledEventCreate' +import { Maybe } from '../interfaces' import { logger } from '../logger' import { Command } from '../structures/command' import { RunOptions } from '../types/commandTypes' -import { format } from 'date-fns' -import { Maybe } from '../interfaces' export default new Command({ name: 'closepoll', @@ -145,4 +145,32 @@ function extractMovieFromMessageByEmote(message: Message, emote: string): string const movie = emoteLines[0].substring(emoteLines[0].indexOf(emote) + emote.length + 2) // plus colon and space return movie +} + +export async function checkForPollsToClose(guild: Guild): Promise { + const requestId = uuid() + logger.info(`Automatic check for poll closing.`, { guildId: guild.id, requestId }) + const events = (await guild.scheduledEvents.fetch()).filter(event => event.name.toLocaleLowerCase().includes("voting offen")).map(event => event) + if(events.length > 1) { + logger.error("Handling more than one Event is not implemented yet. Found more than one poll to close") + return + } else if(events.length == 0) { + logger.info("Could not find any events. Cancelling", { guildId: guild.id, requestId }) + } + + const updatedEvent = events[0] //add two hours because of different timezones in discord api and Date.now() + if (!updatedEvent.scheduledStartTimestamp) { + logger.error("Event does not have a scheduled start time. Cancelling", { guildId: guild.id, requestId }) + return + } + + const eventDate: Date = toDate(updatedEvent.scheduledStartTimestamp) + const closePollDate: Date = addDays(eventDate, -2) + + if (isAfter(Date.now(), closePollDate)) { + logger.info("Less than two days until event. Closing poll", { guildId: guild.id, requestId }) + closePoll(guild, requestId) + } else { + logger.info(`ScheduledStart: ${closePollDate}. Now: ${toDate(Date.now())}`, { guildId: guild.id, requestId }) + } } \ No newline at end of file diff --git a/server/events/guildScheduledEventCreate.ts b/server/events/guildScheduledEventCreate.ts index 7a28fee..985bb5c 100644 --- a/server/events/guildScheduledEventCreate.ts +++ b/server/events/guildScheduledEventCreate.ts @@ -1,10 +1,8 @@ -import { addDays, format, isAfter } from "date-fns"; -import toDate from "date-fns/fp/toDate"; +import { format } from "date-fns"; import { GuildScheduledEvent, Message, MessageCreateOptions, TextChannel } from "discord.js"; -import { ScheduledTask, schedule } from "node-cron"; +import { ScheduledTask } from "node-cron"; import { v4 as uuid } from "uuid"; import { client, yavinJellyfinHandler } from "../.."; -import { closePoll } from "../commands/closepoll"; import { config } from "../configuration"; import { Maybe } from "../interfaces"; import { logger } from "../logger"; @@ -59,46 +57,7 @@ export async function execute(event: GuildScheduledEvent) { sentMessage.react(Emotes[i]) } - if (!task) { - task = schedule("0 * * * * *", () => checkForPollsToClose(event)) - } - // sentMessage.pin() //todo: uncomment when bot has permission to pin messages. Also update closepoll.ts to only fetch pinned messages } } -async function checkForPollsToClose(event: GuildScheduledEvent): Promise { - const requestId = uuid() - logger.info(`Automatic check for poll closing.`, { guildId: event.guildId, requestId }) - if (!event.guild) { - logger.error("No guild in event. Cancelling.", { guildId: event.guildId, requestId }) - return - } - //refetch event in case the time changed or the poll is already closed - const events = (await event.guild.scheduledEvents.fetch()) - .filter(event => event.name.toLowerCase().includes("voting offen")) - .map((value) => value) - - if (!events || events.length <= 0) { - logger.info("Did not find any events. Cancelling", { guildId: event.guildId, requestId }) - return - } else if (events.length > 1) { - logger.error(`More than one event found. Don't know which one is the right one :( Events: ${JSON.stringify(events, null, 2)}`, { guildId: event.guildId, requestId }) - return - } - const updatedEvent = events[0] //add two hours because of different timezones in discord api and Date.now() - if (!updatedEvent.scheduledStartTimestamp) { - logger.error("Event does not have a scheduled start time. Cancelling", { guildId: event.guildId, requestId }) - return - } - - const eventDate: Date = toDate(updatedEvent.scheduledStartTimestamp) - const closePollDate: Date = addDays(eventDate, -2) - - if (isAfter(Date.now(), closePollDate)) { - logger.info("Less than two days until event. Closing poll", { guildId: event.guildId, requestId }) - closePoll(event.guild, requestId) - } else { - logger.info(`ScheduledStart: ${closePollDate}. Now: ${toDate(Date.now())}`, { guildId: event.guildId, requestId }) - } -} \ No newline at end of file diff --git a/server/events/guildScheduledEventUpdate.ts b/server/events/guildScheduledEventUpdate.ts index b3cd8b1..eed87e7 100644 --- a/server/events/guildScheduledEventUpdate.ts +++ b/server/events/guildScheduledEventUpdate.ts @@ -27,6 +27,7 @@ export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildSche if (!members.find(x => x.id == member.id)) members.push(member) } + if (newEvent.status === GuildScheduledEventStatus.Active) createJFUsers(members, newEvent.name, requestId) diff --git a/server/structures/client.ts b/server/structures/client.ts index 6ecaf6b..6d74663 100644 --- a/server/structures/client.ts +++ b/server/structures/client.ts @@ -8,6 +8,7 @@ import { Maybe } from "../interfaces"; import { JellyfinHandler } from "../jellyfin/handler"; import { logger } from "../logger"; import { CommandType } from "../types/commandTypes"; +import { checkForPollsToClose } from "../commands/closepoll"; @@ -16,8 +17,9 @@ export class ExtendedClient extends Client { private commandFilePath = `${__dirname}/../commands` private jellyfin: JellyfinHandler public commands: Collection = new Collection() - private announcementChannels: Collection = new Collection //guildId to TextChannel - private announcementRoleHandlerTask: Collection = new Collection //one task per guild + private announcementChannels: Collection = new Collection() //guildId to TextChannel + private announcementRoleHandlerTask: Collection = new Collection() //one task per guild + private pollCloseBackgroundTasks: Collection = new Collection() public constructor(jf: JellyfinHandler) { const intents: IntentsBitField = new IntentsBitField() intents.add(IntentsBitField.Flags.GuildMembers, IntentsBitField.Flags.MessageContent, IntentsBitField.Flags.Guilds, IntentsBitField.Flags.DirectMessages, IntentsBitField.Flags.GuildScheduledEvents, IntentsBitField.Flags.GuildVoiceStates) @@ -73,6 +75,7 @@ export class ExtendedClient extends Client { this.cacheUsers(guilds) await this.cacheAnnouncementServer(guilds) this.startAnnouncementRoleBackgroundTask(guilds) + this.startPollCloceBackgroundTasks() }) } catch (error) { logger.info(`Error refreshing slash commands: ${error}`) @@ -169,4 +172,10 @@ export class ExtendedClient extends Client { } task.stop() } + + private async startPollCloceBackgroundTasks() { + for(const guild of this.guilds.cache) { + this.pollCloseBackgroundTasks.set(guild[1].id, schedule("0 * * * * *", () => checkForPollsToClose(guild[1]))) + } + } }