format more files
All checks were successful
Compile the repository / compile (pull_request) Successful in 1m12s

This commit is contained in:
mightypanders 2023-06-24 21:09:56 +02:00
parent d82a7cffd2
commit 66f843b399
25 changed files with 1418 additions and 1418 deletions

View File

@ -8,114 +8,114 @@ import { Command } from '../structures/command'
import { RunOptions } from '../types/commandTypes' import { RunOptions } from '../types/commandTypes'
export default new Command({ export default new Command({
name: 'announce', name: 'announce',
description: 'Neues announcement im announcement Channel an alle senden.', description: 'Neues announcement im announcement Channel an alle senden.',
options: [{ options: [{
name: "typ", name: "typ",
type: ApplicationCommandOptionType.String, type: ApplicationCommandOptionType.String,
description: "Was für ein announcement?", description: "Was für ein announcement?",
choices: [{ name: "initial", value: "initial" }, { name: "votepls", value: "votepls" }, { name: "cancel", value: "cancel" }], choices: [{ name: "initial", value: "initial" }, { name: "votepls", value: "votepls" }, { name: "cancel", value: "cancel" }],
required: true required: true
}], }],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
const command = interaction.interaction const command = interaction.interaction
const requestId = uuid() const requestId = uuid()
if (!command.guildId) { if (!command.guildId) {
logger.error("COMMAND DOES NOT HAVE A GUILD ID; CANCELLING!!!", { requestId }) logger.error("COMMAND DOES NOT HAVE A GUILD ID; CANCELLING!!!", { requestId })
return return
} }
const guildId = command.guildId const guildId = command.guildId
const announcementType = command.options.data.find(option => option.name.includes("typ")) const announcementType = command.options.data.find(option => option.name.includes("typ"))
logger.info(`Got command for announcing ${announcementType?.value}!`, { guildId, requestId }) logger.info(`Got command for announcing ${announcementType?.value}!`, { guildId, requestId })
if (!announcementType) { if (!announcementType) {
logger.error("Did not get an announcement type!", { guildId, requestId }) logger.error("Did not get an announcement type!", { guildId, requestId })
return return
} }
if (!isAdmin(command.member)) { if (!isAdmin(command.member)) {
logger.info(`Announcement was requested by ${command.member.displayName} but they are not an admin! Not sending announcement.`, { guildId, requestId }) logger.info(`Announcement was requested by ${command.member.displayName} but they are not an admin! Not sending announcement.`, { guildId, requestId })
return return
} else { } else {
logger.info(`User ${command.member.displayName} seems to be admin`) logger.info(`User ${command.member.displayName} seems to be admin`)
} }
if ((<string>announcementType.value).includes("initial")) { if ((<string>announcementType.value).includes("initial")) {
sendInitialAnnouncement(guildId, requestId) sendInitialAnnouncement(guildId, requestId)
command.followUp("Ist rausgeschickt!") command.followUp("Ist rausgeschickt!")
} else { } else {
command.followUp(`${announcementType.value} ist aktuell noch nicht implementiert`) command.followUp(`${announcementType.value} ist aktuell noch nicht implementiert`)
} }
} }
}) })
function isAdmin(member: GuildMember): boolean { function isAdmin(member: GuildMember): boolean {
return member.roles.cache.find((role) => role.id === config.bot.jf_admin_role) !== undefined return member.roles.cache.find((role) => role.id === config.bot.jf_admin_role) !== undefined
} }
async function sendInitialAnnouncement(guildId: string, requestId: string): Promise<void> { async function sendInitialAnnouncement(guildId: string, requestId: string): Promise<void> {
logger.info("Sending initial announcement") logger.info("Sending initial announcement")
const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId) const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId)
if (!announcementChannel) { if (!announcementChannel) {
logger.error("Could not find announcement channel. Aborting", { guildId, requestId }) logger.error("Could not find announcement channel. Aborting", { guildId, requestId })
return return
} }
const currentPinnedAnnouncementMessages = (await announcementChannel.messages.fetchPinned()).filter(message => message.cleanContent.includes("[initial]")) const currentPinnedAnnouncementMessages = (await announcementChannel.messages.fetchPinned()).filter(message => message.cleanContent.includes("[initial]"))
currentPinnedAnnouncementMessages.forEach(async (message) => await message.unpin()) currentPinnedAnnouncementMessages.forEach(async (message) => await message.unpin())
currentPinnedAnnouncementMessages.forEach(message => message.delete()) currentPinnedAnnouncementMessages.forEach(message => message.delete())
const body = `[initial] Hey! @everyone! Hier ist der Watchparty Bot vom Hartzarett. const body = `[initial] Hey! @everyone! Hier ist der Watchparty Bot vom Hartzarett.
Wir machen in Zukunft regelmäßig Watchparties in denen wir zusammen Filme gucken! Falls du mitmachen möchtest, reagiere einfach auf diesen Post mit 🎫, dann bekommst du automatisch eine Rolle zugewiesen und wirst benachrichtigt sobald es in der Zukunft weitere Watchparties und Filme zum abstimmen gibt. Wir machen in Zukunft regelmäßig Watchparties in denen wir zusammen Filme gucken! Falls du mitmachen möchtest, reagiere einfach auf diesen Post mit 🎫, dann bekommst du automatisch eine Rolle zugewiesen und wirst benachrichtigt sobald es in der Zukunft weitere Watchparties und Filme zum abstimmen gibt.
Für eine Erklärung wie das alles funktioniert mach einfach /mitgucken für eine lange Erklärung am Stück oder /guides wenn du auswählen möchtest wozu du Infos bekommst.` Für eine Erklärung wie das alles funktioniert mach einfach /mitgucken für eine lange Erklärung am Stück oder /guides wenn du auswählen möchtest wozu du Infos bekommst.`
const options: MessageCreateOptions = { const options: MessageCreateOptions = {
allowedMentions: { parse: ['everyone'] }, allowedMentions: { parse: ['everyone'] },
content: body content: body
} }
const message: Message<true> = await announcementChannel.send(options) const message: Message<true> = await announcementChannel.send(options)
await message.react("🎫") await message.react("🎫")
await message.pin() await message.pin()
} }
export async function manageAnnouncementRoles(guild: Guild, reaction: MessageReaction, requestId: string) { export async function manageAnnouncementRoles(guild: Guild, reaction: MessageReaction, requestId: string) {
const guildId = guild.id const guildId = guild.id
logger.info("Managing roles", { guildId, requestId }) logger.info("Managing roles", { guildId, requestId })
const announcementRole: Role | undefined = (await guild.roles.fetch()).find(role => role.id === config.bot.announcement_role) const announcementRole: Role | undefined = (await guild.roles.fetch()).find(role => role.id === config.bot.announcement_role)
if (!announcementRole) { if (!announcementRole) {
logger.error(`Could not find announcement role! Aborting! Was looking for role with id: ${config.bot.announcement_role}`, { guildId, requestId }) logger.error(`Could not find announcement role! Aborting! Was looking for role with id: ${config.bot.announcement_role}`, { guildId, requestId })
return return
} }
const usersWhoWantRole: User[] = (await reaction.users.fetch()).filter(user => !user.bot).map(user => user) const usersWhoWantRole: User[] = (await reaction.users.fetch()).filter(user => !user.bot).map(user => user)
const allUsers = (await guild.members.fetch()) const allUsers = (await guild.members.fetch())
const usersWhoHaveRole: GuildMember[] = allUsers const usersWhoHaveRole: GuildMember[] = allUsers
.filter(member => member.roles.cache .filter(member => member.roles.cache
.find(role => role.id === config.bot.announcement_role) !== undefined) .find(role => role.id === config.bot.announcement_role) !== undefined)
.map(member => member) .map(member => member)
const usersWhoNeedRoleRevoked: GuildMember[] = usersWhoHaveRole const usersWhoNeedRoleRevoked: GuildMember[] = usersWhoHaveRole
.filter(userWhoHas => !usersWhoWantRole.map(wanter => wanter.id).includes(userWhoHas.id)) .filter(userWhoHas => !usersWhoWantRole.map(wanter => wanter.id).includes(userWhoHas.id))
const usersWhoDontHaveRole: GuildMember[] = allUsers const usersWhoDontHaveRole: GuildMember[] = allUsers
.filter(member => member.roles.cache .filter(member => member.roles.cache
.find(role => role.id === config.bot.announcement_role) === undefined) .find(role => role.id === config.bot.announcement_role) === undefined)
.map(member => member) .map(member => member)
const usersWhoNeedRole: GuildMember[] = usersWhoDontHaveRole const usersWhoNeedRole: GuildMember[] = usersWhoDontHaveRole
.filter(userWhoNeeds => usersWhoWantRole.map(wanter => wanter.id).includes(userWhoNeeds.id)) .filter(userWhoNeeds => usersWhoWantRole.map(wanter => wanter.id).includes(userWhoNeeds.id))
logger.debug(`Theses users will get the role removed: ${JSON.stringify(usersWhoNeedRoleRevoked)}`, { guildId, requestId }) logger.debug(`Theses users will get the role removed: ${JSON.stringify(usersWhoNeedRoleRevoked)}`, { guildId, requestId })
logger.debug(`Theses users will get the role added: ${JSON.stringify(usersWhoNeedRole)}`, { guildId, requestId }) logger.debug(`Theses users will get the role added: ${JSON.stringify(usersWhoNeedRole)}`, { guildId, requestId })
usersWhoNeedRoleRevoked.forEach(user => user.roles.remove(announcementRole)) usersWhoNeedRoleRevoked.forEach(user => user.roles.remove(announcementRole))
usersWhoNeedRole.forEach(user => user.roles.add(announcementRole)) usersWhoNeedRole.forEach(user => user.roles.add(announcementRole))
} }

View File

@ -10,175 +10,175 @@ import { Command } from '../structures/command'
import { RunOptions } from '../types/commandTypes' import { RunOptions } from '../types/commandTypes'
export default new Command({ export default new Command({
name: 'closepoll', name: 'closepoll',
description: 'Aktuelle Umfrage für nächste Watchparty beenden und Gewinner in Event eintragen.', description: 'Aktuelle Umfrage für nächste Watchparty beenden und Gewinner in Event eintragen.',
options: [], options: [],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
const command = interaction.interaction const command = interaction.interaction
const requestId = uuid() const requestId = uuid()
if (!command.guild) { if (!command.guild) {
logger.error("No guild found in interaction. Cancelling closing request", { requestId }) logger.error("No guild found in interaction. Cancelling closing request", { requestId })
command.followUp("Es gab leider ein Problem. Ich konnte deine Anfrage nicht bearbeiten :(") command.followUp("Es gab leider ein Problem. Ich konnte deine Anfrage nicht bearbeiten :(")
return return
} }
const guildId = command.guildId const guildId = command.guildId
logger.info("Got command for closing poll!", { guildId, requestId }) logger.info("Got command for closing poll!", { guildId, requestId })
command.followUp("Alles klar, beende die Umfrage :)") command.followUp("Alles klar, beende die Umfrage :)")
closePoll(command.guild, requestId) closePoll(command.guild, requestId)
} }
}) })
export async function closePoll(guild: Guild, requestId: string) { export async function closePoll(guild: Guild, requestId: string) {
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> = 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
} }
const messages: Message<true>[] = (await announcementChannel.messages.fetch()) //todo: fetch only pinned messages const messages: Message<true>[] = (await announcementChannel.messages.fetch()) //todo: fetch only pinned messages
.map((value) => value) .map((value) => value)
.filter(message => !message.cleanContent.includes("[Abstimmung beendet]") && message.cleanContent.includes("[Abstimmung]")) .filter(message => !message.cleanContent.includes("[Abstimmung beendet]") && message.cleanContent.includes("[Abstimmung]"))
.sort((a, b) => b.createdTimestamp - a.createdTimestamp) .sort((a, b) => b.createdTimestamp - a.createdTimestamp)
if (!messages || messages.length <= 0) { if (!messages || messages.length <= 0) {
logger.info("Could not find any vote messages. Cancelling pollClose", { guildId, requestId }) logger.info("Could not find any vote messages. Cancelling pollClose", { guildId, requestId })
return return
} }
const lastMessage: Message<true> = messages[0] const lastMessage: Message<true> = messages[0]
logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId, requestId }) logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId, requestId })
logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId, requestId }) logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId, requestId })
const votes = await (await getVotesByEmote(lastMessage, guildId, requestId)) const votes = await (await getVotesByEmote(lastMessage, guildId, requestId))
.sort((a, b) => b.count - a.count) .sort((a, b) => b.count - a.count)
logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId, requestId }) logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId, requestId })
logger.info("Deleting vote message") logger.info("Deleting vote message")
await lastMessage.delete() await lastMessage.delete()
const event = await getEvent(guild, guild.id, requestId) const event = await getEvent(guild, guild.id, requestId)
if (event) { if (event) {
updateEvent(event, votes, guild, guildId, requestId) updateEvent(event, votes, guild, guildId, requestId)
sendVoteClosedMessage(event, votes[0].movie, guildId, requestId) sendVoteClosedMessage(event, votes[0].movie, guildId, requestId)
} }
//lastMessage.unpin() //todo: uncomment when bot has permission to pin/unpin //lastMessage.unpin() //todo: uncomment when bot has permission to pin/unpin
} }
async function sendVoteClosedMessage(event: GuildScheduledEvent, movie: string, guildId: string, requestId: string) { async function sendVoteClosedMessage(event: GuildScheduledEvent, movie: string, guildId: string, requestId: string) {
const date = event.scheduledStartAt ? format(event.scheduledStartAt, "dd.MM") : "Fehler, event hatte kein Datum" const date = event.scheduledStartAt ? format(event.scheduledStartAt, "dd.MM") : "Fehler, event hatte kein Datum"
const time = event.scheduledStartAt ? format(event.scheduledStartAt, "HH:mm") : "Fehler, event hatte kein Datum" const time = event.scheduledStartAt ? format(event.scheduledStartAt, "HH:mm") : "Fehler, event hatte kein Datum"
const body = `[Abstimmung beendet] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Wir gucken ${movie} am ${date} um ${time}` const body = `[Abstimmung beendet] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Wir gucken ${movie} am ${date} um ${time}`
const options: MessageCreateOptions = { const options: MessageCreateOptions = {
content: body, content: body,
allowedMentions: { parse: ["roles"] } allowedMentions: { parse: ["roles"] }
} }
const announcementChannel = client.getAnnouncementChannelForGuild(guildId) const announcementChannel = 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 })
return return
} }
announcementChannel.send(options) announcementChannel.send(options)
} }
async function updateEvent(voteEvent: GuildScheduledEvent, votes: Vote[], guild: Guild, guildId: string, requestId: string) { async function updateEvent(voteEvent: GuildScheduledEvent, votes: Vote[], guild: Guild, guildId: string, requestId: string) {
logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId, requestId }) logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId, requestId })
const options: GuildScheduledEventEditOptions<GuildScheduledEventStatus.Scheduled, GuildScheduledEventSetStatusArg<GuildScheduledEventStatus.Scheduled>> = { const options: GuildScheduledEventEditOptions<GuildScheduledEventStatus.Scheduled, GuildScheduledEventSetStatusArg<GuildScheduledEventStatus.Scheduled>> = {
name: votes[0].movie, name: votes[0].movie,
description: `!wp\nNummer 2: ${votes[1].movie} mit ${votes[1].count - 1} Stimmen\nNummer 3: ${votes[2].movie} mit ${votes[2].count - 1} Stimmen` description: `!wp\nNummer 2: ${votes[1].movie} mit ${votes[1].count - 1} Stimmen\nNummer 3: ${votes[2].movie} mit ${votes[2].count - 1} Stimmen`
} }
logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId, requestId }) logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId, requestId })
logger.info("Updating event.", { guildId, requestId }) logger.info("Updating event.", { guildId, requestId })
voteEvent.edit(options) voteEvent.edit(options)
} }
async function getEvent(guild: Guild, guildId: string, requestId: string): Promise<GuildScheduledEvent | null> { async function getEvent(guild: Guild, guildId: string, requestId: string): Promise<GuildScheduledEvent | null> {
const voteEvents = (await guild.scheduledEvents.fetch()) const voteEvents = (await guild.scheduledEvents.fetch())
.map((value) => value) .map((value) => value)
.filter(event => event.name.toLowerCase().includes("voting offen")) .filter(event => event.name.toLowerCase().includes("voting offen"))
logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId, requestId }) logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId, requestId })
if (!voteEvents || voteEvents.length <= 0) { if (!voteEvents || voteEvents.length <= 0) {
logger.error("Could not find vote event. Cancelling update!", { guildId, requestId }) logger.error("Could not find vote event. Cancelling update!", { guildId, requestId })
return null return null
} }
return voteEvents[0] return voteEvents[0]
} }
type Vote = { 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
} }
async function getVotesByEmote(message: Message, guildId: string, requestId: string): Promise<Vote[]> { async function getVotesByEmote(message: Message, guildId: string, requestId: string): Promise<Vote[]> {
const votes: Vote[] = [] const votes: Vote[] = []
logger.debug(`Number of items in emotes: ${Object.values(Emotes).length}`, { guildId, requestId }) logger.debug(`Number of items in emotes: ${Object.values(Emotes).length}`, { guildId, requestId })
for (let i = 0; i < Object.keys(Emotes).length / 2; i++) { for (let i = 0; i < Object.keys(Emotes).length / 2; i++) {
const emote = Emotes[i] const emote = Emotes[i]
logger.debug(`Getting reaction for emote ${emote}`, { guildId, requestId }) logger.debug(`Getting reaction for emote ${emote}`, { guildId, requestId })
const reaction = await message.reactions.resolve(emote) const reaction = await message.reactions.resolve(emote)
logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId, requestId }) logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId, requestId })
if (reaction) { if (reaction) {
const vote: Vote = { emote: emote, count: reaction.count, movie: extractMovieFromMessageByEmote(message, emote) } const vote: Vote = { emote: emote, count: reaction.count, movie: extractMovieFromMessageByEmote(message, emote) }
votes.push(vote) votes.push(vote)
} }
} }
return votes return votes
} }
function extractMovieFromMessageByEmote(message: Message, emote: string): string { function extractMovieFromMessageByEmote(message: Message, emote: string): string {
const lines = message.cleanContent.split("\n") const lines = message.cleanContent.split("\n")
const emoteLines = lines.filter(line => line.includes(emote)) const emoteLines = lines.filter(line => line.includes(emote))
if (!emoteLines) { if (!emoteLines) {
return "" return ""
} }
const movie = emoteLines[0].substring(emoteLines[0].indexOf(emote) + emote.length + 2) // plus colon and space const movie = emoteLines[0].substring(emoteLines[0].indexOf(emote) + emote.length + 2) // plus colon and space
return movie return movie
} }
export async function checkForPollsToClose(guild: Guild): Promise<void> { export async function checkForPollsToClose(guild: Guild): Promise<void> {
const requestId = uuid() const requestId = uuid()
logger.info(`Automatic check for poll closing.`, { guildId: guild.id, requestId }) 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) const events = (await guild.scheduledEvents.fetch()).filter(event => event.name.toLocaleLowerCase().includes("voting offen")).map(event => event)
if (events.length > 1) { if (events.length > 1) {
logger.error("Handling more than one Event is not implemented yet. Found more than one poll to close") logger.error("Handling more than one Event is not implemented yet. Found more than one poll to close")
return return
} else if (events.length == 0) { } else if (events.length == 0) {
logger.info("Could not find any events. Cancelling", { guildId: guild.id, requestId }) 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() const updatedEvent = events[0] //add two hours because of different timezones in discord api and Date.now()
if (!updatedEvent.scheduledStartTimestamp) { if (!updatedEvent.scheduledStartTimestamp) {
logger.error("Event does not have a scheduled start time. Cancelling", { guildId: guild.id, requestId }) logger.error("Event does not have a scheduled start time. Cancelling", { guildId: guild.id, requestId })
return return
} }
const createDate: Date = toDate(updatedEvent.createdTimestamp) const createDate: Date = toDate(updatedEvent.createdTimestamp)
const eventDate: Date = toDate(updatedEvent.scheduledStartTimestamp) const eventDate: Date = toDate(updatedEvent.scheduledStartTimestamp)
const difference: number = differenceInDays(createDate, eventDate) const difference: number = differenceInDays(createDate, eventDate)
if (difference <= 2) { if (difference <= 2) {
logger.info("Less than two days between event create and event start. Not closing poll.", { guildId: guild.id, requestId }) logger.info("Less than two days between event create and event start. Not closing poll.", { guildId: guild.id, requestId })
return return
} }
const closePollDate: Date = addDays(eventDate, -2) const closePollDate: Date = addDays(eventDate, -2)
if (isAfter(Date.now(), closePollDate)) { if (isAfter(Date.now(), closePollDate)) {
logger.info("Less than two days until event. Closing poll", { guildId: guild.id, requestId }) logger.info("Less than two days until event. Closing poll", { guildId: guild.id, requestId })
closePoll(guild, requestId) closePoll(guild, requestId)
} else { } else {
logger.info(`ScheduledStart: ${closePollDate}. Now: ${toDate(Date.now())}`, { guildId: guild.id, requestId }) logger.info(`ScheduledStart: ${closePollDate}. Now: ${toDate(Date.now())}`, { guildId: guild.id, requestId })
} }
} }

View File

@ -2,18 +2,18 @@ import { ApplicationCommandOptionType } from 'discord.js'
import { Command } from '../structures/command' import { Command } from '../structures/command'
import { RunOptions } from '../types/commandTypes' import { RunOptions } from '../types/commandTypes'
export default new Command({ export default new Command({
name: 'echo', name: 'echo',
description: 'Echoes a text', description: 'Echoes a text',
options: [ options: [
{ {
name: 'echo', name: 'echo',
description: 'The text to echo', description: 'The text to echo',
type: ApplicationCommandOptionType.String, type: ApplicationCommandOptionType.String,
required: true required: true
} }
], ],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
console.log('echo called') console.log('echo called')
interaction.interaction.reply(interaction.toString()) interaction.interaction.reply(interaction.toString())
} }
}) })

View File

@ -8,76 +8,76 @@ import { RunOptions } from '../types/commandTypes'
import { configureServer, explainRole, installation, loginInfo, useSyncgroup } from './mitgucken' import { configureServer, explainRole, installation, loginInfo, useSyncgroup } from './mitgucken'
export default new Command({ export default new Command({
name: 'guides', name: 'guides',
description: 'Bekomme eine Auswahl von Guides per DM', description: 'Bekomme eine Auswahl von Guides per DM',
options: [], options: [],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
const requestId = uuid() const requestId = uuid()
const guildId = interaction.interaction.guild?.id const guildId = interaction.interaction.guild?.id
logger.info(`Starting guides interaction for user ${interaction.interaction.user.id}`, { requestId, guildId }) logger.info(`Starting guides interaction for user ${interaction.interaction.user.id}`, { requestId, guildId })
const mediaPlayerGuideButton = new ButtonBuilder() const mediaPlayerGuideButton = new ButtonBuilder()
.setCustomId('jfInstallation') .setCustomId('jfInstallation')
.setLabel('Media Player Installation') .setLabel('Media Player Installation')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
const accountSetupGuideButton = new ButtonBuilder() const accountSetupGuideButton = new ButtonBuilder()
.setCustomId('configureServer') .setCustomId('configureServer')
.setLabel('Server einstellen') .setLabel('Server einstellen')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
const loginGuideButton = new ButtonBuilder() const loginGuideButton = new ButtonBuilder()
.setCustomId('login') .setCustomId('login')
.setLabel('Einloggen') .setLabel('Einloggen')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
const useSyncGroupGuideButton = new ButtonBuilder() const useSyncGroupGuideButton = new ButtonBuilder()
.setCustomId('useSyncGroup') .setCustomId('useSyncGroup')
.setLabel('Watch Parties nutzen') .setLabel('Watch Parties nutzen')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
const roleExplanationButton = new ButtonBuilder() const roleExplanationButton = new ButtonBuilder()
.setCustomId('explainRoles') .setCustomId('explainRoles')
.setLabel('Wie bekomme ich Zugang') .setLabel('Wie bekomme ich Zugang')
.setStyle(ButtonStyle.Primary) .setStyle(ButtonStyle.Primary)
const row = new ActionRowBuilder<ButtonBuilder>() const row = new ActionRowBuilder<ButtonBuilder>()
.addComponents(mediaPlayerGuideButton, accountSetupGuideButton, loginGuideButton, useSyncGroupGuideButton, roleExplanationButton) .addComponents(mediaPlayerGuideButton, accountSetupGuideButton, loginGuideButton, useSyncGroupGuideButton, roleExplanationButton)
//const userDMchannel = await interaction.interaction.user.createDM() //const userDMchannel = await interaction.interaction.user.createDM()
const response = await interaction.interaction.followUp({ const response = await interaction.interaction.followUp({
content: `Hier ist eine Auswahl von Guides.`, content: `Hier ist eine Auswahl von Guides.`,
components: [row] components: [row]
}) })
try { try {
const guideSelection = await response.awaitMessageComponent({ time: 60_000 }) const guideSelection = await response.awaitMessageComponent({ time: 60_000 })
if (guideSelection.customId === 'jfInstallation') { if (guideSelection.customId === 'jfInstallation') {
const userDMChannel = await guideSelection.user.createDM() const userDMChannel = await guideSelection.user.createDM()
userDMChannel.send({ embeds: installation(), files: [splashScreen] }) userDMChannel.send({ embeds: installation(), files: [splashScreen] })
} else if (guideSelection.customId === 'configureServer') { } else if (guideSelection.customId === 'configureServer') {
const userDMChannel = await guideSelection.user.createDM() const userDMChannel = await guideSelection.user.createDM()
userDMChannel.send({ embeds: configureServer(), files: [startScreen, serverConnection] }) userDMChannel.send({ embeds: configureServer(), files: [startScreen, serverConnection] })
} else if (guideSelection.customId === 'login') { } else if (guideSelection.customId === 'login') {
const userDMChannel = await guideSelection.user.createDM() const userDMChannel = await guideSelection.user.createDM()
userDMChannel.send({ embeds: loginInfo(), files: [accountChoice, loginScreen] }) userDMChannel.send({ embeds: loginInfo(), files: [accountChoice, loginScreen] })
} else if (guideSelection.customId === 'useSyncGroup') { } else if (guideSelection.customId === 'useSyncGroup') {
const userDMChannel = await guideSelection.user.createDM() const userDMChannel = await guideSelection.user.createDM()
userDMChannel.send({ embeds: useSyncgroup(), files: [overview, joingroup, resume, leavegroup] }) userDMChannel.send({ embeds: useSyncgroup(), files: [overview, joingroup, resume, leavegroup] })
} else if (guideSelection.customId === 'explainRoles') { } else if (guideSelection.customId === 'explainRoles') {
const userDMChannel = await guideSelection.user.createDM() const userDMChannel = await guideSelection.user.createDM()
userDMChannel.send({ embeds: explainRole() }) userDMChannel.send({ embeds: explainRole() })
} }
guideSelection.update({ content: "Hab ich dir per DM geschickt :)", components: [] }) guideSelection.update({ content: "Hab ich dir per DM geschickt :)", components: [] })
} catch (error) { } catch (error) {
await interaction.interaction.editReply({ content: 'Das dauert mir zu lange, frag mich nochmal wenn du nen Guide brauchst', components: [] }); await interaction.interaction.editReply({ content: 'Das dauert mir zu lange, frag mich nochmal wenn du nen Guide brauchst', components: [] });
} }
} }
}) })

View File

@ -7,139 +7,139 @@ import { attachmentImages } from '../..'
const color = 0x0099FF const color = 0x0099FF
export default new Command({ export default new Command({
name: 'mitgucken', name: 'mitgucken',
description: 'Erfahre wie die Verbindung mit Jellyfin funktioniert und eine WatchTogether Gruppe funktioniert.', description: 'Erfahre wie die Verbindung mit Jellyfin funktioniert und eine WatchTogether Gruppe funktioniert.',
options: [], options: [],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
const requestId = uuid() const requestId = uuid()
interaction.interaction.followUp('Ich schicke dir einen Guide per DM!') interaction.interaction.followUp('Ich schicke dir einen Guide per DM!')
const embedList: APIEmbed[] = [] const embedList: APIEmbed[] = []
embedList.push(...installation()) embedList.push(...installation())
embedList.push(...configureServer()) embedList.push(...configureServer())
embedList.push(...explainRole()) embedList.push(...explainRole())
embedList.push(...loginInfo()) embedList.push(...loginInfo())
embedList.push(...useSyncgroup()) embedList.push(...useSyncgroup())
//logger.info(`Trying to use ${splashScreen.name}`, { requestId, guildId: interaction.interaction.guild?.id }) //logger.info(`Trying to use ${splashScreen.name}`, { requestId, guildId: interaction.interaction.guild?.id })
logger.info(`Sending guide to ${interaction.interaction.user.id}`, { requestId, guildId: interaction.interaction.guild?.id }) logger.info(`Sending guide to ${interaction.interaction.user.id}`, { requestId, guildId: interaction.interaction.guild?.id })
const userDMchannel = await interaction.interaction.user.createDM() const userDMchannel = await interaction.interaction.user.createDM()
userDMchannel.send({ embeds: embedList, files: attachmentImages }) userDMchannel.send({ embeds: embedList, files: attachmentImages })
} }
}) })
export function explainRole(): APIEmbed[] { export function explainRole(): APIEmbed[] {
return [{ return [{
color, color,
title: "Wie du an einen Account kommst", title: "Wie du an einen Account kommst",
description: roleExplanation description: roleExplanation
}] }]
} }
export function installation(): APIEmbed[] { export function installation(): APIEmbed[] {
const embedList: APIEmbed[] = [] const embedList: APIEmbed[] = []
// DownloadLink and installation // DownloadLink and installation
embedList.push({ embedList.push({
color, color,
title: 'Jellyfin Media Player Installation', title: 'Jellyfin Media Player Installation',
description: 'Du kannst den Jellyfin Media Player von github herunterladen.\n Der Mediaplayer muss genutzt werden, da ein Schauen direkt über das Webinterface den Server zum Schmelzen bringt.\nFühre die Datei aus und installiere den Jellyfin Media Player an den Ort deiner Wahl.', description: 'Du kannst den Jellyfin Media Player von github herunterladen.\n Der Mediaplayer muss genutzt werden, da ein Schauen direkt über das Webinterface den Server zum Schmelzen bringt.\nFühre die Datei aus und installiere den Jellyfin Media Player an den Ort deiner Wahl.',
fields: [ fields: [
{ name: "Windows", value: "https://github.com/jellyfin/jellyfin-media-player/releases/download/v1.9.1/JellyfinMediaPlayer-1.9.1-windows-x64.exe" }, { name: "Windows", value: "https://github.com/jellyfin/jellyfin-media-player/releases/download/v1.9.1/JellyfinMediaPlayer-1.9.1-windows-x64.exe" },
{ name: "Mac", value: "https://github.com/jellyfin/jellyfin-media-player/releases/download/v1.9.1/JellyfinMediaPlayer-1.9.1-macos-notarized.dmg" } { name: "Mac", value: "https://github.com/jellyfin/jellyfin-media-player/releases/download/v1.9.1/JellyfinMediaPlayer-1.9.1-macos-notarized.dmg" }
], ],
image: { image: {
url: 'attachment://set_splashscreen.png' url: 'attachment://set_splashscreen.png'
} }
}) })
return embedList return embedList
} }
export function configureServer(): APIEmbed[] { export function configureServer(): APIEmbed[] {
const embedList: APIEmbed[] = [] const embedList: APIEmbed[] = []
// Login // Login
embedList.push({ embedList.push({
color, color,
title: "Server Auswahl", title: "Server Auswahl",
description: "Die Jellyfin App kann sich mit mehreren Servern verbinden.\n Hattest du noch nie eine Server Verbindung wähle hier 'Server hinzufügen'.", description: "Die Jellyfin App kann sich mit mehreren Servern verbinden.\n Hattest du noch nie eine Server Verbindung wähle hier 'Server hinzufügen'.",
image: { image: {
url: 'attachment://start_screen.png' url: 'attachment://start_screen.png'
} }
}) })
// Server Address // Server Address
embedList.push({ embedList.push({
color, color,
title: "Server Verbindung", title: "Server Verbindung",
description: "Stelle eine Verbindung zum Hartzarett Jellyfin Server her", description: "Stelle eine Verbindung zum Hartzarett Jellyfin Server her",
fields: [ fields: [
{ name: "Server Adresse", value: "`https://media.hartzarett.ruhr`" } { name: "Server Adresse", value: "`https://media.hartzarett.ruhr`" }
], ],
image: { image: {
url: 'attachment://server_verbindung.png' url: 'attachment://server_verbindung.png'
} }
}) })
return embedList return embedList
} }
export function loginInfo(): APIEmbed[] { export function loginInfo(): APIEmbed[] {
const embedList: APIEmbed[] = [] const embedList: APIEmbed[] = []
// Account choice // Account choice
embedList.push({ embedList.push({
color, color,
title: "Account Auswahl", title: "Account Auswahl",
description: "In der Regel sind die Accounts aus Datenschutzgründen versteckt.\nWähle 'Manuelle Anmeldung' aus", description: "In der Regel sind die Accounts aus Datenschutzgründen versteckt.\nWähle 'Manuelle Anmeldung' aus",
image: { image: {
url: 'attachment://auswahl_anmeldung.png' url: 'attachment://auswahl_anmeldung.png'
} }
}) })
// password screen // password screen
embedList.push({ embedList.push({
color, color,
title: "Login", title: "Login",
description: "Melde dich mit dem Usernamen und Passwort an, welches dir von mir zugeschickt wird. Falls du ein neues brauchst führe einmal `/passwort_reset` aus :)", description: "Melde dich mit dem Usernamen und Passwort an, welches dir von mir zugeschickt wird. Falls du ein neues brauchst führe einmal `/passwort_reset` aus :)",
image: { image: {
url: 'attachment://login_screen.png' url: 'attachment://login_screen.png'
} }
}) })
return embedList return embedList
} }
export function useSyncgroup(): APIEmbed[] { export function useSyncgroup(): APIEmbed[] {
const embedList: APIEmbed[] = [] const embedList: APIEmbed[] = []
embedList.push({ embedList.push({
color, color,
title: "SyncPlay Menü", title: "SyncPlay Menü",
image: { image: {
url: 'attachment://jellyfin_ubersicht.png' url: 'attachment://jellyfin_ubersicht.png'
}, },
description: "Im Hauptbildschirm findest du die 'SyncPlay' Einstellungen oben rechts.", description: "Im Hauptbildschirm findest du die 'SyncPlay' Einstellungen oben rechts.",
}) })
// join group // join group
embedList.push({ embedList.push({
color, color,
title: "Gruppe beitreten", title: "Gruppe beitreten",
image: { image: {
url: 'attachment://gruppe_beitreten.png' url: 'attachment://gruppe_beitreten.png'
}, },
description: "Suche dir aus dem Dropdown die SyncPlay Gruppe aus, die zu deinem Event gehört.", description: "Suche dir aus dem Dropdown die SyncPlay Gruppe aus, die zu deinem Event gehört.",
}) })
// leave group // leave group
embedList.push({ embedList.push({
color, color,
title: "Gruppe verlassen", title: "Gruppe verlassen",
image: { image: {
url: 'attachment://gruppe_verlassen.png' url: 'attachment://gruppe_verlassen.png'
}, },
description: "Wenn du die Watchparty verlassen möchtest, kannst du das ebenfalls über das Menü oben rechts tun.", description: "Wenn du die Watchparty verlassen möchtest, kannst du das ebenfalls über das Menü oben rechts tun.",
}) })
//resume playback //resume playback
embedList.push({ embedList.push({
color, color,
title: "Wiedergabe fortsetzen", title: "Wiedergabe fortsetzen",
image: { image: {
url: 'attachment://wiedergabe_fortsetzen.png' url: 'attachment://wiedergabe_fortsetzen.png'
}, },
description: "Wenn du aus der Watchparty rausgeflogen bist, oder die Wiedergabe verlassen hast, kannst du über das Menü oben rechts auch wieder zurückkehren.", description: "Wenn du aus der Watchparty rausgeflogen bist, oder die Wiedergabe verlassen hast, kannst du über das Menü oben rechts auch wieder zurückkehren.",
}) })
return embedList return embedList
} }
const roleExplanation = `Mit einer Rolle kann dafür gesorgt werden, dass du einen dauerhaften Account auf dem Mediaserver hast. Wende dich bei Bedarf an Samantha oder Markus.\n const roleExplanation = `Mit einer Rolle kann dafür gesorgt werden, dass du einen dauerhaften Account auf dem Mediaserver hast. Wende dich bei Bedarf an Samantha oder Markus.\n

View File

@ -4,13 +4,13 @@ import { Command } from '../structures/command'
import { RunOptions } from '../types/commandTypes' import { RunOptions } from '../types/commandTypes'
export default new Command({ export default new Command({
name: 'passwort_reset', name: 'passwort_reset',
description: 'Ich vergebe dir ein neues Passwort und schicke es dir per DM zu. Kostet auch nix! Versprochen! 😉', description: 'Ich vergebe dir ein neues Passwort und schicke es dir per DM zu. Kostet auch nix! Versprochen! 😉',
options: [], options: [],
run: async (interaction: RunOptions) => { run: async (interaction: RunOptions) => {
console.log('PasswortReset called') console.log('PasswortReset called')
interaction.interaction.followUp('Yo, ich schick dir eins!') interaction.interaction.followUp('Yo, ich schick dir eins!')
console.log(JSON.stringify(interaction.interaction.member, null, 2)) console.log(JSON.stringify(interaction.interaction.member, null, 2))
jellyfinHandler.resetUserPasswort(interaction.interaction.member, uuid()) jellyfinHandler.resetUserPasswort(interaction.interaction.member, uuid())
} }
}) })

View File

@ -10,39 +10,39 @@ import { logger } from "../logger";
export const name = 'guildScheduledEventCreate' export const name = 'guildScheduledEventCreate'
export async function execute(event: GuildScheduledEvent) { export async function execute(event: GuildScheduledEvent) {
const guildId = event.guildId const guildId = event.guildId
const requestId = uuid() const requestId = uuid()
try { try {
if (!event.description) { if (!event.description) {
logger.debug("Got GuildScheduledEventCreate event. But has no description. Aborting.") logger.debug("Got GuildScheduledEventCreate event. But has no description. Aborting.")
return return
} }
if (event.description.includes("!wp")) { if (event.description.includes("!wp")) {
logger.info("Got manual create event of watchparty event!", { guildId, requestId }) logger.info("Got manual create event of watchparty event!", { guildId, requestId })
if (event.description.includes("!private")) { if (event.description.includes("!private")) {
logger.info("Event description contains \"!private\". Won't announce.", { guildId, requestId }) logger.info("Event description contains \"!private\". Won't announce.", { guildId, requestId })
return return
} }
const channel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId) const channel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(guildId)
if (!channel) { if (!channel) {
logger.error("Could not obtain announcement channel. Aborting announcement.", { guildId, requestId }) logger.error("Could not obtain announcement channel. Aborting announcement.", { guildId, requestId })
return return
} }
const message = `[Watchparty] https://discord.com/events/${event.guildId}/${event.id} \nHey <@&${config.bot.announcement_role}>, wir gucken ${event.name} ${createDateStringFromEvent(event, guildId, requestId)}` const message = `[Watchparty] https://discord.com/events/${event.guildId}/${event.id} \nHey <@&${config.bot.announcement_role}>, wir gucken ${event.name} ${createDateStringFromEvent(event, guildId, requestId)}`
channel.send(message) channel.send(message)
} else { } else {
logger.debug("Got GuildScheduledEventCreate event but no !wp in description. Not creating manual wp announcement.", { guildId, requestId }) logger.debug("Got GuildScheduledEventCreate event but no !wp in description. Not creating manual wp announcement.", { guildId, requestId })
} }
} catch (error) { } catch (error) {
// sendFailureDM(error) // sendFailureDM(error)
logger.error(<string>error, { guildId, requestId }) logger.error(<string>error, { guildId, requestId })
} }
} }

View File

@ -16,48 +16,48 @@ export const NONE_OF_THAT = "❌"
export let task: ScheduledTask | undefined export let task: ScheduledTask | undefined
export async function execute(event: GuildScheduledEvent) { export async function execute(event: GuildScheduledEvent) {
const requestId = uuid() const requestId = uuid()
if (event.name.toLowerCase().includes("!nextwp")) { if (event.name.toLowerCase().includes("!nextwp")) {
logger.info("Event was a placeholder event to start a new watchparty and voting. Creating vote!", { guildId: event.guildId, requestId }) logger.info("Event was a placeholder event to start a new watchparty and voting. Creating vote!", { guildId: event.guildId, requestId })
logger.debug("Renaming event", { guildId: event.guildId, requestId }) logger.debug("Renaming event", { guildId: event.guildId, requestId })
event.edit({ name: "Watchparty - Voting offen" }) event.edit({ name: "Watchparty - Voting offen" })
const movies = await yavinJellyfinHandler.getRandomMovieNames(5, event.guildId, requestId) const movies = await yavinJellyfinHandler.getRandomMovieNames(5, event.guildId, requestId)
logger.info(`Got ${movies.length} random movies. Creating voting`, { guildId: event.guildId, requestId }) logger.info(`Got ${movies.length} random movies. Creating voting`, { guildId: event.guildId, requestId })
logger.debug(`Movies: ${JSON.stringify(movies)}`, { guildId: event.guildId, requestId }) logger.debug(`Movies: ${JSON.stringify(movies)}`, { guildId: event.guildId, requestId })
const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(event.guildId) const announcementChannel: Maybe<TextChannel> = client.getAnnouncementChannelForGuild(event.guildId)
if (!announcementChannel) { if (!announcementChannel) {
logger.error("Could not find announcement channel. Aborting", { guildId: event.guildId, requestId }) logger.error("Could not find announcement channel. Aborting", { guildId: event.guildId, requestId })
return return
} }
logger.debug(`Found channel ${JSON.stringify(announcementChannel, null, 2)}`, { guildId: event.guildId, requestId }) logger.debug(`Found channel ${JSON.stringify(announcementChannel, null, 2)}`, { guildId: event.guildId, requestId })
if (!event.scheduledStartAt) { if (!event.scheduledStartAt) {
logger.info("EVENT DOES NOT HAVE STARTDATE; CANCELLING", { guildId: event.guildId, requestId }) logger.info("EVENT DOES NOT HAVE STARTDATE; CANCELLING", { guildId: event.guildId, requestId })
return return
} }
let message = `[Abstimmung] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Es gibt eine neue Abstimmung für die nächste Watchparty ${createDateStringFromEvent(event, event.guildId, requestId)}! Stimme hierunter für den nächsten Film ab!\n` let message = `[Abstimmung] für https://discord.com/events/${event.guildId}/${event.id}\n<@&${config.bot.announcement_role}> Es gibt eine neue Abstimmung für die nächste Watchparty ${createDateStringFromEvent(event, event.guildId, requestId)}! Stimme hierunter für den nächsten Film ab!\n`
for (let i = 0; i < movies.length; i++) { for (let i = 0; i < movies.length; i++) {
message = message.concat(Emotes[i]).concat(": ").concat(movies[i]).concat("\n") message = message.concat(Emotes[i]).concat(": ").concat(movies[i]).concat("\n")
} }
message = message.concat(NONE_OF_THAT).concat(": Wenn dir nichts davon gefällt.") message = message.concat(NONE_OF_THAT).concat(": Wenn dir nichts davon gefällt.")
const options: MessageCreateOptions = { const options: MessageCreateOptions = {
allowedMentions: { parse: ["roles"] }, allowedMentions: { parse: ["roles"] },
content: message, content: message,
} }
const sentMessage: Message<true> = await (await announcementChannel.fetch()).send(options) const sentMessage: Message<true> = await (await announcementChannel.fetch()).send(options)
for (let i = 0; i < movies.length; i++) { for (let i = 0; i < movies.length; i++) {
sentMessage.react(Emotes[i]) sentMessage.react(Emotes[i])
} }
sentMessage.react(NONE_OF_THAT) sentMessage.react(NONE_OF_THAT)
// sentMessage.pin() //todo: uncomment when bot has permission to pin messages. Also update closepoll.ts to only fetch pinned messages // sentMessage.pin() //todo: uncomment when bot has permission to pin messages. Also update closepoll.ts to only fetch pinned messages
} }
} }

View File

@ -7,46 +7,46 @@ import { logger } from "../logger";
export const name = 'guildScheduledEventUpdate' export const name = 'guildScheduledEventUpdate'
export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildScheduledEvent) { export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildScheduledEvent) {
const requestId = uuid() const requestId = uuid()
try { try {
if (!newEvent.guild) { if (!newEvent.guild) {
logger.error("Event has no guild, aborting.", { guildId: newEvent.guildId, requestId }) logger.error("Event has no guild, aborting.", { guildId: newEvent.guildId, requestId })
return return
} }
const guildId = newEvent.guildId const guildId = newEvent.guildId
if (newEvent.description?.toLowerCase().includes("!wp") && newEvent.status === GuildScheduledEventStatus.Completed) { if (newEvent.description?.toLowerCase().includes("!wp") && newEvent.status === GuildScheduledEventStatus.Completed) {
logger.info("A watchparty ended. Cleaning up announcements!", { guildId, requestId }) logger.info("A watchparty ended. Cleaning up announcements!", { guildId, requestId })
const announcementChannel = client.getAnnouncementChannelForGuild(newEvent.guild.id) const announcementChannel = client.getAnnouncementChannelForGuild(newEvent.guild.id)
if (!announcementChannel) { if (!announcementChannel) {
logger.error("Could not find announcement channel. Aborting", { guildId: newEvent.guild.id, requestId }) logger.error("Could not find announcement channel. Aborting", { guildId: newEvent.guild.id, requestId })
return return
} }
const events = await newEvent.guild.scheduledEvents.fetch() const events = await newEvent.guild.scheduledEvents.fetch()
const wpAnnouncements = (await announcementChannel.messages.fetch()).filter(message => !message.cleanContent.includes("[initial]")) const wpAnnouncements = (await announcementChannel.messages.fetch()).filter(message => !message.cleanContent.includes("[initial]"))
const announcementsWithoutEvent = filterAnnouncementsByPendingWPs(wpAnnouncements, events) const announcementsWithoutEvent = filterAnnouncementsByPendingWPs(wpAnnouncements, events)
logger.info(`Deleting ${announcementsWithoutEvent.length} announcements.`, { guildId, requestId }) logger.info(`Deleting ${announcementsWithoutEvent.length} announcements.`, { guildId, requestId })
announcementsWithoutEvent.forEach(message => message.delete()) announcementsWithoutEvent.forEach(message => message.delete())
} }
} catch (error) { } catch (error) {
logger.error(<string>error, { guildId: newEvent.guildId, requestId }) logger.error(<string>error, { guildId: newEvent.guildId, requestId })
} }
} }
function filterAnnouncementsByPendingWPs(messages: Collection<string, Message<true>>, events: Collection<string, GuildScheduledEvent<GuildScheduledEventStatus>>): Message<true>[] { function filterAnnouncementsByPendingWPs(messages: Collection<string, Message<true>>, events: Collection<string, GuildScheduledEvent<GuildScheduledEventStatus>>): Message<true>[] {
const filteredMessages: Message<true>[] = [] const filteredMessages: Message<true>[] = []
for (const message of messages.values()) { for (const message of messages.values()) {
let foundEventForMessage = false let foundEventForMessage = false
for (const event of events.values()) { for (const event of events.values()) {
if (message.cleanContent.includes(event.id)) { //announcement always has eventid because of eventbox if (message.cleanContent.includes(event.id)) { //announcement always has eventid because of eventbox
foundEventForMessage = true foundEventForMessage = true
} }
} }
if (!foundEventForMessage) { if (!foundEventForMessage) {
filteredMessages.push(message) filteredMessages.push(message)
} }
} }
return filteredMessages return filteredMessages
} }

View File

@ -6,24 +6,24 @@ import { v4 as uuid } from "uuid"
export const name = 'guildMemberUpdate' export const name = 'guildMemberUpdate'
export async function execute(oldMember: GuildMember, newMember: GuildMember) { export async function execute(oldMember: GuildMember, newMember: GuildMember) {
try { try {
const requestId = uuid() const requestId = uuid()
const changedRoles: ChangedRoles = filterRolesFromMemberUpdate(oldMember, newMember) const changedRoles: ChangedRoles = filterRolesFromMemberUpdate(oldMember, newMember)
const triggerRoleIds: Collection<string, PermissionLevel> = getGuildSpecificTriggerRoleId() const triggerRoleIds: Collection<string, PermissionLevel> = getGuildSpecificTriggerRoleId()
triggerRoleIds.forEach((level, key) => { triggerRoleIds.forEach((level, key) => {
const addedRoleMatches = changedRoles.addedRoles.find(aRole => aRole.id === key) const addedRoleMatches = changedRoles.addedRoles.find(aRole => aRole.id === key)
if (addedRoleMatches) { if (addedRoleMatches) {
jellyfinHandler.upsertUser(newMember, level, requestId) jellyfinHandler.upsertUser(newMember, level, requestId)
} }
const removedRoleMatches = changedRoles.removedRoles.find(rRole => rRole.id === key) const removedRoleMatches = changedRoles.removedRoles.find(rRole => rRole.id === key)
if (removedRoleMatches) { if (removedRoleMatches) {
jellyfinHandler.removeUser(newMember, level, requestId) jellyfinHandler.removeUser(newMember, level, requestId)
} }
}) })
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} }

View File

@ -9,51 +9,51 @@ export const name = 'voiceStateUpdate'
export async function execute(oldState: VoiceState, newState: VoiceState) { export async function execute(oldState: VoiceState, newState: VoiceState) {
try { try {
logger.info(JSON.stringify(newState, null, 2)) logger.info(JSON.stringify(newState, null, 2))
//ignore events like mute/unmute //ignore events like mute/unmute
if (newState.channel?.id === oldState.channel?.id) { if (newState.channel?.id === oldState.channel?.id) {
logger.info("Not handling VoiceState event because channelid of old and new was the same (i.e. mute/unmute event)") logger.info("Not handling VoiceState event because channelid of old and new was the same (i.e. mute/unmute event)")
return return
} }
const scheduledEvents = (await newState.guild.scheduledEvents.fetch()) const scheduledEvents = (await newState.guild.scheduledEvents.fetch())
.filter((key) => key.description?.toLowerCase().includes("!wp") && key.isActive()) .filter((key) => key.description?.toLowerCase().includes("!wp") && key.isActive())
.map((key) => key) .map((key) => key)
const scheduledEventUsers = (await Promise.all(scheduledEvents.map(event => event.fetchSubscribers({ withMember: true })))) const scheduledEventUsers = (await Promise.all(scheduledEvents.map(event => event.fetchSubscribers({ withMember: true }))))
//Dont handle users, that are already subscribed to the event. We only want to handle unsubscribed users here //Dont handle users, that are already subscribed to the event. We only want to handle unsubscribed users here
let userFound = false; let userFound = false;
scheduledEventUsers.forEach(collection => { scheduledEventUsers.forEach(collection => {
collection.each(key => { collection.each(key => {
logger.info(JSON.stringify(key, null, 2)) logger.info(JSON.stringify(key, null, 2))
if (key.member.user.id === newState.member?.user.id) if (key.member.user.id === newState.member?.user.id)
userFound = true; userFound = true;
}) })
}) })
if (userFound) { if (userFound) {
logger.info(`Not handling VoiceState event because user was already subscribed and got an account from there. User: ${JSON.stringify(newState.member, null, 2)}`) logger.info(`Not handling VoiceState event because user was already subscribed and got an account from there. User: ${JSON.stringify(newState.member, null, 2)}`)
return return
} }
if (scheduledEvents.find(event => event.channelId === newState.channelId)) { if (scheduledEvents.find(event => event.channelId === newState.channelId)) {
if (newState.member) { if (newState.member) {
logger.info("YO! Da ist jemand dem Channel mit dem Event beigetreten, ich kümmer mich mal um nen Account!") logger.info("YO! Da ist jemand dem Channel mit dem Event beigetreten, ich kümmer mich mal um nen Account!")
const result = await jellyfinHandler.upsertUser(newState.member, "TEMPORARY", uuid()) const result = await jellyfinHandler.upsertUser(newState.member, "TEMPORARY", uuid())
if (result === UserUpsertResult.created) { if (result === UserUpsertResult.created) {
newState.member.createDM().then(channel => channel.send(`Hey! Du bist unserer Watchparty beigetreten, ich hab dir gerade die Zugangsdaten für den Mediaserver geschickt!`)) newState.member.createDM().then(channel => channel.send(`Hey! Du bist unserer Watchparty beigetreten, ich hab dir gerade die Zugangsdaten für den Mediaserver geschickt!`))
} else { } else {
newState.member.createDM().then(channel => channel.send(`Hey! Du bist unserer Watchparty beigetreten aber du hast bereits einen Account. Falls du ein neues Passwort brauchst nutze /reset_passwort!`)) newState.member.createDM().then(channel => channel.send(`Hey! Du bist unserer Watchparty beigetreten aber du hast bereits einen Account. Falls du ein neues Passwort brauchst nutze /reset_passwort!`))
} }
} else { } else {
logger.error("WTF? Expected Member?? When doing things") logger.error("WTF? Expected Member?? When doing things")
} }
} else { } else {
logger.info("VoiceState channelId was not the id of any channel with events") logger.info("VoiceState channelId was not the id of any channel with events")
} }
} catch (error) { } catch (error) {
logger.error(error) logger.error(error)
} }
} }

View File

@ -8,51 +8,51 @@ import { logger } from "../logger";
export const name = 'guildScheduledEventUpdate' export const name = 'guildScheduledEventUpdate'
export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildScheduledEvent) { export async function execute(oldEvent: GuildScheduledEvent, newEvent: GuildScheduledEvent) {
try { try {
const requestId = uuid() const requestId = uuid()
// logger.debug(`Got scheduledEvent update. New Event: ${JSON.stringify(newEvent, null, 2)}`, { guildId: newEvent.guildId, requestId }) // logger.debug(`Got scheduledEvent update. New Event: ${JSON.stringify(newEvent, null, 2)}`, { guildId: newEvent.guildId, requestId })
if (!newEvent.guild) { if (!newEvent.guild) {
logger.error("Event has no guild, aborting.", { guildId: newEvent.guildId, requestId }) logger.error("Event has no guild, aborting.", { guildId: newEvent.guildId, requestId })
return return
} }
if (newEvent.description?.toLowerCase().includes("!wp") && [GuildScheduledEventStatus.Active, GuildScheduledEventStatus.Completed].includes(newEvent.status)) { if (newEvent.description?.toLowerCase().includes("!wp") && [GuildScheduledEventStatus.Active, GuildScheduledEventStatus.Completed].includes(newEvent.status)) {
const roles = getGuildSpecificTriggerRoleId().map((key, value) => value) const roles = getGuildSpecificTriggerRoleId().map((key, value) => value)
const eventMembers = (await newEvent.fetchSubscribers({ withMember: true })).filter(member => !member.member.roles.cache.hasAny(...roles)).map((value) => value.member) const eventMembers = (await newEvent.fetchSubscribers({ withMember: true })).filter(member => !member.member.roles.cache.hasAny(...roles)).map((value) => value.member)
const channelMembers = newEvent.channel?.members.filter(member => !member.roles.cache.hasAny(...roles)).map((value) => value) const channelMembers = newEvent.channel?.members.filter(member => !member.roles.cache.hasAny(...roles)).map((value) => value)
const allMembers = eventMembers.concat(channelMembers ?? []) const allMembers = eventMembers.concat(channelMembers ?? [])
const members: GuildMember[] = [] const members: GuildMember[] = []
for (const member of allMembers) { for (const member of allMembers) {
if (!members.find(x => x.id == member.id)) if (!members.find(x => x.id == member.id))
members.push(member) members.push(member)
} }
if (newEvent.status === GuildScheduledEventStatus.Active) if (newEvent.status === GuildScheduledEventStatus.Active)
createJFUsers(members, newEvent.name, requestId) createJFUsers(members, newEvent.name, requestId)
else { else {
members.forEach(member => { members.forEach(member => {
member.createDM().then(channel => channel.send(`Die Watchparty ist vorbei, dein Account wurde wieder gelöscht. Wenn du einen permanenten Account haben möchtest, melde dich bei Samantha oder Marukus.`)) member.createDM().then(channel => channel.send(`Die Watchparty ist vorbei, dein Account wurde wieder gelöscht. Wenn du einen permanenten Account haben möchtest, melde dich bei Samantha oder Marukus.`))
}) })
deleteJFUsers(newEvent.guildId, requestId) deleteJFUsers(newEvent.guildId, requestId)
} }
} }
} catch (error) { } catch (error) {
logger.error(error) logger.error(error)
} }
} }
async function createJFUsers(members: GuildMember[], movieName: string, requestId?: string) { async function createJFUsers(members: GuildMember[], movieName: string, requestId?: string) {
logger.info(`Creating users for: \n ${JSON.stringify(members, null, 2)}`) logger.info(`Creating users for: \n ${JSON.stringify(members, null, 2)}`)
members.forEach(member => { members.forEach(member => {
member.createDM().then(channel => channel.send(`Hey! Du hast dich für die Watchparty von ${movieName} angemeldet! Es geht gleich los!`)) member.createDM().then(channel => channel.send(`Hey! Du hast dich für die Watchparty von ${movieName} angemeldet! Es geht gleich los!`))
jellyfinHandler.upsertUser(member, "TEMPORARY", requestId) jellyfinHandler.upsertUser(member, "TEMPORARY", requestId)
}) })
} }
async function deleteJFUsers(guildId: string, requestId?: string) { async function deleteJFUsers(guildId: string, requestId?: string) {
logger.info(`Watchparty ended, deleting tmp users`, { guildId, requestId }) logger.info(`Watchparty ended, deleting tmp users`, { guildId, requestId })
jellyfinHandler.purge(guildId, requestId) jellyfinHandler.purge(guildId, requestId)
} }

View File

@ -5,17 +5,17 @@ import { logger } from "../logger"
export const name = 'interactionCreate' export const name = 'interactionCreate'
export async function execute(interaction: ExtendedInteraction) { export async function execute(interaction: ExtendedInteraction) {
//console.dir(interaction, { depth: null }) //console.dir(interaction, { depth: null })
if (interaction.isCommand()) { if (interaction.isCommand()) {
logger.info(`Interaction is a command.`, { guildId: interaction.guild?.id }) logger.info(`Interaction is a command.`, { guildId: interaction.guild?.id })
await interaction.deferReply({ ephemeral: true }) await interaction.deferReply({ ephemeral: true })
const command = client.commands.get(interaction.commandName) const command = client.commands.get(interaction.commandName)
if (!command) if (!command)
return interaction.followUp('Invalid command') return interaction.followUp('Invalid command')
command.run({ command.run({
args: interaction.options as CommandInteractionOptionResolver, args: interaction.options as CommandInteractionOptionResolver,
client, client,
interaction interaction
}) })
} }
} }

View File

@ -2,5 +2,5 @@ import { Message } from "discord.js"
export const name = 'messageCreate' export const name = 'messageCreate'
export function execute(message: Message) { export function execute(message: Message) {
console.log(`${JSON.stringify(message)} has been created`) console.log(`${JSON.stringify(message)} has been created`)
} }

View File

@ -5,19 +5,19 @@ import { logger } from "../logger";
import de from "date-fns/locale/de"; import de from "date-fns/locale/de";
export function createDateStringFromEvent(event: GuildScheduledEvent, requestId: string, guildId?: string): string { export function createDateStringFromEvent(event: GuildScheduledEvent, requestId: string, guildId?: string): string {
if (!event.scheduledStartAt) { if (!event.scheduledStartAt) {
logger.error("Event has no start. Cannot create dateString.", { guildId, requestId }) logger.error("Event has no start. Cannot create dateString.", { guildId, requestId })
return `"habe keinen Startzeitpunkt ermitteln können"` return `"habe keinen Startzeitpunkt ermitteln können"`
} }
const timeZone = 'Europe/Berlin' const timeZone = 'Europe/Berlin'
const zonedDateTime = utcToZonedTime(event.scheduledStartAt, timeZone) const zonedDateTime = utcToZonedTime(event.scheduledStartAt, timeZone)
const time = format(zonedDateTime, "HH:mm", { locale: de }) const time = format(zonedDateTime, "HH:mm", { locale: de })
if (isToday(zonedDateTime)) { if (isToday(zonedDateTime)) {
return `heute um ${time}` return `heute um ${time}`
} }
const date = format(zonedDateTime, "eeee dd.MM", { locale: de }) const date = format(zonedDateTime, "eeee dd.MM", { locale: de })
return `am ${date} um ${time}` return `am ${date} um ${time}`
} }

View File

@ -5,20 +5,20 @@ import { config } from "../configuration"
export function filterRolesFromMemberUpdate(oldMember: GuildMember, newMember: GuildMember): ChangedRoles { export function filterRolesFromMemberUpdate(oldMember: GuildMember, newMember: GuildMember): ChangedRoles {
const oldRoles = oldMember.roles.cache const oldRoles = oldMember.roles.cache
const newRoles = newMember.roles.cache const newRoles = newMember.roles.cache
const removedRoles = oldRoles.filter(x => newRoles.find(y => y.id === x.id) == undefined) const removedRoles = oldRoles.filter(x => newRoles.find(y => y.id === x.id) == undefined)
const addedRoles = newRoles.filter(x => oldRoles.find(y => y.id === x.id) == undefined) const addedRoles = newRoles.filter(x => oldRoles.find(y => y.id === x.id) == undefined)
logger.info(`Member ${oldMember.id} RemovedRoles: ${removedRoles.map(x => x.name)}`, { guildId: oldMember.guild.id }) logger.info(`Member ${oldMember.id} RemovedRoles: ${removedRoles.map(x => x.name)}`, { guildId: oldMember.guild.id })
logger.info(`Member ${oldMember.id} AddedRoles: ${addedRoles.map(x => x.name)}`, { guildId: oldMember.guild.id }) logger.info(`Member ${oldMember.id} AddedRoles: ${addedRoles.map(x => x.name)}`, { guildId: oldMember.guild.id })
return { addedRoles, removedRoles } return { addedRoles, removedRoles }
} }
export function getGuildSpecificTriggerRoleId(): Collection<string, PermissionLevel> { export function getGuildSpecificTriggerRoleId(): Collection<string, PermissionLevel> {
const outVal = new Collection<string, PermissionLevel>() const outVal = new Collection<string, PermissionLevel>()
outVal.set(config.bot.watcher_role, "VIEWER") outVal.set(config.bot.watcher_role, "VIEWER")
outVal.set(config.bot.jf_admin_role, "ADMIN") outVal.set(config.bot.jf_admin_role, "ADMIN")
return outVal return outVal
} }

View File

@ -2,11 +2,11 @@ import { CustomError, errorCodes } from "../interfaces"
import { ExtendedClient } from "../structures/client" import { ExtendedClient } from "../structures/client"
export async function sendFailureDM(creatorMessage: string, client: ExtendedClient, creatorId?: string): Promise<void> { export async function sendFailureDM(creatorMessage: string, client: ExtendedClient, creatorId?: string): Promise<void> {
if (!creatorId) throw new CustomError('No creator ID present', errorCodes.no_creator_id) if (!creatorId) throw new CustomError('No creator ID present', errorCodes.no_creator_id)
const creator = await client.users.fetch(creatorId) const creator = await client.users.fetch(creatorId)
console.log(`Creator ${JSON.stringify(creator)}`) console.log(`Creator ${JSON.stringify(creator)}`)
if (creator) if (creator)
if (!creator.dmChannel) if (!creator.dmChannel)
await creator.createDM() await creator.createDM()
await creator.dmChannel?.send(creatorMessage) await creator.dmChannel?.send(creatorMessage)
} }

View File

@ -9,275 +9,275 @@ import { Configuration, ConfigurationParameters } from "./runtime";
export class JellyfinHandler { export class JellyfinHandler {
private userApi: UserApi private userApi: UserApi
private systemApi: SystemApi private systemApi: SystemApi
private moviesApi: ItemsApi private moviesApi: ItemsApi
private token: string private token: string
private authHeader: { headers: { 'X-Emby-Authorization': string } } private authHeader: { headers: { 'X-Emby-Authorization': string } }
private config: JellyfinConfig private config: JellyfinConfig
private serverName = ""; private serverName = "";
constructor(_config: JellyfinConfig, _userApi?: UserApi, _systemApi?: SystemApi, _itemsApi?: ItemsApi) { constructor(_config: JellyfinConfig, _userApi?: UserApi, _systemApi?: SystemApi, _itemsApi?: ItemsApi) {
this.config = _config this.config = _config
this.token = this.config.jellyfinToken this.token = this.config.jellyfinToken
this.authHeader = { this.authHeader = {
headers: { headers: {
"X-Emby-Authorization": this.config.jellyfinToken "X-Emby-Authorization": this.config.jellyfinToken
} }
} }
const userApiConfigurationParams: ConfigurationParameters = { const userApiConfigurationParams: ConfigurationParameters = {
basePath: this.config.jellyfinUrl, basePath: this.config.jellyfinUrl,
headers: this.authHeader.headers headers: this.authHeader.headers
} }
const systemApiConfigurationParams: ConfigurationParameters = { const systemApiConfigurationParams: ConfigurationParameters = {
basePath: this.config.jellyfinUrl, basePath: this.config.jellyfinUrl,
headers: this.authHeader.headers headers: this.authHeader.headers
} }
const libraryApiConfigurationParams: ConfigurationParameters = { const libraryApiConfigurationParams: ConfigurationParameters = {
basePath: this.config.jellyfinUrl, basePath: this.config.jellyfinUrl,
headers: this.authHeader.headers headers: this.authHeader.headers
} }
this.userApi = _userApi ?? new UserApi(new Configuration(userApiConfigurationParams)) this.userApi = _userApi ?? new UserApi(new Configuration(userApiConfigurationParams))
this.systemApi = _systemApi ?? new SystemApi(new Configuration(systemApiConfigurationParams)) this.systemApi = _systemApi ?? new SystemApi(new Configuration(systemApiConfigurationParams))
this.moviesApi = _itemsApi ?? new ItemsApi(new Configuration(libraryApiConfigurationParams)) this.moviesApi = _itemsApi ?? new ItemsApi(new Configuration(libraryApiConfigurationParams))
logger.info(`Initialized Jellyfin handler`, { requestId: 'Init' }) logger.info(`Initialized Jellyfin handler`, { requestId: 'Init' })
} }
private generateJFUserName(discordUser: GuildMember, level: PermissionLevel): string { private generateJFUserName(discordUser: GuildMember, level: PermissionLevel): string {
return `${discordUser.displayName}${level == "TEMPORARY" ? "_tmp" : ""}` return `${discordUser.displayName}${level == "TEMPORARY" ? "_tmp" : ""}`
} }
private generatePasswordForUser(): string { private generatePasswordForUser(): string {
return (Math.random() * 10000 + 10000).toFixed(0) return (Math.random() * 10000 + 10000).toFixed(0)
} }
public async createUserAccountForDiscordUser(discordUser: GuildMember, level: PermissionLevel, requestId: string, guildId?: string): Promise<UserDto> { public async createUserAccountForDiscordUser(discordUser: GuildMember, level: PermissionLevel, requestId: string, guildId?: string): Promise<UserDto> {
const newUserName = this.generateJFUserName(discordUser, level) const newUserName = this.generateJFUserName(discordUser, level)
logger.info(`New Username for ${discordUser.displayName}: ${newUserName}`, { guildId, requestId }) logger.info(`New Username for ${discordUser.displayName}: ${newUserName}`, { guildId, requestId })
const req: CreateUserByNameOperationRequest = { const req: CreateUserByNameOperationRequest = {
createUserByNameRequest: { createUserByNameRequest: {
name: newUserName, name: newUserName,
password: this.generatePasswordForUser() password: this.generatePasswordForUser()
} }
} }
logger.debug(JSON.stringify(req), { requestId, guildId }) logger.debug(JSON.stringify(req), { requestId, guildId })
const createResult = await this.userApi.createUserByName(req) const createResult = await this.userApi.createUserByName(req)
if (createResult) { if (createResult) {
if (createResult.policy) { if (createResult.policy) {
this.setUserPermissions(createResult, requestId, guildId) this.setUserPermissions(createResult, requestId, guildId)
} }
(await discordUser.createDM()).send(`Ich hab dir mal nen Account angelegt :)\nDein Username ist ${createResult.name}, dein Password ist "${req.createUserByNameRequest.password}"!`) (await discordUser.createDM()).send(`Ich hab dir mal nen Account angelegt :)\nDein Username ist ${createResult.name}, dein Password ist "${req.createUserByNameRequest.password}"!`)
return createResult return createResult
} }
else throw new Error('Could not create User in Jellyfin') else throw new Error('Could not create User in Jellyfin')
} }
public async setUserPermissions(user: UserDto, requestId: string, guildId?: string) { public async setUserPermissions(user: UserDto, requestId: string, guildId?: string) {
if (!user.policy || !user.id) { if (!user.policy || !user.id) {
logger.error(`Cannot update user policy. User ${user.name} has no policy to modify`, { guildId, requestId }) logger.error(`Cannot update user policy. User ${user.name} has no policy to modify`, { guildId, requestId })
return return
} }
user.policy.enableVideoPlaybackTranscoding = false user.policy.enableVideoPlaybackTranscoding = false
const operation: UpdateUserPolicyRequest = { const operation: UpdateUserPolicyRequest = {
...user.policy, ...user.policy,
enableVideoPlaybackTranscoding: false enableVideoPlaybackTranscoding: false
} }
const request: UpdateUserPolicyOperationRequest = { const request: UpdateUserPolicyOperationRequest = {
userId: user.id, userId: user.id,
updateUserPolicyRequest: operation updateUserPolicyRequest: operation
} }
this.userApi.updateUserPolicy(request) this.userApi.updateUserPolicy(request)
} }
public async isUserAlreadyPresent(discordUser: GuildMember, requestId?: string): Promise<boolean> { public async isUserAlreadyPresent(discordUser: GuildMember, requestId?: string): Promise<boolean> {
const jfuser = await this.getUser(discordUser, requestId) const jfuser = await this.getUser(discordUser, requestId)
logger.debug(`Presence for DiscordUser ${discordUser.id}:${jfuser !== undefined}`, { guildId: discordUser.guild.id, requestId }) logger.debug(`Presence for DiscordUser ${discordUser.id}:${jfuser !== undefined}`, { guildId: discordUser.guild.id, requestId })
return jfuser !== undefined return jfuser !== undefined
} }
public async getCurrentUsers(guildId: string, requestId?: string): Promise<UserDto[]> { public async getCurrentUsers(guildId: string, requestId?: string): Promise<UserDto[]> {
try { try {
logger.info(`Fetching current users from Jellyfin`, { requestId, guildId }) logger.info(`Fetching current users from Jellyfin`, { requestId, guildId })
const result = await this.userApi.getUsers(undefined, this.authHeader) const result = await this.userApi.getUsers(undefined, this.authHeader)
return result return result
} catch (error) { } catch (error) {
logger.error(`Could not fetch current users from jellyfin`, { guildId, requestId }) logger.error(`Could not fetch current users from jellyfin`, { guildId, requestId })
} }
return [] return []
} }
public async getUser(discordUser: GuildMember, requestId?: string): Promise<Maybe<UserDto>> { public async getUser(discordUser: GuildMember, requestId?: string): Promise<Maybe<UserDto>> {
logger.info(`Getting user for discord member ${discordUser.displayName}`, { requestId, guildId: discordUser.guild.id }) logger.info(`Getting user for discord member ${discordUser.displayName}`, { requestId, guildId: discordUser.guild.id })
const jfUsers = await this.getCurrentUsers(discordUser.guild.id, requestId) const jfUsers = await this.getCurrentUsers(discordUser.guild.id, requestId)
const foundUser = jfUsers.find(x => x.name?.includes(discordUser.displayName)) const foundUser = jfUsers.find(x => x.name?.includes(discordUser.displayName))
return foundUser return foundUser
} }
public async removeUser(newMember: GuildMember, level: PermissionLevel, requestId?: string) { public async removeUser(newMember: GuildMember, level: PermissionLevel, requestId?: string) {
logger.info(`${level == "TEMPORARY" ? "Deleting" : "Disabling"} user ${newMember.displayName}, but method is not implemented`, { requestId, guildId: newMember.guild.id }) logger.info(`${level == "TEMPORARY" ? "Deleting" : "Disabling"} user ${newMember.displayName}, but method is not implemented`, { requestId, guildId: newMember.guild.id })
const jfuser = await this.getUser(newMember, requestId) const jfuser = await this.getUser(newMember, requestId)
if (jfuser && jfuser.id) { if (jfuser && jfuser.id) {
if (level === "TEMPORARY") { if (level === "TEMPORARY") {
const r: DeleteUserRequest = { const r: DeleteUserRequest = {
userId: jfuser.id userId: jfuser.id
} }
this.userApi.deleteUser(r) this.userApi.deleteUser(r)
} }
else else
await this.disableUser(jfuser, newMember.guild.id, requestId) await this.disableUser(jfuser, newMember.guild.id, requestId)
} }
} }
public async purge(guildId: string, requestId?: string) { public async purge(guildId: string, requestId?: string) {
logger.info("Deleting tmp users", { requestId, guildId }) logger.info("Deleting tmp users", { requestId, guildId })
const users = (await this.userApi.getUsers()).filter(user => user.name?.endsWith("_tmp")) const users = (await this.userApi.getUsers()).filter(user => user.name?.endsWith("_tmp"))
users.forEach(user => { users.forEach(user => {
if (user.id) { if (user.id) {
const r: DeleteUserRequest = { const r: DeleteUserRequest = {
userId: user.id userId: user.id
} }
this.userApi.deleteUser(r) this.userApi.deleteUser(r)
} }
}) })
} }
public async resetUserPasswort(member: GuildMember, requestId?: string) { public async resetUserPasswort(member: GuildMember, requestId?: string) {
logger.info(`Resetting password for user ${member.displayName}`, { requestId, guildId: member.guild.id }) logger.info(`Resetting password for user ${member.displayName}`, { requestId, guildId: member.guild.id })
const jfUser = await this.getUser(member, requestId) const jfUser = await this.getUser(member, requestId)
if (jfUser && jfUser.id) { if (jfUser && jfUser.id) {
// const reset: UpdateUserPasswordRequest = { // const reset: UpdateUserPasswordRequest = {
// resetPassword: true // resetPassword: true
// } // }
// const shit: UpdateUserPasswordOperationRequest = { // const shit: UpdateUserPasswordOperationRequest = {
// updateUserPasswordRequest: reset, // updateUserPasswordRequest: reset,
// userId: jfUser.id // userId: jfUser.id
// } // }
// logger.info(JSON.stringify(jfUser.policy, null, 2)) // logger.info(JSON.stringify(jfUser.policy, null, 2))
// logger.info("Resetting password", {requestId}) // logger.info("Resetting password", {requestId})
// await this.userApi.updateUserPassword(shit); // await this.userApi.updateUserPassword(shit);
const password = this.generatePasswordForUser() const password = this.generatePasswordForUser()
const passwordRequest: UpdateUserPasswordRequest = { const passwordRequest: UpdateUserPasswordRequest = {
// resetPassword: true, // resetPassword: true,
currentPw: "", currentPw: "",
newPw: password newPw: password
} }
const passwordOperationRequest: UpdateUserPasswordOperationRequest = { const passwordOperationRequest: UpdateUserPasswordOperationRequest = {
updateUserPasswordRequest: passwordRequest, updateUserPasswordRequest: passwordRequest,
userId: jfUser.id userId: jfUser.id
} }
logger.info("Setting new password", { requestId, guildId: member.guild.id }) logger.info("Setting new password", { requestId, guildId: member.guild.id })
await this.userApi.updateUserPassword(passwordOperationRequest); await this.userApi.updateUserPassword(passwordOperationRequest);
(await member.createDM()).send(`Hier ist dein neues Passwort: ${password}`) (await member.createDM()).send(`Hier ist dein neues Passwort: ${password}`)
} else { } else {
(await member.createDM()).send("Ich konnte leider keinen User von dir auf Jellyfin finden. Bitte melde dich bei Markus oder Samantha!") (await member.createDM()).send("Ich konnte leider keinen User von dir auf Jellyfin finden. Bitte melde dich bei Markus oder Samantha!")
} }
} }
public async disableUser(user: UserDto, guildId?: string, requestId?: string): Promise<void> { public async disableUser(user: UserDto, guildId?: string, requestId?: string): Promise<void> {
if (user.id) { if (user.id) {
const jfUser = await this.getUser(<GuildMember>{ displayName: user.name, guild: { id: guildId } }, requestId) const jfUser = await this.getUser(<GuildMember>{ displayName: user.name, guild: { id: guildId } }, requestId)
logger.info(`Trying to disable user: ${user.name}|${user.id}|${JSON.stringify(jfUser, null, 2)}`, { guildId, requestId }) logger.info(`Trying to disable user: ${user.name}|${user.id}|${JSON.stringify(jfUser, null, 2)}`, { guildId, requestId })
const r: UpdateUserPolicyOperationRequest = { const r: UpdateUserPolicyOperationRequest = {
userId: user.id ?? "", userId: user.id ?? "",
updateUserPolicyRequest: { updateUserPolicyRequest: {
...jfUser?.policy, ...jfUser?.policy,
isDisabled: true, isDisabled: true,
} }
} }
await this.userApi.updateUserPolicy(r) await this.userApi.updateUserPolicy(r)
logger.info(`Succeeded with disabling user: ${user.name}`, { guildId, requestId }) logger.info(`Succeeded with disabling user: ${user.name}`, { guildId, requestId })
} }
else { else {
logger.error(`Can not disable user ${JSON.stringify(user)}, has no id?!`, { requestId, guildId }) logger.error(`Can not disable user ${JSON.stringify(user)}, has no id?!`, { requestId, guildId })
} }
} }
public async enableUser(user: UserDto, guildId: string, requestId?: string): Promise<void> { public async enableUser(user: UserDto, guildId: string, requestId?: string): Promise<void> {
if (user.id) { if (user.id) {
const jfUser = await this.getUser(<GuildMember>{ displayName: user.name, guild: { id: guildId } }, requestId) const jfUser = await this.getUser(<GuildMember>{ displayName: user.name, guild: { id: guildId } }, requestId)
logger.info(`Trying to enable user: ${user.name}|${user.id}|${JSON.stringify(jfUser, null, 2)}`, { guildId, requestId }) logger.info(`Trying to enable user: ${user.name}|${user.id}|${JSON.stringify(jfUser, null, 2)}`, { guildId, requestId })
const r: UpdateUserPolicyOperationRequest = { const r: UpdateUserPolicyOperationRequest = {
userId: user.id ?? "", userId: user.id ?? "",
updateUserPolicyRequest: { updateUserPolicyRequest: {
...jfUser?.policy, ...jfUser?.policy,
isDisabled: false, isDisabled: false,
} }
} }
await this.userApi.updateUserPolicy(r) await this.userApi.updateUserPolicy(r)
logger.info(`Succeeded with enabling user: ${user.name}`, { guildId, requestId }) logger.info(`Succeeded with enabling user: ${user.name}`, { guildId, requestId })
} }
else { else {
logger.error(`Can not enable user ${JSON.stringify(user)}, has no id?!`, { requestId, guildId }) logger.error(`Can not enable user ${JSON.stringify(user)}, has no id?!`, { requestId, guildId })
} }
} }
public async upsertUser(newMember: GuildMember, level: PermissionLevel, requestId?: string): Promise<UserUpsertResult> { public async upsertUser(newMember: GuildMember, level: PermissionLevel, requestId?: string): Promise<UserUpsertResult> {
logger.info(`Trying to upsert user ${newMember.displayName}, with permissionLevel ${level}`, { guildId: newMember.guild.id, requestId }) logger.info(`Trying to upsert user ${newMember.displayName}, with permissionLevel ${level}`, { guildId: newMember.guild.id, requestId })
const jfuser = await this.getUser(newMember, requestId) const jfuser = await this.getUser(newMember, requestId)
if (jfuser && !jfuser.policy?.isDisabled) { if (jfuser && !jfuser.policy?.isDisabled) {
logger.info(`User with name ${newMember.displayName} is already present`, { guildId: newMember.guild.id, requestId }) logger.info(`User with name ${newMember.displayName} is already present`, { guildId: newMember.guild.id, requestId })
await this.enableUser(jfuser, newMember.guild.id, requestId) await this.enableUser(jfuser, newMember.guild.id, requestId)
return UserUpsertResult.enabled return UserUpsertResult.enabled
} else { } else {
this.createUserAccountForDiscordUser(newMember, level, newMember.guild.id, requestId) this.createUserAccountForDiscordUser(newMember, level, newMember.guild.id, requestId)
return UserUpsertResult.created return UserUpsertResult.created
} }
} }
public async getAllMovies(guildId: string, requestId: string): Promise<BaseItemDto[]> { public async getAllMovies(guildId: string, requestId: string): Promise<BaseItemDto[]> {
logger.info("requesting all movies from jellyfin", { guildId, requestId }) logger.info("requesting all movies from jellyfin", { guildId, requestId })
const searchParams: GetItemsRequest = { const searchParams: GetItemsRequest = {
userId: this.config.collectionUser, userId: this.config.collectionUser,
parentId: this.config.movieCollectionId // collection ID for all movies parentId: this.config.movieCollectionId // collection ID for all movies
} }
const movies = (await (this.moviesApi.getItems(searchParams))).items?.filter(item => !item.isFolder) const movies = (await (this.moviesApi.getItems(searchParams))).items?.filter(item => !item.isFolder)
// logger.debug(JSON.stringify(movies, null, 2), { guildId: guildId, requestId }) // logger.debug(JSON.stringify(movies, null, 2), { guildId: guildId, requestId })
logger.info(`Found ${movies?.length} movies in total`, { guildId, requestId }) logger.info(`Found ${movies?.length} movies in total`, { guildId, requestId })
return movies ?? [] return movies ?? []
} }
public async getRandomMovies(count: number, guildId: string, requestId: string): Promise<BaseItemDto[]> { public async getRandomMovies(count: number, guildId: string, requestId: string): Promise<BaseItemDto[]> {
logger.info(`${count} random movies requested.`, { guildId, requestId }) logger.info(`${count} random movies requested.`, { guildId, requestId })
const allMovies = await this.getAllMovies(guildId, requestId) const allMovies = await this.getAllMovies(guildId, requestId)
if (count >= allMovies.length) { if (count >= allMovies.length) {
logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId, requestId }) logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId, requestId })
return allMovies return allMovies
} }
const movies: BaseItemDto[] = [] const movies: BaseItemDto[] = []
for (let i = 0; i < count; i++) { for (let i = 0; i < count; i++) {
const index = Math.floor(Math.random() * allMovies.length) const index = Math.floor(Math.random() * allMovies.length)
movies.push(...allMovies.splice(index, 1)) // maybe out of bounds? ? movies.push(...allMovies.splice(index, 1)) // maybe out of bounds? ?
} }
return movies return movies
} }
public async getRandomMovieNames(count: number, guildId: string, requestId: string): Promise<string[]> { public async getRandomMovieNames(count: number, guildId: string, requestId: string): Promise<string[]> {
logger.info(`${count} random movie names requested`, { guildId, requestId }) logger.info(`${count} random movie names requested`, { guildId, requestId })
let movieCount = 0 let movieCount = 0
let movieNames: string[] let movieNames: string[]
do { do {
movieNames = (await this.getRandomMovies(count, guildId, requestId)).filter(movie => movie.name && movie.name.length > 0).map(movie => <string>movie.name) movieNames = (await this.getRandomMovies(count, guildId, requestId)).filter(movie => movie.name && movie.name.length > 0).map(movie => <string>movie.name)
movieCount = movieNames.length movieCount = movieNames.length
} while (movieCount < count) } while (movieCount < count)
return movieNames return movieNames
} }
} }

View File

@ -16,72 +16,72 @@
export const BASE_PATH = "http://localhost".replace(/\/+$/, ""); export const BASE_PATH = "http://localhost".replace(/\/+$/, "");
export interface ConfigurationParameters { export interface ConfigurationParameters {
basePath?: string; // override base path basePath?: string; // override base path
fetchApi?: FetchAPI; // override for fetch implementation fetchApi?: FetchAPI; // override for fetch implementation
middleware?: Middleware[]; // middleware to apply before/after fetch requests middleware?: Middleware[]; // middleware to apply before/after fetch requests
queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
username?: string; // parameter for basic security username?: string; // parameter for basic security
password?: string; // parameter for basic security password?: string; // parameter for basic security
apiKey?: string | ((name: string) => string); // parameter for apiKey security apiKey?: string | ((name: string) => string); // parameter for apiKey security
accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string | Promise<string>); // parameter for oauth2 security
headers?: HTTPHeaders; //header params we want to use on every request headers?: HTTPHeaders; //header params we want to use on every request
credentials?: RequestCredentials; //value for the credentials param we want to use on each request credentials?: RequestCredentials; //value for the credentials param we want to use on each request
} }
export class Configuration { export class Configuration {
constructor(private configuration: ConfigurationParameters = {}) { } constructor(private configuration: ConfigurationParameters = {}) { }
set config(configuration: Configuration) { set config(configuration: Configuration) {
this.configuration = configuration; this.configuration = configuration;
} }
get basePath(): string { get basePath(): string {
return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH; return this.configuration.basePath != null ? this.configuration.basePath : BASE_PATH;
} }
get fetchApi(): FetchAPI | undefined { get fetchApi(): FetchAPI | undefined {
return this.configuration.fetchApi; return this.configuration.fetchApi;
} }
get middleware(): Middleware[] { get middleware(): Middleware[] {
return this.configuration.middleware || []; return this.configuration.middleware || [];
} }
get queryParamsStringify(): (params: HTTPQuery) => string { get queryParamsStringify(): (params: HTTPQuery) => string {
return this.configuration.queryParamsStringify || querystring; return this.configuration.queryParamsStringify || querystring;
} }
get username(): string | undefined { get username(): string | undefined {
return this.configuration.username; return this.configuration.username;
} }
get password(): string | undefined { get password(): string | undefined {
return this.configuration.password; return this.configuration.password;
} }
get apiKey(): ((name: string) => string) | undefined { get apiKey(): ((name: string) => string) | undefined {
const apiKey = this.configuration.apiKey; const apiKey = this.configuration.apiKey;
if (apiKey) { if (apiKey) {
return typeof apiKey === 'function' ? apiKey : () => apiKey; return typeof apiKey === 'function' ? apiKey : () => apiKey;
} }
return undefined; return undefined;
} }
get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined { get accessToken(): ((name?: string, scopes?: string[]) => string | Promise<string>) | undefined {
const accessToken = this.configuration.accessToken; const accessToken = this.configuration.accessToken;
if (accessToken) { if (accessToken) {
return typeof accessToken === 'function' ? accessToken : async () => accessToken; return typeof accessToken === 'function' ? accessToken : async () => accessToken;
} }
return undefined; return undefined;
} }
get headers(): HTTPHeaders | undefined { get headers(): HTTPHeaders | undefined {
return this.configuration.headers; return this.configuration.headers;
} }
get credentials(): RequestCredentials | undefined { get credentials(): RequestCredentials | undefined {
return this.configuration.credentials; return this.configuration.credentials;
} }
} }
export const DefaultConfig = new Configuration(); export const DefaultConfig = new Configuration();
@ -91,192 +91,192 @@ export const DefaultConfig = new Configuration();
*/ */
export class BaseAPI { export class BaseAPI {
private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i'); private static readonly jsonRegex = new RegExp('^(:?application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(:?;.*)?$', 'i');
private middleware: Middleware[]; private middleware: Middleware[];
constructor(protected configuration = DefaultConfig) { constructor(protected configuration = DefaultConfig) {
this.middleware = configuration.middleware; this.middleware = configuration.middleware;
} }
withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) { withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
const next = this.clone<T>(); const next = this.clone<T>();
next.middleware = next.middleware.concat(...middlewares); next.middleware = next.middleware.concat(...middlewares);
return next; return next;
} }
withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) { withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
const middlewares = preMiddlewares.map((pre) => ({ pre })); const middlewares = preMiddlewares.map((pre) => ({ pre }));
return this.withMiddleware<T>(...middlewares); return this.withMiddleware<T>(...middlewares);
} }
withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) { withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
const middlewares = postMiddlewares.map((post) => ({ post })); const middlewares = postMiddlewares.map((post) => ({ post }));
return this.withMiddleware<T>(...middlewares); return this.withMiddleware<T>(...middlewares);
} }
/** /**
* Check if the given MIME is a JSON MIME. * Check if the given MIME is a JSON MIME.
* JSON MIME examples: * JSON MIME examples:
* application/json * application/json
* application/json; charset=UTF8 * application/json; charset=UTF8
* APPLICATION/JSON * APPLICATION/JSON
* application/vnd.company+json * application/vnd.company+json
* @param mime - MIME (Multipurpose Internet Mail Extensions) * @param mime - MIME (Multipurpose Internet Mail Extensions)
* @return True if the given MIME is JSON, false otherwise. * @return True if the given MIME is JSON, false otherwise.
*/ */
protected isJsonMime(mime: string | null | undefined): boolean { protected isJsonMime(mime: string | null | undefined): boolean {
if (!mime) { if (!mime) {
return false; return false;
} }
return BaseAPI.jsonRegex.test(mime); return BaseAPI.jsonRegex.test(mime);
} }
protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> { protected async request(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction): Promise<Response> {
const { url, init } = await this.createFetchParams(context, initOverrides); const { url, init } = await this.createFetchParams(context, initOverrides);
const response = await this.fetchApi(url, init); const response = await this.fetchApi(url, init);
if (response && (response.status >= 200 && response.status < 300)) { if (response && (response.status >= 200 && response.status < 300)) {
return response; return response;
} }
throw new ResponseError(response, 'Response returned an error code'); throw new ResponseError(response, 'Response returned an error code');
} }
private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) { private async createFetchParams(context: RequestOpts, initOverrides?: RequestInit | InitOverrideFunction) {
let url = this.configuration.basePath + context.path; let url = this.configuration.basePath + context.path;
if (context.query !== undefined && Object.keys(context.query).length !== 0) { if (context.query !== undefined && Object.keys(context.query).length !== 0) {
// only add the querystring to the URL if there are query parameters. // only add the querystring to the URL if there are query parameters.
// this is done to avoid urls ending with a "?" character which buggy webservers // this is done to avoid urls ending with a "?" character which buggy webservers
// do not handle correctly sometimes. // do not handle correctly sometimes.
url += '?' + this.configuration.queryParamsStringify(context.query); url += '?' + this.configuration.queryParamsStringify(context.query);
} }
const headers = Object.assign({}, this.configuration.headers, context.headers); const headers = Object.assign({}, this.configuration.headers, context.headers);
Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {}); Object.keys(headers).forEach(key => headers[key] === undefined ? delete headers[key] : {});
const initOverrideFn = const initOverrideFn =
typeof initOverrides === "function" typeof initOverrides === "function"
? initOverrides ? initOverrides
: async () => initOverrides; : async () => initOverrides;
const initParams = { const initParams = {
method: context.method, method: context.method,
headers, headers,
body: context.body, body: context.body,
credentials: this.configuration.credentials, credentials: this.configuration.credentials,
}; };
const overriddenInit: RequestInit = { const overriddenInit: RequestInit = {
...initParams, ...initParams,
...(await initOverrideFn({ ...(await initOverrideFn({
init: initParams, init: initParams,
context, context,
})) }))
}; };
const init: RequestInit = { const init: RequestInit = {
...overriddenInit, ...overriddenInit,
body: body:
isFormData(overriddenInit.body) || isFormData(overriddenInit.body) ||
overriddenInit.body instanceof URLSearchParams || overriddenInit.body instanceof URLSearchParams ||
isBlob(overriddenInit.body) isBlob(overriddenInit.body)
? overriddenInit.body ? overriddenInit.body
: JSON.stringify(overriddenInit.body), : JSON.stringify(overriddenInit.body),
}; };
return { url, init }; return { url, init };
} }
private fetchApi = async (url: string, init: RequestInit) => { private fetchApi = async (url: string, init: RequestInit) => {
let fetchParams = { url, init }; let fetchParams = { url, init };
for (const middleware of this.middleware) { for (const middleware of this.middleware) {
if (middleware.pre) { if (middleware.pre) {
fetchParams = await middleware.pre({ fetchParams = await middleware.pre({
fetch: this.fetchApi, fetch: this.fetchApi,
...fetchParams, ...fetchParams,
}) || fetchParams; }) || fetchParams;
} }
} }
let response: Response | undefined = undefined; let response: Response | undefined = undefined;
try { try {
response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init); response = await (this.configuration.fetchApi || fetch)(fetchParams.url, fetchParams.init);
} catch (e) { } catch (e) {
for (const middleware of this.middleware) { for (const middleware of this.middleware) {
if (middleware.onError) { if (middleware.onError) {
response = await middleware.onError({ response = await middleware.onError({
fetch: this.fetchApi, fetch: this.fetchApi,
url: fetchParams.url, url: fetchParams.url,
init: fetchParams.init, init: fetchParams.init,
error: e, error: e,
response: response ? response.clone() : undefined, response: response ? response.clone() : undefined,
}) || response; }) || response;
} }
} }
if (response === undefined) { if (response === undefined) {
if (e instanceof Error) { if (e instanceof Error) {
throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response'); throw new FetchError(e, 'The request failed and the interceptors did not return an alternative response');
} else { } else {
throw e; throw e;
} }
} }
} }
for (const middleware of this.middleware) { for (const middleware of this.middleware) {
if (middleware.post) { if (middleware.post) {
response = await middleware.post({ response = await middleware.post({
fetch: this.fetchApi, fetch: this.fetchApi,
url: fetchParams.url, url: fetchParams.url,
init: fetchParams.init, init: fetchParams.init,
response: response.clone(), response: response.clone(),
}) || response; }) || response;
} }
} }
return response; return response;
} }
/** /**
* Create a shallow clone of `this` by constructing a new instance * Create a shallow clone of `this` by constructing a new instance
* and then shallow cloning data members. * and then shallow cloning data members.
*/ */
private clone<T extends BaseAPI>(this: T): T { private clone<T extends BaseAPI>(this: T): T {
const constructor = this.constructor as any; const constructor = this.constructor as any;
const next = new constructor(this.configuration); const next = new constructor(this.configuration);
next.middleware = this.middleware.slice(); next.middleware = this.middleware.slice();
return next; return next;
} }
}; };
function isBlob(value: any): value is Blob { function isBlob(value: any): value is Blob {
return typeof Blob !== 'undefined' && value instanceof Blob; return typeof Blob !== 'undefined' && value instanceof Blob;
} }
function isFormData(value: any): value is FormData { function isFormData(value: any): value is FormData {
return typeof FormData !== "undefined" && value instanceof FormData; return typeof FormData !== "undefined" && value instanceof FormData;
} }
export class ResponseError extends Error { export class ResponseError extends Error {
override name: "ResponseError" = "ResponseError"; override name: "ResponseError" = "ResponseError";
constructor(public response: Response, msg?: string) { constructor(public response: Response, msg?: string) {
super(msg); super(msg);
} }
} }
export class FetchError extends Error { export class FetchError extends Error {
override name: "FetchError" = "FetchError"; override name: "FetchError" = "FetchError";
constructor(public cause: Error, msg?: string) { constructor(public cause: Error, msg?: string) {
super(msg); super(msg);
} }
} }
export class RequiredError extends Error { export class RequiredError extends Error {
override name: "RequiredError" = "RequiredError"; override name: "RequiredError" = "RequiredError";
constructor(public field: string, msg?: string) { constructor(public field: string, msg?: string) {
super(msg); super(msg);
} }
} }
export const COLLECTION_FORMATS = { export const COLLECTION_FORMATS = {
csv: ",", csv: ",",
ssv: " ", ssv: " ",
tsv: "\t", tsv: "\t",
pipes: "|", pipes: "|",
}; };
export type FetchAPI = WindowOrWorkerGlobalScope['fetch']; export type FetchAPI = WindowOrWorkerGlobalScope['fetch'];
@ -292,134 +292,134 @@ export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'o
export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit> export type InitOverrideFunction = (requestContext: { init: HTTPRequestInit, context: RequestOpts }) => Promise<RequestInit>
export interface FetchParams { export interface FetchParams {
url: string; url: string;
init: RequestInit; init: RequestInit;
} }
export interface RequestOpts { export interface RequestOpts {
path: string; path: string;
method: HTTPMethod; method: HTTPMethod;
headers: HTTPHeaders; headers: HTTPHeaders;
query?: HTTPQuery; query?: HTTPQuery;
body?: HTTPBody; body?: HTTPBody;
} }
export function exists(json: any, key: string) { export function exists(json: any, key: string) {
const value = json[key]; const value = json[key];
return value !== null && value !== undefined; return value !== null && value !== undefined;
} }
export function querystring(params: HTTPQuery, prefix: string = ''): string { export function querystring(params: HTTPQuery, prefix: string = ''): string {
return Object.keys(params) return Object.keys(params)
.map(key => querystringSingleKey(key, params[key], prefix)) .map(key => querystringSingleKey(key, params[key], prefix))
.filter(part => part.length > 0) .filter(part => part.length > 0)
.join('&'); .join('&');
} }
function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string { function querystringSingleKey(key: string, value: string | number | null | undefined | boolean | Array<string | number | null | boolean> | Set<string | number | null | boolean> | HTTPQuery, keyPrefix: string = ''): string {
const fullKey = keyPrefix + (keyPrefix.length ? `[${key}]` : key); const fullKey = keyPrefix + (keyPrefix.length ? `[${key}]` : key);
if (value instanceof Array) { if (value instanceof Array) {
const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue))) const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
.join(`&${encodeURIComponent(fullKey)}=`); .join(`&${encodeURIComponent(fullKey)}=`);
return `${encodeURIComponent(fullKey)}=${multiValue}`; return `${encodeURIComponent(fullKey)}=${multiValue}`;
} }
if (value instanceof Set) { if (value instanceof Set) {
const valueAsArray = Array.from(value); const valueAsArray = Array.from(value);
return querystringSingleKey(key, valueAsArray, keyPrefix); return querystringSingleKey(key, valueAsArray, keyPrefix);
} }
if (value instanceof Date) { if (value instanceof Date) {
return `${encodeURIComponent(fullKey)}=${encodeURIComponent(value.toISOString())}`; return `${encodeURIComponent(fullKey)}=${encodeURIComponent(value.toISOString())}`;
} }
if (value instanceof Object) { if (value instanceof Object) {
return querystring(value as HTTPQuery, fullKey); return querystring(value as HTTPQuery, fullKey);
} }
return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`;
} }
export function mapValues(data: any, fn: (item: any) => any) { export function mapValues(data: any, fn: (item: any) => any) {
return Object.keys(data).reduce( return Object.keys(data).reduce(
(acc, key) => ({ ...acc, [key]: fn(data[key]) }), (acc, key) => ({ ...acc, [key]: fn(data[key]) }),
{} {}
); );
} }
export function canConsumeForm(consumes: Consume[]): boolean { export function canConsumeForm(consumes: Consume[]): boolean {
for (const consume of consumes) { for (const consume of consumes) {
if ('multipart/form-data' === consume.contentType) { if ('multipart/form-data' === consume.contentType) {
return true; return true;
} }
} }
return false; return false;
} }
export interface Consume { export interface Consume {
contentType: string; contentType: string;
} }
export interface RequestContext { export interface RequestContext {
fetch: FetchAPI; fetch: FetchAPI;
url: string; url: string;
init: RequestInit; init: RequestInit;
} }
export interface ResponseContext { export interface ResponseContext {
fetch: FetchAPI; fetch: FetchAPI;
url: string; url: string;
init: RequestInit; init: RequestInit;
response: Response; response: Response;
} }
export interface ErrorContext { export interface ErrorContext {
fetch: FetchAPI; fetch: FetchAPI;
url: string; url: string;
init: RequestInit; init: RequestInit;
error: unknown; error: unknown;
response?: Response; response?: Response;
} }
export interface Middleware { export interface Middleware {
pre?(context: RequestContext): Promise<FetchParams | void>; pre?(context: RequestContext): Promise<FetchParams | void>;
post?(context: ResponseContext): Promise<Response | void>; post?(context: ResponseContext): Promise<Response | void>;
onError?(context: ErrorContext): Promise<Response | void>; onError?(context: ErrorContext): Promise<Response | void>;
} }
export interface ApiResponse<T> { export interface ApiResponse<T> {
raw: Response; raw: Response;
value(): Promise<T>; value(): Promise<T>;
} }
export interface ResponseTransformer<T> { export interface ResponseTransformer<T> {
(json: any): T; (json: any): T;
} }
export class JSONApiResponse<T> { export class JSONApiResponse<T> {
constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) { } constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) { }
async value(): Promise<T> { async value(): Promise<T> {
return this.transformer(await this.raw.json()); return this.transformer(await this.raw.json());
} }
} }
export class VoidApiResponse { export class VoidApiResponse {
constructor(public raw: Response) { } constructor(public raw: Response) { }
async value(): Promise<void> { async value(): Promise<void> {
return undefined; return undefined;
} }
} }
export class BlobApiResponse { export class BlobApiResponse {
constructor(public raw: Response) { } constructor(public raw: Response) { }
async value(): Promise<Blob> { async value(): Promise<Blob> {
return await this.raw.blob(); return await this.raw.blob();
}; };
} }
export class TextApiResponse { export class TextApiResponse {
constructor(public raw: Response) { } constructor(public raw: Response) { }
async value(): Promise<string> { async value(): Promise<string> {
return await this.raw.text(); return await this.raw.text();
}; };
} }

View File

@ -13,169 +13,169 @@ import { checkForPollsToClose } from "../commands/closepoll";
export class ExtendedClient extends Client { 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 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
private pollCloseBackgroundTasks: Collection<string, ScheduledTask> = new Collection() private pollCloseBackgroundTasks: Collection<string, ScheduledTask> = new Collection()
public constructor(jf: JellyfinHandler) { public constructor(jf: JellyfinHandler) {
const intents: IntentsBitField = new IntentsBitField() 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) intents.add(IntentsBitField.Flags.GuildMembers, IntentsBitField.Flags.MessageContent, IntentsBitField.Flags.Guilds, IntentsBitField.Flags.DirectMessages, IntentsBitField.Flags.GuildScheduledEvents, IntentsBitField.Flags.GuildVoiceStates)
const options: ClientOptions = { intents } const options: ClientOptions = { intents }
super(options) super(options)
this.jellyfin = jf this.jellyfin = jf
} }
public async start() { public async start() {
if (process.env.NODE_ENV === 'test') return if (process.env.NODE_ENV === 'test') return
const promises: Promise<any>[] = [] const promises: Promise<any>[] = []
promises.push(this.registerSlashCommands()) promises.push(this.registerSlashCommands())
promises.push(this.registerEventCallback()) promises.push(this.registerEventCallback())
Promise.all(promises).then(() => { Promise.all(promises).then(() => {
this.login(config.bot.token) this.login(config.bot.token)
}) })
} }
private async importFile(filepath: string): Promise<any> { private async importFile(filepath: string): Promise<any> {
logger.debug(`Importing ${filepath}`) logger.debug(`Importing ${filepath}`)
const imported = await import(filepath) const imported = await import(filepath)
logger.debug(`Imported ${JSON.stringify(imported)}`) logger.debug(`Imported ${JSON.stringify(imported)}`)
return imported.default ?? imported return imported.default ?? imported
} }
public async registerCommands(cmds: ApplicationCommandDataResolvable[], guildIds: Collection<Snowflake, Guild>) { public async registerCommands(cmds: ApplicationCommandDataResolvable[], guildIds: Collection<Snowflake, Guild>) {
if (guildIds) { if (guildIds) {
guildIds.forEach(guild => { guildIds.forEach(guild => {
this.guilds.cache.get(guild.id)?.commands.set(cmds) this.guilds.cache.get(guild.id)?.commands.set(cmds)
logger.info(`Registering commands to ${guild.name}|${guild.id}`) logger.info(`Registering commands to ${guild.name}|${guild.id}`)
}) })
} else { } else {
this.application?.commands.set(cmds) this.application?.commands.set(cmds)
logger.info(`Registering global commands`) logger.info(`Registering global commands`)
} }
return return
} }
public async registerSlashCommands(): Promise<void> { public async registerSlashCommands(): Promise<void> {
try { try {
const slashCommands: ApplicationCommandDataResolvable[] = [] const slashCommands: ApplicationCommandDataResolvable[] = []
const commandFiles = fs.readdirSync(this.commandFilePath).filter(file => file.endsWith('.ts') || file.endsWith('.js')) const commandFiles = fs.readdirSync(this.commandFilePath).filter(file => file.endsWith('.ts') || file.endsWith('.js'))
for (const commandFile of commandFiles) { for (const commandFile of commandFiles) {
const filePath = `${this.commandFilePath}/${commandFile}` const filePath = `${this.commandFilePath}/${commandFile}`
const command = await this.importFile(filePath) const command = await this.importFile(filePath)
logger.debug(JSON.stringify(command)) logger.debug(JSON.stringify(command))
if (!command.name) return if (!command.name) return
this.commands.set(command.name, command) this.commands.set(command.name, command)
slashCommands.push(command) slashCommands.push(command)
} }
this.on("ready", async (client: Client) => { this.on("ready", async (client: Client) => {
//logger.info(`Ready processing ${JSON.stringify(client)}`) //logger.info(`Ready processing ${JSON.stringify(client)}`)
logger.info(`SlashCommands: ${JSON.stringify(slashCommands)}`) logger.info(`SlashCommands: ${JSON.stringify(slashCommands)}`)
const guilds = client.guilds.cache const guilds = client.guilds.cache
this.registerCommands(slashCommands, guilds) this.registerCommands(slashCommands, guilds)
this.cacheUsers(guilds) this.cacheUsers(guilds)
await this.cacheAnnouncementServer(guilds) await this.cacheAnnouncementServer(guilds)
this.startAnnouncementRoleBackgroundTask(guilds) this.startAnnouncementRoleBackgroundTask(guilds)
this.startPollCloseBackgroundTasks() this.startPollCloseBackgroundTasks()
}) })
} catch (error) { } catch (error) {
logger.info(`Error refreshing slash commands: ${error}`) logger.info(`Error refreshing slash commands: ${error}`)
} }
} }
private async cacheAnnouncementServer(guilds: Collection<Snowflake, Guild>) { private async cacheAnnouncementServer(guilds: Collection<Snowflake, Guild>) {
for (const guild of guilds.values()) { for (const guild of guilds.values()) {
const channels: TextChannel[] = <TextChannel[]>(await guild.channels.fetch()) const channels: TextChannel[] = <TextChannel[]>(await guild.channels.fetch())
?.filter(channel => channel?.id === config.bot.announcement_channel_id) ?.filter(channel => channel?.id === config.bot.announcement_channel_id)
.map((value) => value) .map((value) => value)
if (!channels || channels.length != 1) { if (!channels || channels.length != 1) {
logger.error(`Could not find announcement channel for guild ${guild.name} with guildId ${guild.id}. Found ${channels}`) logger.error(`Could not find announcement channel for guild ${guild.name} with guildId ${guild.id}. Found ${channels}`)
continue continue
} }
logger.info(`Fetched announcement channel: ${JSON.stringify(channels[0])}`) logger.info(`Fetched announcement channel: ${JSON.stringify(channels[0])}`)
this.announcementChannels.set(guild.id, channels[0]) this.announcementChannels.set(guild.id, channels[0])
} }
} }
public getAnnouncementChannelForGuild(guildId: string): Maybe<TextChannel> { public getAnnouncementChannelForGuild(guildId: string): Maybe<TextChannel> {
return this.announcementChannels.get(guildId) return this.announcementChannels.get(guildId)
} }
public async cacheUsers(guilds: Collection<Snowflake, Guild>) { public async cacheUsers(guilds: Collection<Snowflake, Guild>) {
guilds.forEach((guild: Guild, id: Snowflake) => { guilds.forEach((guild: Guild, id: Snowflake) => {
logger.info(`Fetching members for ${guild.name}|${id}`) logger.info(`Fetching members for ${guild.name}|${id}`)
guild.members.fetch() guild.members.fetch()
logger.info(`Fetched: ${guild.memberCount} members`) logger.info(`Fetched: ${guild.memberCount} members`)
}) })
} }
public async registerEventCallback() { public async registerEventCallback() {
try { try {
const eventFiles = fs.readdirSync(this.eventFilePath).filter(file => file.endsWith('.ts') || file.endsWith('.js')); const eventFiles = fs.readdirSync(this.eventFilePath).filter(file => file.endsWith('.ts') || file.endsWith('.js'));
for (const file of eventFiles) { for (const file of eventFiles) {
const filePath = `${this.eventFilePath}/${file}` const filePath = `${this.eventFilePath}/${file}`
const event = await this.importFile(filePath) const event = await this.importFile(filePath)
if (event.once) { if (event.once) {
logger.info(`Registering once ${file}`) logger.info(`Registering once ${file}`)
this.once(event.name, (...args: any[]) => event.execute(...args)) this.once(event.name, (...args: any[]) => event.execute(...args))
} }
else { else {
logger.info(`Registering on ${file}`) logger.info(`Registering on ${file}`)
this.on(event.name, (...args: any[]) => event.execute(...args)) this.on(event.name, (...args: any[]) => event.execute(...args))
} }
} }
logger.info(`Registered event names ${this.eventNames()}`) logger.info(`Registered event names ${this.eventNames()}`)
} catch (error) { } catch (error) {
logger.error(error) logger.error(error)
} }
} }
public async startAnnouncementRoleBackgroundTask(guilds: Collection<string, Guild>) { public async startAnnouncementRoleBackgroundTask(guilds: Collection<string, Guild>) {
for (const guild of guilds.values()) { for (const guild of guilds.values()) {
logger.info("Starting background task for announcement role", { guildId: guild.id }) logger.info("Starting background task for announcement role", { guildId: guild.id })
const textChannel: Maybe<TextChannel> = this.getAnnouncementChannelForGuild(guild.id) const textChannel: Maybe<TextChannel> = this.getAnnouncementChannelForGuild(guild.id)
if (!textChannel) { if (!textChannel) {
logger.error("Could not find announcement channel. Aborting", { guildId: guild.id }) logger.error("Could not find announcement channel. Aborting", { guildId: guild.id })
return return
} }
this.announcementRoleHandlerTask.set(guild.id, schedule("*/10 * * * * *", async () => { this.announcementRoleHandlerTask.set(guild.id, schedule("*/10 * * * * *", async () => {
const requestId = uuid() const requestId = uuid()
const messages = (await textChannel.messages.fetchPinned()).filter(message => message.cleanContent.includes("[initial]")) const messages = (await textChannel.messages.fetchPinned()).filter(message => message.cleanContent.includes("[initial]"))
if (messages.size > 1) { if (messages.size > 1) {
logger.error("More than one pinned announcement Messages found. Unable to know which one people react to. Please fix!", { guildId: guild.id, requestId }) logger.error("More than one pinned announcement Messages found. Unable to know which one people react to. Please fix!", { guildId: guild.id, requestId })
return return
} else if (messages.size == 0) { } else if (messages.size == 0) {
logger.error("Could not find any pinned announcement messages. Unable to manage roles!", { guildId: guild.id, requestId }) logger.error("Could not find any pinned announcement messages. Unable to manage roles!", { guildId: guild.id, requestId })
return return
} }
const message = await messages.at(0)?.fetch() const message = await messages.at(0)?.fetch()
if (!message) { if (!message) {
logger.error(`No pinned message found`, { guildId: guild.id, requestId }) logger.error(`No pinned message found`, { guildId: guild.id, requestId })
return return
} }
//logger.debug(`Message: ${JSON.stringify(message, null, 2)}`, { guildId: guild.id, requestId }) //logger.debug(`Message: ${JSON.stringify(message, null, 2)}`, { guildId: guild.id, requestId })
const reactions = message.reactions.resolve("🎫") const reactions = message.reactions.resolve("🎫")
//logger.debug(`reactions: ${JSON.stringify(reactions, null, 2)}`, { guildId: guild.id, requestId }) //logger.debug(`reactions: ${JSON.stringify(reactions, null, 2)}`, { guildId: guild.id, requestId })
if (reactions) { if (reactions) {
manageAnnouncementRoles(message.guild, reactions, requestId) manageAnnouncementRoles(message.guild, reactions, requestId)
} else { } else {
logger.error("Did not get reactions! Aborting!", { guildId: guild.id, requestId }) logger.error("Did not get reactions! Aborting!", { guildId: guild.id, requestId })
} }
})) }))
} }
} }
public stopAnnouncementRoleBackgroundTask(guildId: string, requestId: string) { public stopAnnouncementRoleBackgroundTask(guildId: string, requestId: string) {
const task: Maybe<ScheduledTask> = this.announcementRoleHandlerTask.get(guildId) const task: Maybe<ScheduledTask> = this.announcementRoleHandlerTask.get(guildId)
if (!task) { if (!task) {
logger.error(`No task found for guildID ${guildId}.`, { guildId, requestId }) logger.error(`No task found for guildID ${guildId}.`, { guildId, requestId })
return return
} }
task.stop() task.stop()
} }
private async startPollCloseBackgroundTasks() { private async startPollCloseBackgroundTasks() {
for (const guild of this.guilds.cache) { for (const guild of this.guilds.cache) {
this.pollCloseBackgroundTasks.set(guild[1].id, schedule("0 * * * * *", () => checkForPollsToClose(guild[1]))) this.pollCloseBackgroundTasks.set(guild[1].id, schedule("0 * * * * *", () => checkForPollsToClose(guild[1])))
} }
} }
} }

View File

@ -1,7 +1,7 @@
import { CommandType } from "../types/commandTypes"; import { CommandType } from "../types/commandTypes";
export class Command { export class Command {
constructor(commandOptions: CommandType) { constructor(commandOptions: CommandType) {
Object.assign(this, commandOptions) Object.assign(this, commandOptions)
} }
} }

View File

@ -1,8 +1,8 @@
import { ClientEvents } from "discord.js"; import { ClientEvents } from "discord.js";
export class Event<Key extends keyof ClientEvents>{ export class Event<Key extends keyof ClientEvents>{
constructor( constructor(
public event: Key, public event: Key,
public run: (...args: ClientEvents[Key]) => unknown public run: (...args: ClientEvents[Key]) => unknown
) { } ) { }
} }

View File

@ -1,6 +1,6 @@
import { ApplicationCommandDataResolvable } from "discord.js" import { ApplicationCommandDataResolvable } from "discord.js"
export interface RegisterCommandOptions { export interface RegisterCommandOptions {
guildId?: string guildId?: string
commands: ApplicationCommandDataResolvable[] commands: ApplicationCommandDataResolvable[]
} }

View File

@ -2,16 +2,16 @@ import { PermissionResolvable, ChatInputApplicationCommandData, CommandInteracti
import { ExtendedClient } from "../structures/client"; import { ExtendedClient } from "../structures/client";
export interface ExtendedInteraction extends CommandInteraction { export interface ExtendedInteraction extends CommandInteraction {
member: GuildMember member: GuildMember
} }
export interface RunOptions { export interface RunOptions {
client: ExtendedClient client: ExtendedClient
interaction: ExtendedInteraction interaction: ExtendedInteraction
args: CommandInteractionOptionResolver args: CommandInteractionOptionResolver
} }
type RunFunction = (options: RunOptions) => unknown type RunFunction = (options: RunOptions) => unknown
export type CommandType = { export type CommandType = {
userPermissions?: PermissionResolvable[] userPermissions?: PermissionResolvable[]
run: RunFunction run: RunFunction
} & ChatInputApplicationCommandData } & ChatInputApplicationCommandData

View File

@ -2,100 +2,100 @@ import { add } from "date-fns"
import { CustomError, errorCodes } from "../interfaces" import { CustomError, errorCodes } from "../interfaces"
export interface RepetitonInfo { export interface RepetitonInfo {
startDate?: Date, // If defined will take precedence over repetitonAmount startDate?: Date, // If defined will take precedence over repetitonAmount
endDate?: Date,// If defined will take precedence over repetitonAmount endDate?: Date,// If defined will take precedence over repetitonAmount
totalAmount: number, totalAmount: number,
alreadyOccured: number, alreadyOccured: number,
schedule: Schedule schedule: Schedule
} }
export const scheduleNames = ['daily', 'weekly', 'monthly', 'everyNWeeks', 'everyNDays', 'everyNMonths'] export const scheduleNames = ['daily', 'weekly', 'monthly', 'everyNWeeks', 'everyNDays', 'everyNMonths']
export type supportedSchedule = typeof scheduleNames[number] export type supportedSchedule = typeof scheduleNames[number]
export interface IScheduleType { export interface IScheduleType {
name: supportedSchedule, name: supportedSchedule,
multiplier: number, multiplier: number,
duration: Duration duration: Duration
} }
export const scheduleTypes: IScheduleType[] = [ export const scheduleTypes: IScheduleType[] = [
{ {
name: 'daily', name: 'daily',
multiplier: 1, multiplier: 1,
duration: { duration: {
days: 1 days: 1
} }
}, },
{ {
name: 'weekly', name: 'weekly',
multiplier: 1, multiplier: 1,
duration: { duration: {
weeks: 1 weeks: 1
} }
}, },
] ]
export class Schedule { export class Schedule {
private scheduleName: string private scheduleName: string
private multiplier = 1 private multiplier = 1
private duration: Duration private duration: Duration
private baseScheduleTypes = ['daily', 'weekly', 'monthly', 'yearly'] private baseScheduleTypes = ['daily', 'weekly', 'monthly', 'yearly']
private _scheduleString: string private _scheduleString: string
constructor(scheduleString: string) { constructor(scheduleString: string) {
this._scheduleString = scheduleString.toLowerCase() this._scheduleString = scheduleString.toLowerCase()
this.scheduleName = this._scheduleString this.scheduleName = this._scheduleString
if (this.baseScheduleTypes.includes(this._scheduleString)) { if (this.baseScheduleTypes.includes(this._scheduleString)) {
this.multiplier = 1 this.multiplier = 1
} }
if (this._scheduleString.includes('every')) { if (this._scheduleString.includes('every')) {
this.scheduleName = this.getBaseScheduleNameFromVariableString() this.scheduleName = this.getBaseScheduleNameFromVariableString()
this.multiplier = this.getMultiplierFromVariableString() this.multiplier = this.getMultiplierFromVariableString()
} }
switch (this.scheduleName) { switch (this.scheduleName) {
case 'daily': case 'daily':
this.duration = { days: 1 } this.duration = { days: 1 }
break break
case 'weekly': case 'weekly':
this.duration = { weeks: 1 } this.duration = { weeks: 1 }
break break
case 'monthly': case 'monthly':
this.duration = { months: 1 } this.duration = { months: 1 }
break break
case 'yearly': case 'yearly':
this.duration = { years: 1 } this.duration = { years: 1 }
break break
default: default:
throw new CustomError('Schedule type not supported', errorCodes.schedule_not_supported) throw new CustomError('Schedule type not supported', errorCodes.schedule_not_supported)
} }
} }
public getSanitizedScheduleString(): string { public getSanitizedScheduleString(): string {
return this._scheduleString return this._scheduleString
} }
private getBaseScheduleNameFromVariableString(): string { private getBaseScheduleNameFromVariableString(): string {
if (this._scheduleString.includes('week')) return 'weekly' if (this._scheduleString.includes('week')) return 'weekly'
if (this._scheduleString.includes('day')) return 'daily' if (this._scheduleString.includes('day')) return 'daily'
if (this._scheduleString.includes('month')) return 'monthly' if (this._scheduleString.includes('month')) return 'monthly'
if (this._scheduleString.includes('year')) return 'yearly' if (this._scheduleString.includes('year')) return 'yearly'
return '' return ''
} }
public getMultiplierFromVariableString(): number { public getMultiplierFromVariableString(): number {
const matches = this._scheduleString.match(/\d+/) const matches = this._scheduleString.match(/\d+/)
if (matches) { if (matches) {
const multi = matches[0] const multi = matches[0]
if (multi) if (multi)
return parseInt(multi) return parseInt(multi)
} }
return 1 return 1
} }
public calculateDuration(): Duration { public calculateDuration(): Duration {
const dur: Duration = { const dur: Duration = {
days: this.duration.days ? this.duration.days * this.multiplier : undefined, days: this.duration.days ? this.duration.days * this.multiplier : undefined,
weeks: this.duration.weeks ? this.duration.weeks * this.multiplier : undefined, weeks: this.duration.weeks ? this.duration.weeks * this.multiplier : undefined,
months: this.duration.months ? this.duration.months * this.multiplier : undefined, months: this.duration.months ? this.duration.months * this.multiplier : undefined,
years: this.duration.years ? this.duration.years * this.multiplier : undefined, years: this.duration.years ? this.duration.years * this.multiplier : undefined,
} }
return dur return dur
} }
public getNewDate(oldDate: Date): Date { public getNewDate(oldDate: Date): Date {
const newDate = add(oldDate, this.calculateDuration()) const newDate = add(oldDate, this.calculateDuration())
return newDate return newDate
} }
} }