Merge pull request #179 from shepherdjerred/claude/weekly-elections-wednesday-Aqmn3

feat(birmel): make elections weekly on Wednesday

Author: shepherdjerred

packages/birmel/src/config/schema.ts

@@ -110,6 +110,7 @@ export const ElectionsConfigSchema = z.object({
   endTime: z.string().default("19:00"),
   timezone: z.string().default("America/Los_Angeles"),
   channelId: z.string().optional(),
+  dayOfWeek: z.number().min(0).max(6).default(3), // 0=Sunday, 3=Wednesday, 6=Saturday
 });
 
 export const ConfigSchema = z.object({

packages/birmel/src/elections/winner.ts

@@ -40,8 +40,11 @@ export function determineWinner(
 		.map(([persona, _]) => persona);
 
 	if (tiedCandidates.length > 1) {
+		// Select a random winner from tied candidates
+		const randomIndex = Math.floor(Math.random() * tiedCandidates.length);
+		const randomWinner = tiedCandidates[randomIndex] ?? tiedCandidates[0] ?? "jerred";
 		return {
-			winner: null,
+			winner: randomWinner,
 			isTie: true,
 			tiedCandidates,
 			voteCounts,

packages/birmel/src/scheduler/jobs/elections.ts

@@ -25,20 +25,29 @@ import { getConfig } from "../../config/index.js";
 
 const logger = loggers.scheduler.child("elections");
 
-function getCurrentTimeInTimezone(timezone: string): { hours: number; minutes: number } {
+function getCurrentTimeInTimezone(timezone: string): { hours: number; minutes: number; dayOfWeek: number } {
 	const now = new Date();
-	const formatter = new Intl.DateTimeFormat("en-US", {
+	const timeFormatter = new Intl.DateTimeFormat("en-US", {
 		timeZone: timezone,
 		hour: "2-digit",
 		minute: "2-digit",
 		hour12: false,
 	});
+	const dayFormatter = new Intl.DateTimeFormat("en-US", {
+		timeZone: timezone,
+		weekday: "short",
+	});
 
-	const parts = formatter.formatToParts(now);
-	const hours = Number.parseInt(parts.find((p) => p.type === "hour")?.value ?? "0", 10);
-	const minutes = Number.parseInt(parts.find((p) => p.type === "minute")?.value ?? "0", 10);
+	const timeParts = timeFormatter.formatToParts(now);
+	const hours = Number.parseInt(timeParts.find((p) => p.type === "hour")?.value ?? "0", 10);
+	const minutes = Number.parseInt(timeParts.find((p) => p.type === "minute")?.value ?? "0", 10);
 
-	return { hours, minutes };
+	// Get day of week (0=Sunday, 6=Saturday)
+	const dayStr = dayFormatter.format(now);
+	const dayMap: Record<string, number> = { Sun: 0, Mon: 1, Tue: 2, Wed: 3, Thu: 4, Fri: 5, Sat: 6 };
+	const dayOfWeek = dayMap[dayStr] ?? 0;
+
+	return { hours, minutes, dayOfWeek };
 }
 
 function isElectionStartTime(): boolean {
@@ -48,26 +57,38 @@ function isElectionStartTime(): boolean {
 	const [targetHour, targetMinute] = config.elections.startTime.split(":").map(Number);
 	const current = getCurrentTimeInTimezone(config.elections.timezone);
 
+	// Check if it's the configured day of the week (default: Wednesday = 3)
+	if (current.dayOfWeek !== config.elections.dayOfWeek) return false;
+
 	// Allow a 5-minute window for the scheduler
 	const currentMinutes = current.hours * 60 + current.minutes;
 	const targetMinutes = (targetHour ?? 0) * 60 + (targetMinute ?? 0);
 
 	return currentMinutes >= targetMinutes && currentMinutes < targetMinutes + 5;
 }
 
-async function hasElectionToday(guildId: string): Promise<boolean> {
-	const todayStart = new Date();
-	todayStart.setHours(0, 0, 0, 0);
-	const todayEnd = new Date();
-	todayEnd.setHours(23, 59, 59, 999);
+async function hasElectionThisWeek(guildId: string): Promise<boolean> {
+	const config = getConfig();
+	const current = getCurrentTimeInTimezone(config.elections.timezone);
+	const now = new Date();
+
+	// Calculate start of the current week (Sunday at 00:00:00) using configured timezone's day
+	const weekStart = new Date(now);
+	weekStart.setDate(now.getDate() - current.dayOfWeek);
+	weekStart.setHours(0, 0, 0, 0);
+
+	// Calculate end of the current week (Saturday at 23:59:59)
+	const weekEnd = new Date(weekStart);
+	weekEnd.setDate(weekStart.getDate() + 6);
+	weekEnd.setHours(23, 59, 59, 999);
 
 	const election = await prisma.electionPoll.findFirst({
 		where: {
 			guildId,
 			pollType: "election",
 			createdAt: {
-				gte: todayStart,
-				lte: todayEnd,
+				gte: weekStart,
+				lte: weekEnd,
 			},
 		},
 	});
@@ -90,9 +111,9 @@ export async function checkAndStartElections(): Promise<void> {
 
 		for (const [guildId, oauthGuild] of guilds) {
 			try {
-				// Check if election already exists for today
-				if (await hasElectionToday(guildId)) {
-					logger.debug("Election already exists for today", { guildId });
+				// Check if election already exists for this week
+				if (await hasElectionThisWeek(guildId)) {
+					logger.debug("Election already exists for this week", { guildId });
 					continue;
 				}
 
@@ -158,7 +179,7 @@ export async function checkAndStartElections(): Promise<void> {
 					});
 				}
 
-				logger.info("Daily election created and started", {
+				logger.info("Weekly election created and started", {
 					guildId,
 					channelId,
 					candidates: candidates.length,
@@ -230,29 +251,27 @@ export async function processElectionResults(): Promise<void> {
 
 				const results = determineWinner(pollResults.data.answers);
 
-				// Handle tie - create runoff
+				// Handle tie - announce and use random winner
 				if (results.isTie) {
-					await updateElectionStatus(election.id, "completed", {
-						actualEnd: new Date(),
-						voteCounts: JSON.stringify(results.voteCounts),
-					});
-
-					// Create runoff poll
-					const runoffEnd = new Date(Date.now() + 2 * 60 * 60 * 1000);
-					await createElectionPoll({
-						guildId: election.guildId,
-						channelId: election.channelId,
-						pollType: "runoff",
-						scheduledStart: new Date(),
-						scheduledEnd: runoffEnd,
-						candidates: results.tiedCandidates,
-					});
-
-					logger.info("Runoff created", {
+					const client = getDiscordClient();
+					const channel = await client.channels.fetch(election.channelId);
+					if (channel?.isTextBased() && "send" in channel) {
+						const tiedNames = results.tiedCandidates
+							.map((name) => name.charAt(0).toUpperCase() + name.slice(1))
+							.join(", ");
+						const winnerName = (results.winner ?? "jerred").charAt(0).toUpperCase() + (results.winner ?? "jerred").slice(1);
+						const voteCount = results.voteCounts[results.tiedCandidates[0] ?? ""] ?? 0;
+						await channel.send(
+							`🎲 **It's a tie!** ${tiedNames} each received ${String(voteCount)} votes. ` +
+							`A random winner has been selected: **${winnerName}**! 🎉`
+						);
+					}
+
+					logger.info("Tie resolved with random winner", {
 						guildId: election.guildId,
 						tiedCandidates: results.tiedCandidates,
+						randomWinner: results.winner,
 					});
-					continue;
 				}
 
 				// Update guild owner