remove unnecessary maybe type union

intended flow: use id fetch function to get role for current guild, use role id to fetch role from discord role cache,
use role in intended use case
currently the role id is hardcoded, needs to be read from some sort of cache which persists the ids in config file
needs to be differentiated by guild id and role type
could be the target of a user configurable frontend in the future

server/helper/role.controller.ts

@@ -1,5 +1,4 @@
 import { Guild, MessageReaction, Role, User } from "discord.js";
-import { ExtendedClient } from "../structures/client";
 import { GuildMember } from "discord.js";
 import { logger } from "../logger";
 import { config } from "../configuration";
@@ -7,9 +6,11 @@ import { Maybe } from "../interfaces";
 
 export default class RoleController {
 
-	constructor(private client: ExtendedClient) { }
+	constructor() { }
-	private getMediaRoleForGuild(guildId: string): Role {
+	private getAnnounceRoleIdForGuild(guildId: string): string {
-		throw new Error("Method not implemented.");
+		const role = config.bot.announcement_role
+		if (!role) throw new Error(`No announcementRole defined for guild ${guildId}`)
+		return role
 	}
 	public async addRoleToUser(member: GuildMember, role: Role, guildId: string, requestId: string) {
 		logger.info(`Adding Role ${role.id} to user ${member.id}|${member.user.username}`, { requestId, guildId })
@@ -21,30 +22,35 @@ export default class RoleController {
 	}
 
 	public async addMediaRoleToUser(user: User, guild: Guild, requestId: string) {
-		const roleToAdd: Role = this.getMediaRoleForGuild(guild.id)
+		const roleToAdd = await this.getAnnouncementRoleForGuild(guild, requestId)
+		if (!roleToAdd) throw new Error(`No announcementRole found to add to user`)
 		const guildMember = await guild.members.fetch(user)
 		return this.addRoleToUser(guildMember, roleToAdd, guild.id, requestId)
 	}
 	public async removeMediaRoleFromUser(user: User, guild: Guild, requestId: string) {
-		const roleToRemove: Role = this.getMediaRoleForGuild(guild.id)
+		const roleToRemove = await this.getAnnouncementRoleForGuild(guild, requestId)
+		if (!roleToRemove) throw new Error(`No announcementRole found to remove from user`)
 		const guildMember = await guild.members.fetch(user)
 		return this.removeRoleFromUser(guildMember, roleToRemove, guild.id, requestId)
 	}
 
-	public async getAnnouncementRoleForGuild(guild: Guild, requestId: string): Promise<Maybe<Role>> {
+	public async getAnnouncementRoleForGuild(guild: Guild, requestId: string): Promise<Role> {
-		const mediaRole = this.getMediaRoleForGuild(guild.id)
+		const mediaRole = this.getAnnounceRoleIdForGuild(guild.id)
-		return guild.roles.fetch()
+		const announcement_role = await guild.roles.fetch()
-			.then(fetchedRoles => fetchedRoles.find(role => role.id === mediaRole.id))
+			.then(fetchedRoles => fetchedRoles.find(role => role.id === mediaRole))
-			.catch(error => { logger.error(`Could not find announcement_role with id ${config.bot.announcement_role}. Error: ${error}`, { requestId, guildId: guild.id }) })
+			.catch(error => {
+				logger.error(`Could not find announcement_role with id ${config.bot.announcement_role}. Error: ${error}`, { requestId, guildId: guild.id })
+				throw error
+			})
+		if (!announcement_role) throw new Error(`Could not find announcement_role with id ${config.bot.announcement_role}.`)
+		return announcement_role
 	}
 
-	public async manageAnnouncementRoles(guild: Guild, reaction: MessageReaction, requestId: string) {
+	public async assignAnnouncementRolesFromReaction(guild: Guild, reaction: MessageReaction, requestId: string) {
 		const guildId = guild.id
 		logger.info("Managing roles", { guildId, requestId })
 
 		const announcementRole = await this.getAnnouncementRoleForGuild(guild, requestId)
-		if (!announcementRole)
-			throw new Error(`No announcementRole found in guild ${guildId}`)
 
 		const usersWhoWantRole: User[] = (await reaction.users.fetch()).filter(user => !user.bot).map(user => user)
 

server/helper/vote.controller.ts

@@ -5,7 +5,7 @@ import { getMembersWithRoleFromGuild } from "./roleFilter"
 import { config } from "../configuration"
 import { VoteMessage, isVoteEndedMessage, isVoteMessage } from "./messageIdentifiers"
 import { createDateStringFromEvent } from "./dateHelper"
-import { Maybe, voteMessageInputInformation as prepareVoteMessageInput } from "../interfaces"
+import { Maybe, prepareVoteMessageInput } from "../interfaces"
 import format from "date-fns/format"
 import toDate from "date-fns/toDate"
 import differenceInDays from "date-fns/differenceInDays"

server/interfaces.ts

@@ -1,7 +1,7 @@
 import { Collection } from "@discordjs/collection"
 import { GuildScheduledEvent, Role, TextChannel } from "discord.js"
 
-export type Maybe<T> = T | undefined | null | void
+export type Maybe<T> = T | undefined | null
 export interface Player {
 	name: string
 }
@@ -39,7 +39,7 @@ export interface JellyfinConfig {
 	collectionUser: string
 }
 export type PermissionLevel = "VIEWER" | "ADMIN" | "TEMPORARY"
-export interface voteMessageInputInformation {
+export interface prepareVoteMessageInput {
 	movies: string[],
 	startDate: Date,
 	event: GuildScheduledEvent,

server/structures/client.ts

@@ -19,7 +19,7 @@ export class ExtendedClient extends Client {
 	private commandFilePath = `${__dirname}/../commands`
 	private jellyfin: JellyfinHandler
 	public voteController: VoteController = new VoteController(this, yavinJellyfinHandler)
-	public roleController: RoleController = new RoleController(this)
+	public roleController: RoleController = new RoleController()
 	public commands: Collection<string, CommandType> = new Collection()
 	private announcementChannels: Collection<string, TextChannel> = new Collection() //guildId to TextChannel
 	private announcementRoleHandlerTask: Collection<string, ScheduledTask> = new Collection() //one task per guild
@@ -173,10 +173,10 @@ export class ExtendedClient extends Client {
 				}
 				//logger.debug(`Message: ${JSON.stringify(message, null, 2)}`, { guildId: guild.id, requestId })
 
-				const reactions = message.reactions.resolve("🎫")
+				const ticketReaction = message.reactions.resolve("🎫")
 				//logger.debug(`reactions: ${JSON.stringify(reactions, null, 2)}`, { guildId: guild.id, requestId })
-				if (reactions) {
+				if (ticketReaction) {
-					this.roleController.manageAnnouncementRoles(message.guild, reactions, requestId)
+					this.roleController.assignAnnouncementRolesFromReaction(message.guild, ticketReaction, requestId)
 				} else {
 					logger.error("Did not get reactions! Aborting!", { guildId: guild.id, requestId })
 				}