add a message parser to vote controller
parses a vote message line by line to extract - eventdate - eventid - movies - votes This depends on the structure of the message to not change substantially. as such it's quite brittle
This commit is contained in:
parent
fe45445811
commit
e54f03292e
|
@ -1,6 +1,5 @@
|
||||||
import { Guild, GuildScheduledEvent, GuildScheduledEventEditOptions, GuildScheduledEventSetStatusArg, GuildScheduledEventStatus, Message, MessageCreateOptions, MessageReaction, TextChannel, User } from "discord.js"
|
import { Guild, GuildScheduledEvent, GuildScheduledEventEditOptions, GuildScheduledEventSetStatusArg, GuildScheduledEventStatus, Message, MessageCreateOptions, MessageReaction, PartialMessage, TextChannel, User } from "discord.js"
|
||||||
import { client, yavinJellyfinHandler } from "../.."
|
import { Emoji, Emotes, NONE_OF_THAT } from "../constants"
|
||||||
import { Emotes, NONE_OF_THAT } from "../constants"
|
|
||||||
import { logger, newRequestId } from "../logger"
|
import { logger, newRequestId } from "../logger"
|
||||||
import { getMembersWithRoleFromGuild } from "./roleFilter"
|
import { getMembersWithRoleFromGuild } from "./roleFilter"
|
||||||
import { config } from "../configuration"
|
import { config } from "../configuration"
|
||||||
|
@ -12,13 +11,28 @@ import toDate from "date-fns/toDate"
|
||||||
import differenceInDays from "date-fns/differenceInDays"
|
import differenceInDays from "date-fns/differenceInDays"
|
||||||
import addDays from "date-fns/addDays"
|
import addDays from "date-fns/addDays"
|
||||||
import isAfter from "date-fns/isAfter"
|
import isAfter from "date-fns/isAfter"
|
||||||
|
import { ExtendedClient } from "../structures/client"
|
||||||
|
import { JellyfinHandler } from "../jellyfin/handler"
|
||||||
|
import { getYear } from "date-fns"
|
||||||
|
|
||||||
export type Vote = {
|
export type Vote = {
|
||||||
emote: string, //todo habs nicht hinbekommen hier Emotes zu nutzen
|
emote: string, //todo habs nicht hinbekommen hier Emotes zu nutzen
|
||||||
count: number,
|
count: number,
|
||||||
movie: string
|
movie: string
|
||||||
}
|
}
|
||||||
|
export type VoteMessageInfo = {
|
||||||
|
votes: Vote[],
|
||||||
|
eventId: string,
|
||||||
|
eventDate: Date
|
||||||
|
}
|
||||||
export default class VoteController {
|
export default class VoteController {
|
||||||
|
private client: ExtendedClient
|
||||||
|
private yavinJellyfinHandler: JellyfinHandler
|
||||||
|
|
||||||
|
public constructor(_client: ExtendedClient, _yavin: JellyfinHandler) {
|
||||||
|
this.client = _client
|
||||||
|
this.yavinJellyfinHandler = _yavin
|
||||||
|
}
|
||||||
|
|
||||||
public async handleNoneOfThatVote(messageReaction: MessageReaction, user: User, reactedUponMessage: VoteMessage, requestId: string, guildId: string) {
|
public async handleNoneOfThatVote(messageReaction: MessageReaction, user: User, reactedUponMessage: VoteMessage, requestId: string, guildId: string) {
|
||||||
if (!messageReaction.message.guild) return 'No guild'
|
if (!messageReaction.message.guild) return 'No guild'
|
||||||
|
@ -30,7 +44,7 @@ export default class VoteController {
|
||||||
const watcherRoleMemberCount = watcherRoleMember.size
|
const watcherRoleMemberCount = watcherRoleMember.size
|
||||||
logger.info(`MEMBER COUNT: ${watcherRoleMemberCount}`, { requestId, guildId })
|
logger.info(`MEMBER COUNT: ${watcherRoleMemberCount}`, { requestId, guildId })
|
||||||
|
|
||||||
const noneOfThatReactions = messageReaction.message.reactions.cache.get(NONE_OF_THAT)?.users.cache.filter(x => x.id !== client.user?.id).size ?? 0
|
const noneOfThatReactions = messageReaction.message.reactions.cache.get(NONE_OF_THAT)?.users.cache.filter(x => x.id !== this.client.user?.id).size ?? 0
|
||||||
|
|
||||||
const memberThreshold = (watcherRoleMemberCount / 2)
|
const memberThreshold = (watcherRoleMemberCount / 2)
|
||||||
logger.info(`Reroll ${noneOfThatReactions} > ${memberThreshold} ?`, { requestId, guildId })
|
logger.info(`Reroll ${noneOfThatReactions} > ${memberThreshold} ?`, { requestId, guildId })
|
||||||
|
@ -38,21 +52,21 @@ export default class VoteController {
|
||||||
logger.info('Starting poll reroll', { requestId, guildId })
|
logger.info('Starting poll reroll', { requestId, guildId })
|
||||||
messageReaction.message.edit((messageReaction.message.content ?? "").concat('\nDiese Abstimmung muss wiederholt werden.'))
|
messageReaction.message.edit((messageReaction.message.content ?? "").concat('\nDiese Abstimmung muss wiederholt werden.'))
|
||||||
// get movies that _had_ votes
|
// get movies that _had_ votes
|
||||||
const oldMovieNames: string[] = this.parseMoviesFromVoteMessage(messageReaction.message,requestId)
|
//const oldMovieNames: Vote[] = this.parseVotesFromVoteMessage(messageReaction.message, requestId)
|
||||||
const eventId = this.parseEventIdFromMessage(messageReaction.message, requestId)
|
const eventId = this.parseEventIdFromMessage(messageReaction.message, requestId)
|
||||||
const eventStartDate: Date = this.fetchEventStartDateByEventId(eventId, requestId) //TODO
|
const eventStartDate: Date = this.fetchEventStartDateByEventId(eventId, requestId) //TODO
|
||||||
//
|
//
|
||||||
// get movies from jellyfin to fill the remaining slots
|
// get movies from jellyfin to fill the remaining slots
|
||||||
const newMovieCount = config.bot.random_movie_count - oldMovieNames.length
|
const newMovieCount = config.bot.random_movie_count //- oldMovieNames.length
|
||||||
const newMovies = await yavinJellyfinHandler.getRandomMovieNames(newMovieCount, guildId, requestId)
|
const newMovies = await this.yavinJellyfinHandler.getRandomMovieNames(newMovieCount, guildId, requestId)
|
||||||
|
|
||||||
// merge
|
// merge
|
||||||
const movies = oldMovieNames.concat(newMovies)
|
const movies = newMovies
|
||||||
|
|
||||||
// create new message
|
// create new message
|
||||||
await this.closePoll(messageReaction.message.guild, requestId)
|
await this.closePoll(messageReaction.message.guild, requestId)
|
||||||
const message = this.createVoteMessageText(eventId, eventStartDate, movies, guildId, requestId)
|
const message = this.createVoteMessageText(eventId, eventStartDate, movies, guildId, requestId)
|
||||||
const announcementChannel = client.getAnnouncementChannelForGuild(guildId)
|
const announcementChannel = this.client.getAnnouncementChannelForGuild(guildId)
|
||||||
if (!announcementChannel) {
|
if (!announcementChannel) {
|
||||||
logger.error(`No announcementChannel found for ${guildId}, can't post poll`)
|
logger.error(`No announcementChannel found for ${guildId}, can't post poll`)
|
||||||
return
|
return
|
||||||
|
@ -65,10 +79,39 @@ export default class VoteController {
|
||||||
private fetchEventStartDateByEventId(eventId: string, requestId: string): Date {
|
private fetchEventStartDateByEventId(eventId: string, requestId: string): Date {
|
||||||
throw new Error("Method not implemented.")
|
throw new Error("Method not implemented.")
|
||||||
}
|
}
|
||||||
private parseMoviesFromVoteMessage(message: Message<boolean> | import("discord.js").PartialMessage, requestId: string): string[] {
|
public parseVotesFromVoteMessage(message: VoteMessage, requestId: string): VoteMessageInfo {
|
||||||
throw new Error("Method not implemented.")
|
const lines = message.cleanContent.split('\n')
|
||||||
|
let eventId = ""
|
||||||
|
let eventDate: Date = new Date()
|
||||||
|
let votes: Vote[] = []
|
||||||
|
for (const line of lines) {
|
||||||
|
if (line.includes('https://discord.com/events')) {
|
||||||
|
const urlMatcher = RegExp(/(http|https|ftp):\/\/(\S*)/ig)
|
||||||
|
const result = line.match(urlMatcher)
|
||||||
|
if (!result) throw Error('No event url found in Message')
|
||||||
|
eventId = result?.[0].split('/').at(-1) ?? ""
|
||||||
|
} else if (!line.slice(0, 5).includes(':')) {
|
||||||
|
const datematcher = RegExp(/((0[1-9]|[12][0-9]|3[01])\.(0[1-9]|1[012]))(\ um\ )(([012][0-9]:[0-5][0-9]))/i)
|
||||||
|
const result: RegExpMatchArray | null = line.match(datematcher)
|
||||||
|
const timeFromResult = result?.at(-1)
|
||||||
|
const dateFromResult = result?.at(1)?.concat(format(new Date(), '.yyyy')).concat(" " + timeFromResult) ?? ""
|
||||||
|
eventDate = new Date(dateFromResult)
|
||||||
|
} else if (line.slice(0, 5).includes(':')) {
|
||||||
|
const splitLine = line.split(":")
|
||||||
|
const [emoji, movie] = splitLine
|
||||||
|
if (emoji === NONE_OF_THAT) continue
|
||||||
|
const fetchedVoteFromMessage = message.reactions.cache.get(emoji)
|
||||||
|
if (fetchedVoteFromMessage) {
|
||||||
|
votes.push({ movie:movie.trim(), emote: emoji, count: fetchedVoteFromMessage.count })
|
||||||
|
} else {
|
||||||
|
logger.error(`No vote reaction found for movie, assuming 0`, requestId)
|
||||||
|
votes.push({ movie, emote: emoji, count: 0 })
|
||||||
}
|
}
|
||||||
private parseEventIdFromMessage(message: Message<boolean> | import("discord.js").PartialMessage, requestId: string): string {
|
}
|
||||||
|
}
|
||||||
|
return <VoteMessageInfo>{ eventId, eventDate, votes }
|
||||||
|
}
|
||||||
|
private parseEventIdFromMessage(message: Message<boolean> | PartialMessage, requestId: string): string {
|
||||||
throw new Error("Method not implemented.")
|
throw new Error("Method not implemented.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +147,7 @@ export default class VoteController {
|
||||||
const guildId = guild.id
|
const guildId = guild.id
|
||||||
logger.info("stopping poll", { guildId, requestId })
|
logger.info("stopping poll", { guildId, requestId })
|
||||||
|
|
||||||
const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId)
|
const announcementChannel: Maybe<TextChannel> = this.client.getAnnouncementChannelForGuild(guildId)
|
||||||
if (!announcementChannel) {
|
if (!announcementChannel) {
|
||||||
logger.error("Could not find the textchannel. Unable to close poll.", { guildId, requestId })
|
logger.error("Could not find the textchannel. Unable to close poll.", { guildId, requestId })
|
||||||
return
|
return
|
||||||
|
@ -188,7 +231,7 @@ export default class VoteController {
|
||||||
content: body,
|
content: body,
|
||||||
allowedMentions: { parse: ["roles"] }
|
allowedMentions: { parse: ["roles"] }
|
||||||
}
|
}
|
||||||
const announcementChannel = client.getAnnouncementChannelForGuild(guildId)
|
const announcementChannel = this.client.getAnnouncementChannelForGuild(guildId)
|
||||||
logger.info("Sending vote closed message.", { guildId, requestId })
|
logger.info("Sending vote closed message.", { guildId, requestId })
|
||||||
if (!announcementChannel) {
|
if (!announcementChannel) {
|
||||||
logger.error("Could not find announcement channel. Please fix!", { guildId, requestId })
|
logger.error("Could not find announcement channel. Please fix!", { guildId, requestId })
|
||||||
|
|
|
@ -10,6 +10,7 @@ import { logger } from "../logger";
|
||||||
import { CommandType } from "../types/commandTypes";
|
import { CommandType } from "../types/commandTypes";
|
||||||
import { isInitialAnnouncement } from "../helper/messageIdentifiers";
|
import { isInitialAnnouncement } from "../helper/messageIdentifiers";
|
||||||
import VoteController from "../helper/vote.controller";
|
import VoteController from "../helper/vote.controller";
|
||||||
|
import { yavinJellyfinHandler } from "../..";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,7 +18,7 @@ export class ExtendedClient extends Client {
|
||||||
private eventFilePath = `${__dirname}/../events`
|
private eventFilePath = `${__dirname}/../events`
|
||||||
private commandFilePath = `${__dirname}/../commands`
|
private commandFilePath = `${__dirname}/../commands`
|
||||||
private jellyfin: JellyfinHandler
|
private jellyfin: JellyfinHandler
|
||||||
public voteController: VoteController = new VoteController()
|
public voteController: VoteController = new VoteController(this, yavinJellyfinHandler)
|
||||||
public commands: Collection<string, CommandType> = new Collection()
|
public commands: Collection<string, CommandType> = new Collection()
|
||||||
private announcementChannels: Collection<string, TextChannel> = new Collection() //guildId to TextChannel
|
private announcementChannels: Collection<string, TextChannel> = new Collection() //guildId to TextChannel
|
||||||
private announcementRoleHandlerTask: Collection<string, ScheduledTask> = new Collection() //one task per guild
|
private announcementRoleHandlerTask: Collection<string, ScheduledTask> = new Collection() //one task per guild
|
||||||
|
|
Loading…
Reference in New Issue