@overlaysymphony/twitch 0.3.4 → 0.4.0

package/src/eventsub/events/channel.moderate-2.ts

@@ -247,12 +247,12 @@ registerEvent("channel.moderate", {
     "moderator:read:vips",
     "moderator:read:warnings",
   ],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.moderate",
     version: "2",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.moderator.add-1.ts

@@ -34,11 +34,11 @@ type ChannelModeratorAdd = EventConfig<{
 
 registerEvent("channel.moderator.add", {
   scopes: ["moderation:read"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.moderator.add",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.moderator.remove-1.ts

@@ -34,11 +34,11 @@ type ChannelModeratorRemove = EventConfig<{
 
 registerEvent("channel.moderator.remove", {
   scopes: ["moderation:read"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.moderator.remove",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.poll.begin-1.ts

@@ -63,11 +63,11 @@ type ChannelPollBegin = EventConfig<{
 
 registerEvent("channel.poll.begin", {
   scopes: ["channel:manage:polls", "channel:read:polls"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.poll.begin",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.poll.end-1.ts

@@ -65,11 +65,11 @@ type ChannelPollEnd = EventConfig<{
 
 registerEvent("channel.poll.end", {
   scopes: ["channel:manage:polls", "channel:read:polls"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.poll.end",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.poll.progress-1.ts

@@ -63,11 +63,11 @@ type ChannelPollProgress = EventConfig<{
 
 registerEvent("channel.poll.progress", {
   scopes: ["channel:manage:polls", "channel:read:polls"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.poll.progress",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.prediction.begin-1.ts

@@ -62,11 +62,11 @@ type ChannelPredictionBegin = EventConfig<{
 
 registerEvent("channel.prediction.begin", {
   scopes: ["channel:manage:predictions", "channel:read:predictions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.prediction.begin",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.prediction.end-1.ts

@@ -66,11 +66,11 @@ type ChannelPredictionEnd = EventConfig<{
 
 registerEvent("channel.prediction.end", {
   scopes: ["channel:manage:predictions", "channel:read:predictions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.prediction.end",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.prediction.lock-1.ts

@@ -62,11 +62,11 @@ type ChannelPredictionLock = EventConfig<{
 
 registerEvent("channel.prediction.lock", {
   scopes: ["channel:manage:predictions", "channel:read:predictions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.prediction.lock",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.prediction.progress-1.ts

@@ -62,11 +62,11 @@ type ChannelPredictionProgress = EventConfig<{
 
 registerEvent("channel.prediction.progress", {
   scopes: ["channel:manage:predictions", "channel:read:predictions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.prediction.progress",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.raid-1.ts

@@ -38,11 +38,11 @@ type ChannelRaid = EventConfig<{
 
 registerEvent("channel.raid", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.raid",
     version: "1",
     condition: {
-      to_broadcaster_user_id: userId,
+      to_broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shared_chat.begin-1.ts

@@ -45,11 +45,11 @@ type ChannelSharedChatBegin = EventConfig<{
 
 registerEvent("channel.shared_chat.begin", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shared_chat.begin",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shared_chat.end-1.ts

@@ -36,11 +36,11 @@ type ChannelSharedChatEnd = EventConfig<{
 
 registerEvent("channel.shared_chat.end", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shared_chat.end",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shared_chat.update-1.ts

@@ -45,11 +45,11 @@ type ChannelSharedChatUpdate = EventConfig<{
 
 registerEvent("channel.shared_chat.update", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shared_chat.update",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shield_mode.begin-1.ts

@@ -40,12 +40,12 @@ type ChannelShieldModeBegin = EventConfig<{
 
 registerEvent("channel.shield_mode.begin", {
   scopes: ["moderator:manage:shield", "moderator:read:shield"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shield_mode.begin",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shield_mode.end-1.ts

@@ -40,12 +40,12 @@ type ChannelShieldModeEnd = EventConfig<{
 
 registerEvent("channel.shield_mode.end", {
   scopes: ["moderator:manage:shield", "moderator:read:shield"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shield_mode.end",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shoutout.create-1.ts

@@ -50,12 +50,12 @@ type ChannelShoutoutCreate = EventConfig<{
 
 registerEvent("channel.shoutout.create", {
   scopes: ["moderator:manage:shoutouts", "moderator:read:shoutouts"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shoutout.create",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.shoutout.receive-1.ts

@@ -40,12 +40,12 @@ type ChannelShoutoutReceive = EventConfig<{
 
 registerEvent("channel.shoutout.receive", {
   scopes: ["moderator:manage:shoutouts", "moderator:read:shoutouts"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.shoutout.receive",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.subscribe-1.ts

@@ -38,11 +38,11 @@ type ChannelSubscribe = EventConfig<{
 
 registerEvent("channel.subscribe", {
   scopes: ["channel:read:subscriptions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.subscribe",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.subscription.end-1.ts

@@ -38,11 +38,11 @@ type ChannelSubscriptionEnd = EventConfig<{
 
 registerEvent("channel.subscription.end", {
   scopes: ["channel:read:subscriptions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.subscription.end",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.subscription.gift-1.ts

@@ -42,11 +42,11 @@ type ChannelSubscriptionGift = EventConfig<{
 
 registerEvent("channel.subscription.gift", {
   scopes: ["channel:read:subscriptions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.subscription.gift",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.subscription.message-1.ts

@@ -56,11 +56,11 @@ type ChannelSubscriptionMessage = EventConfig<{
 
 registerEvent("channel.subscription.message", {
   scopes: ["channel:read:subscriptions"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.subscription.message",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.suspicious_user.message-1.ts

@@ -74,12 +74,12 @@ type ChannelSuspiciousUserMessage = EventConfig<{
 
 registerEvent("channel.suspicious_user.message", {
   scopes: ["moderator:read:suspicious"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.suspicious_user.message",
     version: "1",
     condition: {
-      moderator_user_id: userId,
-      broadcaster_user_id: userId,
+      moderator_user_id: currentUserId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.suspicious_user.update-1.ts

@@ -44,12 +44,12 @@ type ChannelSuspiciousUserUpdate = EventConfig<{
 
 registerEvent("channel.suspicious_user.update", {
   scopes: ["moderator:read:suspicious"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.suspicious_user.update",
     version: "1",
     condition: {
-      moderator_user_id: userId,
-      broadcaster_user_id: userId,
+      moderator_user_id: currentUserId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.unban-1.ts

@@ -40,11 +40,11 @@ type ChannelUnban = EventConfig<{
 
 registerEvent("channel.unban", {
   scopes: ["channel:moderate"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.unban",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.unban_request.create-1.ts

@@ -42,12 +42,12 @@ type ChannelUnbanRequestCreate = EventConfig<{
 
 registerEvent("channel.unban_request.create", {
   scopes: ["moderator:manage:unban", "moderator:read:unban"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.unban_request.create",
     version: "1",
     condition: {
-      moderator_user_id: userId,
-      broadcaster_user_id: userId,
+      moderator_user_id: currentUserId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.unban_request.resolve-1.ts

@@ -53,12 +53,12 @@ type ChannelUnbanRequestResolve = EventConfig<{
 
 registerEvent("channel.unban_request.resolve", {
   scopes: ["moderator:manage:unban", "moderator:read:unban"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.unban_request.resolve",
     version: "1",
     condition: {
-      moderator_user_id: userId,
-      broadcaster_user_id: userId,
+      moderator_user_id: currentUserId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.update-2.ts

@@ -38,11 +38,11 @@ type ChannelUpdate = EventConfig<{
 
 registerEvent("channel.update", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.update",
     version: "2",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.vip.add-1.ts

@@ -34,11 +34,11 @@ type ChannelVipAdd = EventConfig<{
 
 registerEvent("channel.vip.add", {
   scopes: ["channel:manage:vips", "channel:read:vips"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.vip.add",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.vip.remove-1.ts

@@ -34,11 +34,11 @@ type ChannelVipRemove = EventConfig<{
 
 registerEvent("channel.vip.remove", {
   scopes: ["channel:manage:vips", "channel:read:vips"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.vip.remove",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

package/src/eventsub/events/channel.warning.acknowledge-1.ts

@@ -36,12 +36,12 @@ type ChannelWarningAcknowledge = EventConfig<{
 
 registerEvent("channel.warning.acknowledge", {
   scopes: ["moderator:manage:warnings", "moderator:read:warnings"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.warning.acknowledge",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/channel.warning.send-1.ts

@@ -46,12 +46,12 @@ type ChannelWarningSend = EventConfig<{
 
 registerEvent("channel.warning.send", {
   scopes: ["moderator:manage:warnings", "moderator:read:warnings"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "channel.warning.send",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
-      moderator_user_id: userId,
+      broadcaster_user_id: targetUserId,
+      moderator_user_id: currentUserId,
     },
   }),
 })

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

@@ -28,11 +28,11 @@ type StreamOffline = EventConfig<{
 
 registerEvent("stream.offline", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "stream.offline",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

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

@@ -34,11 +34,11 @@ type StreamOnline = EventConfig<{
 
 registerEvent("stream.online", {
   scopes: [],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "stream.online",
     version: "1",
     condition: {
-      broadcaster_user_id: userId,
+      broadcaster_user_id: targetUserId,
     },
   }),
 })

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

@@ -38,11 +38,11 @@ type UserUpdate = EventConfig<{
 
 registerEvent("user.update", {
   scopes: ["user:read:email"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "user.update",
     version: "1",
     condition: {
-      user_id: userId,
+      user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events/user.whisper.message-1.ts

@@ -41,11 +41,11 @@ type UserWhisperMessage = EventConfig<{
 
 registerEvent("user.whisper.message", {
   scopes: ["user:manage:whispers", "user:read:whispers"],
-  subscriber: (userId) => ({
+  subscriber: (currentUserId, targetUserId) => ({
     type: "user.whisper.message",
     version: "1",
     condition: {
-      user_id: userId,
+      user_id: currentUserId,
     },
   }),
 })

package/src/eventsub/events-helpers.ts

@@ -32,7 +32,10 @@ export type EventConfig<
 const events: {
   [Type in EventType]?: {
     scopes: string[]
-    subscriber: (userId: string) => EventConfigs[Type]["Subscription"]
+    subscriber: (
+      currentUserId: string,
+      targetUserId: string,
+    ) => EventConfigs[Type]["Subscription"]
   }
 } = {}
 
@@ -40,7 +43,10 @@ export function registerEvent<Type extends EventType>(
   type: Type,
   config: {
     scopes: string[]
-    subscriber: (userId: string) => EventConfigs[Type]["Subscription"]
+    subscriber: (
+      currentUserId: string,
+      targetUserId: string,
+    ) => EventConfigs[Type]["Subscription"]
   },
 ): void {
   // @ts-expect-error too complex for typescript
@@ -49,9 +55,10 @@ export function registerEvent<Type extends EventType>(
 
 export function buildSubscription<Type extends EventType>(
   type: Type,
-  userId: string,
+  currentUserId: string,
+  targetUserId: string,
 ): EventConfigs[Type]["Subscription"] {
   if (!events[type]) throw new Error(`Event ${type} is not registered.`)
 
-  return events[type].subscriber(userId)
+  return events[type].subscriber(currentUserId, targetUserId)
 }