kenobi
/
jellyfin-discord-bot
2
1
Fork 0
Code Issues 17 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Add automatic creation of vote message with random movies #16

Merged
kenobi merged 11 commits from feat/voting into master 2023-06-12 21:00:17 +02:00
Conversation 1 Commits 11 Files Changed 8 +21 -21
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fdc0fc47b5 - Show all commits

32
server/commands/closepoll.ts
View File

@ -15,9 +15,9 @@ export default new Command({
const command = interaction.interaction
const requestId = uuid()
const guildId = command.guildId!
logger.info("Got command for closing poll!", { guildId: guildId, requestId })
logger.info("Got command for closing poll!", { guildId, requestId })
if (!command.guild) {
logger.error("No guild found in interaction. Cancelling closing request", {guildId: guildId, requestId})
logger.error("No guild found in interaction. Cancelling closing request", { guildId, requestId })
command.followUp("Es gab leider ein Problem. Ich konnte deine Anfrage nicht bearbeiten :(")
return
}
@ -29,7 +29,7 @@ export default new Command({
export async function closePoll(guild: Guild, requestId: string) {
const guildId = guild.id
kenobi marked this conversation as resolved
kenobi commented 2023-06-11 16:10:44 +02:00
Review
Copy Link

As long as the name is identical you can just use
{guild,requestId}
This gets translated to {guildId:guildId, requestId:requestId}

As long as the name is identical you can just use `{guild,requestId}` This gets translated to `{guildId:guildId, requestId:requestId}`
magnetotail commented 2023-06-12 20:37:13 +02:00
Review
Copy Link

Fixed on all occasions I found

Fixed on all occasions I found
logger.info("stopping poll", { guildId: guildId, requestId })
logger.info("stopping poll", { guildId, requestId })
const announcementChannel: TextChannel = client.getAnnouncementChannelForGuild(guildId)
@ -39,20 +39,20 @@ export async function closePoll(guild: Guild, requestId: string) {
.sort((a, b) => b.createdTimestamp - a.createdTimestamp)
if (!messages || messages.length <= 0) {
logger.info("Could not find any vote messages. Cancelling pollClose", { guildId: guildId, requestId })
logger.info("Could not find any vote messages. Cancelling pollClose", { guildId, requestId })
return
}
const lastMessage: Message<true> = messages[0]
logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId: guildId, requestId })
logger.debug(`Found messages: ${JSON.stringify(messages, null, 2)}`, { guildId, requestId })
logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId: guildId, requestId })
logger.debug(`Last message: ${JSON.stringify(lastMessage, null, 2)}`, { guildId, requestId })
const votes = await (await getVotesByEmote(lastMessage, guildId, requestId))
.sort((a, b) => b.count - a.count)
kenobi marked this conversation as resolved
kenobi commented 2023-06-12 18:51:37 +02:00
Review
Copy Link

What does the true signify in this type?

What does the `true` signify in this type?
magnetotail commented 2023-06-12 19:06:27 +02:00
Review
Copy Link

True means that it's a guild message afaik and understand the library

True means that it's a guild message afaik and understand the library
logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId: guildId, requestId })
logger.debug(`votes: ${JSON.stringify(votes, null, 2)}`, { guildId, requestId })
updateEvent(votes, guild!, guildId, requestId)
updateMessage(votes[0].movie, lastMessage, guildId, requestId)
@ -67,20 +67,20 @@ async function updateMessage(movie: string, message: Message, guildId: string, r
const options: MessageEditOptions = {
content: body,
}
logger.info("Updating message.", {guildId: guildId, requestId})
logger.info("Updating message.", { guildId, requestId })
message.edit(options)
}
async function updateEvent(votes: Vote[], guild: Guild, guildId: string, requestId: string) {
logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId: guildId, requestId })
logger.info(`Updating event with movie ${votes[0].movie}.`, { guildId, requestId })
const voteEvents = (await guild.scheduledEvents.fetch())
.map((value, _) => value)
.filter(event => event.name.toLowerCase().includes("voting offen"))
logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId: guildId, requestId })
logger.debug(`Found events: ${JSON.stringify(voteEvents, null, 2)}`, { guildId, requestId })
if (!voteEvents || voteEvents.length <= 0) {
logger.error("Could not find vote event. Cancelling update!", { guildId: guildId, requestId })
logger.error("Could not find vote event. Cancelling update!", { guildId, requestId })
return
}
@ -89,8 +89,8 @@ async function updateEvent(votes: Vote[], guild: Guild, guildId: string, request
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`
}
logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId: guildId, requestId })
logger.info("Updating event.", {guildId: guildId, requestId})
logger.debug(`Updating event: ${JSON.stringify(voteEvent, null, 2)}`, { guildId, requestId })
logger.info("Updating event.", { guildId, requestId })
voteEvent.edit(options)
}
kenobi marked this conversation as resolved
kenobi commented 2023-06-12 18:52:34 +02:00
Review
Copy Link

My EYES!

My EYES!
magnetotail commented 2023-06-12 19:06:52 +02:00
Review
Copy Link

Sorry :( That's what you get with typing I guess?

Sorry :( That's what you get with typing I guess?
❤️ 1
kenobi commented 2023-06-12 20:52:48 +02:00
Review
Copy Link

All good :)

All good :)
@ -102,12 +102,12 @@ type Vote = {
async function getVotesByEmote(message: Message, guildId: string, requestId: string): Promise<Vote[]> {
const votes: Vote[] = []
logger.debug(`Number of items in emotes: ${Object.values(Emotes).length}`, {guildId: 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++) {
const emote = Emotes[i]
logger.debug(`Getting reaction for emote ${emote}`, { guildId: guildId, requestId })
logger.debug(`Getting reaction for emote ${emote}`, { guildId, requestId })
const reaction = await message.reactions.resolve(emote)
logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId: guildId, requestId })
logger.debug(`Reaction for emote ${emote}: ${JSON.stringify(reaction, null, 2)}`, { guildId, requestId })
if (reaction) {
const vote: Vote = { emote: emote, count: reaction.count, movie: extractMovieFromMessageByEmote(message, emote, guildId, requestId) }
votes.push(vote)

2
server/events/guildScheduledEventUpdate.ts
View File

@ -47,6 +47,6 @@ async function createJFUsers(members: GuildMember[], movieName: string, requestI
}
async function deleteJFUsers(guildId: string, requestId?: string) {
logger.info(`Watchparty ended, deleting tmp users`)
logger.info(`Watchparty ended, deleting tmp users`, { guildId, requestId })
jellyfinHandler.purge(guildId, requestId)
}

8
server/jellyfin/handler.ts
View File

@ -230,7 +230,7 @@ export class JellyfinHandler {
}
public async getAllMovies(guildId: string, requestId: string): Promise<BaseItemDto[]> {
logger.info("requesting all movies from jellyfin", { guildId: guildId, requestId })
logger.info("requesting all movies from jellyfin", { guildId, requestId })
const liloJfUser = await this.getUser(<GuildMember>{ guild: { id: guildId }, displayName: "lilo" }, requestId)
@ -240,15 +240,15 @@ export class JellyfinHandler {
}
const movies = (await (this.moviesApi.getItems(searchParams))).items?.filter(item => !item.isFolder)
// logger.debug(JSON.stringify(movies, null, 2), { guildId: guildId, requestId })
logger.info(`Found ${movies?.length} movies in total`, { guildId: guildId, requestId })
logger.info(`Found ${movies?.length} movies in total`, { guildId, requestId })
return movies ?? []
}
public async getRandomMovies(count: number, guildId: string, requestId: string): Promise<BaseItemDto[]> {
logger.info(`${count} random movies requested.`, { guildId: guildId, requestId })
logger.info(`${count} random movies requested.`, { guildId, requestId })
const allMovies = await this.getAllMovies(guildId, requestId)
if (count >= allMovies.length) {
logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId: guildId, requestId })
logger.info(`${count} random movies requested but found only ${allMovies.length}. Returning all Movies.`, { guildId, requestId })
return allMovies
}
const movies: BaseItemDto[] = []