@overlaysymphony/twitch 0.1.1 → 0.2.1

package/src/eventsub/events/index.ts

@@ -1,55 +1,55 @@
-import { NotificationMessage } from "../events-helpers.js"
+import { type NotificationMessage } from "../events-helpers.js"
 
-import { ChannelAdBreakBeginEvent, ChannelAdBreakBeginSubscription, makeChannelAdBreakBeginSubscription } from "./channel.ad_break.begin.js"
-import { ChannelBanEvent, ChannelBanSubscription, makeChannelBanSubscription } from "./channel.ban.js"
-import { ChannelPointsCustomRewardAddEvent, ChannelPointsCustomRewardAddSubscription, makeChannelPointsCustomRewardAddSubscription } from "./channel.channel_points_custom_reward.add.js"
-import { ChannelPointsCustomRewardRemoveEvent, ChannelPointsCustomRewardRemoveSubscription, makeChannelPointsCustomRewardRemoveSubscription } from "./channel.channel_points_custom_reward.remove.js"
-import { ChannelPointsCustomRewardUpdateEvent, ChannelPointsCustomRewardUpdateSubscription, makeChannelPointsCustomRewardUpdateSubscription } from "./channel.channel_points_custom_reward.update.js"
-import { ChannelPointsCustomRewardRedemptionAddEvent, ChannelPointsCustomRewardRedemptionAddSubscription, makeChannelPointsCustomRewardRedemptionAddSubscription } from "./channel.channel_points_custom_reward_redemption.add.js"
-import { ChannelPointsCustomRewardRedemptionUpdateEvent, ChannelPointsCustomRewardRedemptionUpdateSubscription, makeChannelPointsCustomRewardRedemptionUpdateSubscription } from "./channel.channel_points_custom_reward_redemption.update.js"
-import { CharityDonationEvent, CharityDonationSubscription, makeCharityDonationSubscription } from "./channel.charity_campaign.donate.js"
-import { CharityCampaignProgressEvent, CharityCampaignProgressSubscription, makeCharityCampaignProgressSubscription } from "./channel.charity_campaign.progress.js"
-import { CharityCampaignStartEvent, CharityCampaignStartSubscription, makeCharityCampaignStartSubscription } from "./channel.charity_campaign.start.js"
-import { CharityCampaignStopEvent, CharityCampaignStopSubscription, makeCharityCampaignStopSubscription } from "./channel.charity_campaign.stop.js"
-import { ChannelChatClearEvent, ChannelChatClearSubscription, makeChannelChatClearSubscription } from "./channel.chat.clear.js"
-import { ChannelChatClearUserMessagesEvent, ChannelChatClearUserMessagesSubscription, makeChannelChatClearUserMessagesSubscription } from "./channel.chat.clear_user_messages.js"
-import { ChannelChatMessageDeleteEvent, ChannelChatMessageDeleteSubscription, makeChannelChatMessageDeleteSubscription } from "./channel.chat.message_delete.js"
-import { ChannelChatNotificationEvent, ChannelChatNotificationSubscription, makeChannelChatNotificationSubscription } from "./channel.chat.notification.js"
-import { ChannelCheerEvent, ChannelCheerSubscription, makeChannelCheerSubscription } from "./channel.cheer.js"
-import { ChannelFollowEvent, ChannelFollowSubscription, makeChannelFollowSubscription } from "./channel.follow.js"
-import { GoalBeginEvent, GoalBeginSubscription, makeGoalBeginSubscription } from "./channel.goal.begin.js"
-import { GoalEndEvent, GoalEndSubscription, makeGoalEndSubscription } from "./channel.goal.end.js"
-import { GoalProgressEvent, GoalProgressSubscription, makeGoalProgressSubscription } from "./channel.goal.progress.js"
-import { ChannelGuestStarGuestUpdateEvent, ChannelGuestStarGuestUpdateSubscription, makeChannelGuestStarGuestUpdateSubscription } from "./channel.guest_star_guest.update.js"
-import { ChannelGuestStarSessionBeginEvent, ChannelGuestStarSessionBeginSubscription, makeChannelGuestStarSessionBeginSubscription } from "./channel.guest_star_session.begin.js"
-import { ChannelGuestStarSessionEndEvent, ChannelGuestStarSessionEndSubscription, makeChannelGuestStarSessionEndSubscription } from "./channel.guest_star_session.end.js"
-import { ChannelGuestStarSettingsUpdateEvent, ChannelGuestStarSettingsUpdateSubscription, makeChannelGuestStarSettingsUpdateSubscription } from "./channel.guest_star_settings.update.js"
-import { HypeTrainBeginEvent, HypeTrainBeginSubscription, makeHypeTrainBeginSubscription } from "./channel.hype_train.begin.js"
-import { HypeTrainEndEvent, HypeTrainEndSubscription, makeHypeTrainEndSubscription } from "./channel.hype_train.end.js"
-import { HypeTrainProgressEvent, HypeTrainProgressSubscription, makeHypeTrainProgressSubscription } from "./channel.hype_train.progress.js"
-import { ChannelModeratorAddEvent, ChannelModeratorAddSubscription, makeChannelModeratorAddSubscription } from "./channel.moderator.add.js"
-import { ChannelModeratorRemoveEvent, ChannelModeratorRemoveSubscription, makeChannelModeratorRemoveSubscription } from "./channel.moderator.remove.js"
-import { ChannelPollBeginEvent, ChannelPollBeginSubscription, makeChannelPollBeginSubscription } from "./channel.poll.begin.js"
-import { ChannelPollEndEvent, ChannelPollEndSubscription, makeChannelPollEndSubscription } from "./channel.poll.end.js"
-import { ChannelPollProgressEvent, ChannelPollProgressSubscription, makeChannelPollProgressSubscription } from "./channel.poll.progress.js"
-import { ChannelPredictionBeginEvent, ChannelPredictionBeginSubscription, makeChannelPredictionBeginSubscription } from "./channel.prediction.begin.js"
-import { ChannelPredictionEndEvent, ChannelPredictionEndSubscription, makeChannelPredictionEndSubscription } from "./channel.prediction.end.js"
-import { ChannelPredictionLockEvent, ChannelPredictionLockSubscription, makeChannelPredictionLockSubscription } from "./channel.prediction.lock.js"
-import { ChannelPredictionProgressEvent, ChannelPredictionProgressSubscription, makeChannelPredictionProgressSubscription } from "./channel.prediction.progress.js"
-import { ChannelRaidEvent, ChannelRaidSubscription, makeChannelRaidSubscription } from "./channel.raid.js"
-import { ShieldModeBeginEvent, ShieldModeBeginSubscription, makeShieldModeBeginSubscription } from "./channel.shield_mode.begin.js"
-import { ShieldModeEndEvent, ShieldModeEndSubscription, makeShieldModeEndSubscription } from "./channel.shield_mode.end.js"
-import { ShoutoutCreateEvent, ShoutoutCreateSubscription, makeShoutoutCreateSubscription } from "./channel.shoutout.create.js"
-import { ShoutoutReceiveEvent, ShoutoutReceiveSubscription, makeShoutoutReceiveSubscription } from "./channel.shoutout.receive.js"
-import { ChannelSubscribeEvent, ChannelSubscribeSubscription, makeChannelSubscribeSubscription } from "./channel.subscribe.js"
-import { ChannelSubscriptionEndEvent, ChannelSubscriptionEndSubscription, makeChannelSubscriptionEndSubscription } from "./channel.subscription.end.js"
-import { ChannelSubscriptionGiftEvent, ChannelSubscriptionGiftSubscription, makeChannelSubscriptionGiftSubscription } from "./channel.subscription.gift.js"
-import { ChannelSubscriptionMessageEvent, ChannelSubscriptionMessageSubscription, makeChannelSubscriptionMessageSubscription } from "./channel.subscription.message.js"
-import { ChannelUnbanEvent, ChannelUnbanSubscription, makeChannelUnbanSubscription } from "./channel.unban.js"
-import { ChannelUpdateEvent, ChannelUpdateSubscription, makeChannelUpdateSubscription } from "./channel.update.js"
-import { StreamOfflineEvent, StreamOfflineSubscription, makeStreamOfflineSubscription } from "./stream.offline.js"
-import { StreamOnlineEvent, StreamOnlineSubscription, makeStreamOnlineSubscription } from "./stream.online.js"
-import { UserUpdateEvent, UserUpdateSubscription, makeUserUpdateSubscription } from "./user.update.js"
+import { type ChannelAdBreakBeginEvent, type ChannelAdBreakBeginSubscription, makeChannelAdBreakBeginSubscription } from "./channel.ad_break.begin.js"
+import { type ChannelBanEvent, type ChannelBanSubscription, makeChannelBanSubscription } from "./channel.ban.js"
+import { type ChannelPointsCustomRewardAddEvent, type ChannelPointsCustomRewardAddSubscription, makeChannelPointsCustomRewardAddSubscription } from "./channel.channel_points_custom_reward.add.js"
+import { type ChannelPointsCustomRewardRemoveEvent, type ChannelPointsCustomRewardRemoveSubscription, makeChannelPointsCustomRewardRemoveSubscription } from "./channel.channel_points_custom_reward.remove.js"
+import { type ChannelPointsCustomRewardUpdateEvent, type ChannelPointsCustomRewardUpdateSubscription, makeChannelPointsCustomRewardUpdateSubscription } from "./channel.channel_points_custom_reward.update.js"
+import { type ChannelPointsCustomRewardRedemptionAddEvent, type ChannelPointsCustomRewardRedemptionAddSubscription, makeChannelPointsCustomRewardRedemptionAddSubscription } from "./channel.channel_points_custom_reward_redemption.add.js"
+import { type ChannelPointsCustomRewardRedemptionUpdateEvent, type ChannelPointsCustomRewardRedemptionUpdateSubscription, makeChannelPointsCustomRewardRedemptionUpdateSubscription } from "./channel.channel_points_custom_reward_redemption.update.js"
+import { type CharityDonationEvent, type CharityDonationSubscription, makeCharityDonationSubscription } from "./channel.charity_campaign.donate.js"
+import { type CharityCampaignProgressEvent, type CharityCampaignProgressSubscription, makeCharityCampaignProgressSubscription } from "./channel.charity_campaign.progress.js"
+import { type CharityCampaignStartEvent, type CharityCampaignStartSubscription, makeCharityCampaignStartSubscription } from "./channel.charity_campaign.start.js"
+import { type CharityCampaignStopEvent, type CharityCampaignStopSubscription, makeCharityCampaignStopSubscription } from "./channel.charity_campaign.stop.js"
+import { type ChannelChatClearEvent, type ChannelChatClearSubscription, makeChannelChatClearSubscription } from "./channel.chat.clear.js"
+import { type ChannelChatClearUserMessagesEvent, type ChannelChatClearUserMessagesSubscription, makeChannelChatClearUserMessagesSubscription } from "./channel.chat.clear_user_messages.js"
+import { type ChannelChatMessageDeleteEvent, type ChannelChatMessageDeleteSubscription, makeChannelChatMessageDeleteSubscription } from "./channel.chat.message_delete.js"
+import { type ChannelChatNotificationEvent, type ChannelChatNotificationSubscription, makeChannelChatNotificationSubscription } from "./channel.chat.notification.js"
+import { type ChannelCheerEvent, type ChannelCheerSubscription, makeChannelCheerSubscription } from "./channel.cheer.js"
+import { type ChannelFollowEvent, type ChannelFollowSubscription, makeChannelFollowSubscription } from "./channel.follow.js"
+import { type GoalBeginEvent, type GoalBeginSubscription, makeGoalBeginSubscription } from "./channel.goal.begin.js"
+import { type GoalEndEvent, type GoalEndSubscription, makeGoalEndSubscription } from "./channel.goal.end.js"
+import { type GoalProgressEvent, type GoalProgressSubscription, makeGoalProgressSubscription } from "./channel.goal.progress.js"
+import { type ChannelGuestStarGuestUpdateEvent, type ChannelGuestStarGuestUpdateSubscription, makeChannelGuestStarGuestUpdateSubscription } from "./channel.guest_star_guest.update.js"
+import { type ChannelGuestStarSessionBeginEvent, type ChannelGuestStarSessionBeginSubscription, makeChannelGuestStarSessionBeginSubscription } from "./channel.guest_star_session.begin.js"
+import { type ChannelGuestStarSessionEndEvent, type ChannelGuestStarSessionEndSubscription, makeChannelGuestStarSessionEndSubscription } from "./channel.guest_star_session.end.js"
+import { type ChannelGuestStarSettingsUpdateEvent, type ChannelGuestStarSettingsUpdateSubscription, makeChannelGuestStarSettingsUpdateSubscription } from "./channel.guest_star_settings.update.js"
+import { type HypeTrainBeginEvent, type HypeTrainBeginSubscription, makeHypeTrainBeginSubscription } from "./channel.hype_train.begin.js"
+import { type HypeTrainEndEvent, type HypeTrainEndSubscription, makeHypeTrainEndSubscription } from "./channel.hype_train.end.js"
+import { type HypeTrainProgressEvent, type HypeTrainProgressSubscription, makeHypeTrainProgressSubscription } from "./channel.hype_train.progress.js"
+import { type ChannelModeratorAddEvent, type ChannelModeratorAddSubscription, makeChannelModeratorAddSubscription } from "./channel.moderator.add.js"
+import { type ChannelModeratorRemoveEvent, type ChannelModeratorRemoveSubscription, makeChannelModeratorRemoveSubscription } from "./channel.moderator.remove.js"
+import { type ChannelPollBeginEvent, type ChannelPollBeginSubscription, makeChannelPollBeginSubscription } from "./channel.poll.begin.js"
+import { type ChannelPollEndEvent, type ChannelPollEndSubscription, makeChannelPollEndSubscription } from "./channel.poll.end.js"
+import { type ChannelPollProgressEvent, type ChannelPollProgressSubscription, makeChannelPollProgressSubscription } from "./channel.poll.progress.js"
+import { type ChannelPredictionBeginEvent, type ChannelPredictionBeginSubscription, makeChannelPredictionBeginSubscription } from "./channel.prediction.begin.js"
+import { type ChannelPredictionEndEvent, type ChannelPredictionEndSubscription, makeChannelPredictionEndSubscription } from "./channel.prediction.end.js"
+import { type ChannelPredictionLockEvent, type ChannelPredictionLockSubscription, makeChannelPredictionLockSubscription } from "./channel.prediction.lock.js"
+import { type ChannelPredictionProgressEvent, type ChannelPredictionProgressSubscription, makeChannelPredictionProgressSubscription } from "./channel.prediction.progress.js"
+import { type ChannelRaidEvent, type ChannelRaidSubscription, makeChannelRaidSubscription } from "./channel.raid.js"
+import { type ShieldModeBeginEvent, type ShieldModeBeginSubscription, makeShieldModeBeginSubscription } from "./channel.shield_mode.begin.js"
+import { type ShieldModeEndEvent, type ShieldModeEndSubscription, makeShieldModeEndSubscription } from "./channel.shield_mode.end.js"
+import { type ShoutoutCreateEvent, type ShoutoutCreateSubscription, makeShoutoutCreateSubscription } from "./channel.shoutout.create.js"
+import { type ShoutoutReceiveEvent, type ShoutoutReceiveSubscription, makeShoutoutReceiveSubscription } from "./channel.shoutout.receive.js"
+import { type ChannelSubscribeEvent, type ChannelSubscribeSubscription, makeChannelSubscribeSubscription } from "./channel.subscribe.js"
+import { type ChannelSubscriptionEndEvent, type ChannelSubscriptionEndSubscription, makeChannelSubscriptionEndSubscription } from "./channel.subscription.end.js"
+import { type ChannelSubscriptionGiftEvent, type ChannelSubscriptionGiftSubscription, makeChannelSubscriptionGiftSubscription } from "./channel.subscription.gift.js"
+import { type ChannelSubscriptionMessageEvent, type ChannelSubscriptionMessageSubscription, makeChannelSubscriptionMessageSubscription } from "./channel.subscription.message.js"
+import { type ChannelUnbanEvent, type ChannelUnbanSubscription, makeChannelUnbanSubscription } from "./channel.unban.js"
+import { type ChannelUpdateEvent, type ChannelUpdateSubscription, makeChannelUpdateSubscription } from "./channel.update.js"
+import { type StreamOfflineEvent, type StreamOfflineSubscription, makeStreamOfflineSubscription } from "./stream.offline.js"
+import { type StreamOnlineEvent, type StreamOnlineSubscription, makeStreamOnlineSubscription } from "./stream.online.js"
+import { type UserUpdateEvent, type UserUpdateSubscription, makeUserUpdateSubscription } from "./user.update.js"
 
 export * from "./channel.ad_break.begin.js"
 export * from "./channel.ban.js"

package/src/eventsub/events/stream.offline.ts

@@ -1,4 +1,4 @@
-import { BaseSubscription } from "../events-helpers.js"
+import { type BaseSubscription } from "../events-helpers.js"
 
 type StreamOfflineType = "stream.offline"
 type StreamOfflineVersion = "1"

package/src/eventsub/events/stream.online.ts

@@ -1,4 +1,4 @@
-import { BaseSubscription } from "../events-helpers.js"
+import { type BaseSubscription } from "../events-helpers.js"
 
 type StreamOnlineType = "stream.online"
 type StreamOnlineVersion = "1"

package/src/eventsub/events/user.update.ts

@@ -1,4 +1,4 @@
-import { BaseSubscription } from "../events-helpers.js"
+import { type BaseSubscription } from "../events-helpers.js"
 
 type UserUpdateType = "user.update"
 type UserUpdateVersion = "1"

package/src/eventsub/events-helpers.ts

@@ -1,8 +1,8 @@
-export type BaseSubscription<
+export interface BaseSubscription<
   Type = unknown,
   Version = unknown,
   Condition = unknown,
-> = {
+> {
   type: Type
   version: Version
   condition: Condition

package/src/eventsub/eventsub.ts

@@ -1,14 +1,14 @@
 import createDefer from "@overlaysymphony/core/libs/defer"
 import createPubSub from "@overlaysymphony/core/libs/pubsub"
 
-import { Authentication } from "../authentication/index.js"
+import { type Authentication } from "../authentication/index.js"
 import { createSubscription } from "../helix/subscriptions/index.js"
 
 import {
-  TwitchNotificationMessage,
-  TwitchSubscriptionType,
+  type TwitchNotificationMessage,
+  type TwitchSubscriptionType,
 } from "./events/index.js"
-import { TwitchMessage } from "./messages.js"
+import { type TwitchMessage } from "./messages.js"
 
 type EventSubListener = (
   callback: (event: TwitchNotificationMessage["payload"]) => void,
@@ -35,8 +35,8 @@ export async function createEventSub(
   const pubsub = createPubSub<TwitchNotificationMessage["payload"]>()
   const socket = new WebSocket("wss://eventsub.wss.twitch.tv/ws")
 
-  socket.addEventListener("message", async ({ data: rawData }) => {
-    const data = JSON.parse(rawData) as TwitchMessage
+  socket.addEventListener("message", ({ data: rawData }) => {
+    const data = JSON.parse(rawData as string) as TwitchMessage
     data.type = data.metadata.message_type
 
     if (data.type === "session_welcome") {
@@ -58,7 +58,6 @@ export async function createEventSub(
 
     const listen: EventSubListener = (callback) => {
       return pubsub.subscribe((event) => {
-        // @ts-ignore
         callback(event)
       })
     }
@@ -67,14 +66,14 @@ export async function createEventSub(
       for (const type of types) {
         if (!subscriptions[type]) {
           subscriptions[type] = true
-          createSubscription(sessionId, authentication, type)
+          void createSubscription(sessionId, authentication, type)
         }
       }
 
       return pubsub.subscribe((event) => {
-        // @ts-ignore
+        // @ts-expect-error: generic events are complicated
         if (types.includes(event.type)) {
-          // @ts-ignore
+          // @ts-expect-error: generic events are complicated
           callback(event)
         }
       })

package/src/eventsub/messages.ts

@@ -1,4 +1,4 @@
-import { TwitchNotificationMessage } from "./events/index.js"
+import { type TwitchNotificationMessage } from "./events/index.js"
 
 export interface SessionWelcomeMessage {
   type: "session_welcome"

package/src/helix/channel-points/custom-rewards.ts

@@ -1,4 +1,4 @@
-import { Authentication } from "../../authentication/index.js"
+import { type Authentication } from "../../authentication/index.js"
 import { helix } from "../helix.js"
 
 interface CustomReward {
@@ -49,8 +49,7 @@ export async function getCustomRewards(
     never,
     {
       broadcaster_id: string
-    },
-    never
+    }
   >(authentication, {
     method: "get",
     path: "/channel_points/custom_rewards",

package/src/helix/helix.ts

@@ -1,6 +1,6 @@
 import querystring from "@overlaysymphony/core/libs/querystring"
 
-import { Authentication } from "../authentication/index.js"
+import { type Authentication } from "../authentication/index.js"
 
 export async function helix<
   Data = never,

package/src/helix/subscriptions/subscriptions.ts

@@ -1,10 +1,10 @@
-import { Authentication } from "../../authentication/index.js"
+import { type Authentication } from "../../authentication/index.js"
 import {
-  TwitchSubscription,
-  TwitchSubscriptionType,
+  type TwitchSubscription,
+  type TwitchSubscriptionType,
   buildSubscription,
 } from "../../eventsub/events/index.js"
-import { BaseSubscription } from "../../eventsub/events-helpers.js"
+import { type BaseSubscription } from "../../eventsub/events-helpers.js"
 import { helix } from "../helix.js"
 
 interface SubscriptionWebhookTransport {
@@ -22,7 +22,7 @@ type SubscriptionTransport =
   | SubscriptionWebhookTransport
   | SubscriptionWebsocketTransport
 
-export type SubscriptionRequest<Subscription extends BaseSubscription> = {
+export interface SubscriptionRequest<Subscription extends BaseSubscription> {
   type: Subscription["type"]
   version: Subscription["version"]
   condition: Subscription["condition"]
@@ -61,20 +61,11 @@ export async function createSubscription<
   authentication: Authentication,
   type: Type,
 ): Promise<ActiveSubscription<Subscription>> {
-  const subscription = buildSubscription(
-    type,
-    authentication.user.id,
-  ) as Subscription
+  const subscription = buildSubscription(type, authentication.user.id)
 
-  const [activeSubscription] = await helix<
-    ActiveSubscription<Subscription>,
-    never,
-    never,
-    SubscriptionRequest<Subscription>
-  >(authentication, {
+  const [activeSubscription] = await helix(authentication, {
     method: "post",
     path: "/eventsub/subscriptions",
-    // @ts-ignore
     body: {
       ...subscription,
       transport: {
@@ -91,7 +82,7 @@ export async function deleteSubscription(
   authentication: Authentication,
   id: string,
 ): Promise<void> {
-  await helix<never, never, { id: string }, never>(authentication, {
+  await helix<never, never, { id: string }>(authentication, {
     method: "delete",
     path: "/eventsub/subscriptions",
     params: {
@@ -111,8 +102,7 @@ export async function getSubscriptions(
       type?: TwitchSubscriptionType
       user_id?: string
       after?: string
-    },
-    never
+    }
   >(authentication, {
     method: "get",
     path: "/eventsub/subscriptions",

package/src/helix/users/users.ts

@@ -1,4 +1,4 @@
-import { Authentication } from "../../authentication/index.js"
+import { type Authentication } from "../../authentication/index.js"
 import { helix } from "../helix.js"
 
 export interface TwitchUser {

package/src/helpers/alerts/alerts.ts

@@ -1,7 +1,7 @@
-import createQueue, { Queue } from "@overlaysymphony/core/libs/queue"
+import createQueue, { type Queue } from "@overlaysymphony/core/libs/queue"
 
-import { TwitchNotificationMessage } from "../../eventsub/events/index.js"
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchNotificationMessage } from "../../eventsub/events/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export type Alert = TwitchNotificationMessage<
   | "channel.cheer"

package/src/helpers/charity/charity.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Charity {
   name: string

package/src/helpers/goal/goal.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Goal {
   type: string

package/src/helpers/hype-train/hype-train.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface HypeTrain {
   level: number

package/src/helpers/poll/poll.ts

@@ -1,6 +1,7 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Poll {
+  id: string
   title: string
   choices: Array<{
     id: string
@@ -10,7 +11,7 @@ export interface Poll {
     votesChannelPoints: number
     votesNormal: number
   }>
-  endsAt: Date
+  endsAt?: Date
 }
 
 const mapTypeToTrigger = {
@@ -24,14 +25,25 @@ export function onPoll(
   handlePoll: (poll: Poll, trigger: "begin" | "progress" | "end") => void,
 ): void {
   const poll: Poll = {
+    id: "",
     title: "",
     choices: [],
-    endsAt: new Date(""),
+    endsAt: undefined,
   }
 
   eventsub.subscribe(
     ["channel.poll.begin", "channel.poll.progress", "channel.poll.end"],
     (payload) => {
+      // Twitch sometimes sends duplicate end events.
+      if (payload.type === "channel.poll.end") {
+        // Skip if its already ended
+        if (typeof poll.endsAt === "undefined") return
+
+        // Skip if its for the wrong poll.
+        if (payload.event.id !== poll.id) return
+      }
+
+      poll.id = payload.event.id
       poll.title = payload.event.title
       poll.choices = payload.event.choices.map(
         ({
@@ -55,6 +67,8 @@ export function onPoll(
         payload.type === "channel.poll.progress"
       ) {
         poll.endsAt = payload.event.ends_at
+      } else {
+        poll.endsAt = undefined
       }
 
       handlePoll(poll, mapTypeToTrigger[payload.type])

package/src/helpers/prediction/prediction.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Prediction {
   title: string

package/src/helpers/redemption/redemption.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Redemption {
   id: string
@@ -14,16 +14,35 @@ export interface Redemption {
   }
 }
 
+export function onRedemption(
+  eventsub: TwitchEventSub,
+  handleRedemption: (redemption: Redemption) => void,
+): void
 export function onRedemption(
   eventsub: TwitchEventSub,
   id: string,
   handleRedemption: (redemption: Redemption) => void,
+): void
+
+export function onRedemption(
+  eventsub: TwitchEventSub,
+  ...config:
+    | [string, (redemption: Redemption) => void]
+    | [(redemption: Redemption) => void]
 ): void {
+  const id = typeof config[0] === "string" ? config[0] : undefined
+  const handleRedemption =
+    typeof config[0] === "function"
+      ? config[0]
+      : typeof config[1] === "function"
+        ? config[1]
+        : undefined
+
   eventsub.subscribe(
     ["channel.channel_points_custom_reward_redemption.add"],
     (payload) => {
       if (payload.event.reward.id === id) {
-        handleRedemption({
+        handleRedemption?.({
           id: payload.event.id,
           userId: payload.event.user_id,
           userLogin: payload.event.user_login,

package/src/helpers/status/status.ts

@@ -1,4 +1,4 @@
-import { TwitchEventSub } from "../../eventsub/index.js"
+import { type TwitchEventSub } from "../../eventsub/index.js"
 
 export interface Status {
   online: boolean