From abfc19f66b441df5b322216486d1f30f25eb8bb3 Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Tue, 26 Jul 2022 21:44:28 +0200
Subject: [PATCH 1/6] fix: Fix wrong font-family and meta name

---
 samples/streamelements-events/graphics/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/samples/streamelements-events/graphics/index.html b/samples/streamelements-events/graphics/index.html
index 095b7e6f0..6deecc874 100644
--- a/samples/streamelements-events/graphics/index.html
+++ b/samples/streamelements-events/graphics/index.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <meta charstreamElementsReplicantt="UTF-8" />
+        <meta charset="UTF-8" />
         <title>streamelements-events sample bundle</title>
         <style>
             body {
-                font-family: sans-streamElementsReplicantrif;
+                font-family: sans-serif;
             }
             /* don't show container until vue has compiled all templates */
             [v-cloak] {

From d2abaa2d257d390c17a0624a6cbe165dc9eaada1 Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Tue, 26 Jul 2022 22:18:27 +0200
Subject: [PATCH 2/6] feat: Add event-specific interface types to
 streamelements

---
 .../extension/StreamElements.ts               |  35 +++--
 .../extension/StreamElementsEvent.ts          | 142 +++++++++++++++++-
 2 files changed, 159 insertions(+), 18 deletions(-)

diff --git a/services/nodecg-io-streamelements/extension/StreamElements.ts b/services/nodecg-io-streamelements/extension/StreamElements.ts
index 20e4a1d0e..75ac3f4aa 100644
--- a/services/nodecg-io-streamelements/extension/StreamElements.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElements.ts
@@ -1,17 +1,22 @@
 import io = require("socket.io-client");
 import { Result, emptySuccess, error } from "nodecg-io-core";
-import { StreamElementsEvent } from "./StreamElementsEvent";
+import {
+    StreamElementsCheerEvent,
+    StreamElementsEvent,
+    StreamElementsFollowEvent,
+    StreamElementsHostEvent, StreamElementsRaidEvent, StreamElementsSubscriberEvent, StreamElementsTipEvent
+} from "./StreamElementsEvent";
 import { EventEmitter } from "events";
 import { Replicant } from "nodecg-types/types/server";
 
 export interface StreamElementsReplicant {
-    lastSubscriber?: StreamElementsEvent;
-    lastTip?: StreamElementsEvent;
-    lastCheer?: StreamElementsEvent;
-    lastGift?: StreamElementsEvent;
-    lastFollow?: StreamElementsEvent;
-    lastRaid?: StreamElementsEvent;
-    lastHost?: StreamElementsEvent;
+    lastSubscriber?: StreamElementsSubscriberEvent;
+    lastTip?: StreamElementsTipEvent;
+    lastCheer?: StreamElementsCheerEvent;
+    lastGift?: StreamElementsSubscriberEvent;
+    lastFollow?: StreamElementsFollowEvent;
+    lastRaid?: StreamElementsRaidEvent;
+    lastHost?: StreamElementsHostEvent;
 }
 
 export class StreamElementsServiceClient extends EventEmitter {
@@ -111,31 +116,31 @@ export class StreamElementsServiceClient extends EventEmitter {
         });
     }
 
-    public onSubscriber(handler: (data: StreamElementsEvent) => void): void {
+    public onSubscriber(handler: (data: StreamElementsSubscriberEvent) => void): void {
         this.on("subscriber", handler);
     }
 
-    public onTip(handler: (data: StreamElementsEvent) => void): void {
+    public onTip(handler: (data: StreamElementsTipEvent) => void): void {
         this.on("tip", handler);
     }
 
-    public onCheer(handler: (data: StreamElementsEvent) => void): void {
+    public onCheer(handler: (data: StreamElementsCheerEvent) => void): void {
         this.on("cheer", handler);
     }
 
-    public onGift(handler: (data: StreamElementsEvent) => void): void {
+    public onGift(handler: (data: StreamElementsSubscriberEvent) => void): void {
         this.on("gift", handler);
     }
 
-    public onFollow(handler: (data: StreamElementsEvent) => void): void {
+    public onFollow(handler: (data: StreamElementsFollowEvent) => void): void {
         this.on("follow", handler);
     }
 
-    public onRaid(handler: (data: StreamElementsEvent) => void): void {
+    public onRaid(handler: (data: StreamElementsRaidEvent) => void): void {
         this.on("raid", handler);
     }
 
-    public onHost(handler: (data: StreamElementsEvent) => void): void {
+    public onHost(handler: (data: StreamElementsHostEvent) => void): void {
         this.on("host", handler);
     }
 
diff --git a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
index ed810b4b0..883bf5b8b 100644
--- a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
@@ -1,13 +1,19 @@
 /**
- * This file was automatically generated by json-schema-to-typescript
+ * StreamElementsEvent was automatically generated by json-schema-to-typescript
  * using the schema at https://docs.streamelements.com/docs/connecting-via-websocket.
  */
 
+// Generic types for all events
+
 export interface StreamElementsEvent {
     /**
      * StreamElements hexadecimal Event ID
      */
     _id: string;
+    /**
+     * StreamElements hexadecimal activity ID
+     */
+    activityId: string;
     /**
      * StreamElements hexadecimal Channel ID
      */
@@ -55,7 +61,7 @@ export interface StreamElementsEventData {
      */
     providerId?: string;
     /**
-     * Twitch username case sensitive plus regional characters if provided
+     * Twitch username case-sensitive plus regional characters if provided
      */
     displayName: string;
     /**
@@ -112,7 +118,7 @@ export interface StreamElementsTestEventData {
      */
     providerId?: string;
     /**
-     * Twitch username case sensitive plus regional characters if provided
+     * Twitch username case-sensitive plus regional characters if provided
      */
     displayName: string;
     /**
@@ -154,3 +160,133 @@ export interface StreamElementsTestEventData {
     avatar: string;
     [k: string]: unknown;
 }
+
+// Specific types for each event:
+
+interface StreamElementsBaseEvent<TType, TData> {
+    /**
+     * StreamElements hexadecimal Event ID
+     */
+    _id: string;
+    /**
+     * StreamElements hexadecimal activity ID
+     */
+    activityId: string;
+    /**
+     * StreamElements hexadecimal Channel ID (not your channel name)
+     */
+    channel: string;
+    /**
+     * Event creation date and time. E.g. 2021-11-20T19:11:17.472Z
+     */
+    createdAt: string;
+    /**
+     * Event update date and time. E.g. 2021-11-20T19:11:17.472Z
+     */
+    updatedAt: string;
+    /**
+     * The internal event data.
+     */
+    data: TData | StreamElementsDataBase;
+    flagged: boolean;
+    /**
+     * Event provider
+     */
+    provider: "twitch" | "youtube" | "facebook";
+    /**
+     * Event type
+     */
+    type: TType;
+}
+
+interface StreamElementsDataBase {
+    /**
+     * The url of the user's avatar.
+     */
+    avatar: string;
+    /**
+     * The users display name.
+     */
+    displayName: string;
+    /**
+     * The user's Twitch username.
+     */
+    username: string;
+    /**
+     * The Twitch Channel ID
+     */
+    providerId?: string;
+}
+
+export type StreamElementsFollowEvent = StreamElementsBaseEvent<"follow", {}>;
+
+export type StreamElementsCheerEvent = StreamElementsBaseEvent<"cheer", {
+    /**
+     * The count of bits that were cheered.
+     */
+    amount: number;
+    /**
+     * The message contained in the cheer.
+     */
+    message: string;
+}>;
+
+export type StreamElementsHostEvent = StreamElementsBaseEvent<"host", {
+    /**
+     * Number of viewers that are watching through this host.
+     */
+    amount: number;
+}>;
+
+export type StreamElementsRaidEvent = StreamElementsBaseEvent<"raid", {
+    /**
+     * Number of viewers raiding this channel.
+     */
+    amount: number;
+}>;
+
+export type StreamElementsSubscriberEvent = StreamElementsBaseEvent<"subscriber", {
+    /**
+     * The total amount of months that this user has already subscribed.
+     */
+    amount: number;
+    /**
+     * True if this sub was gifted by someone else.
+     */
+    gifted?: boolean;
+    /**
+     * The username of the user that has gifted this sub.
+     */
+    sender?: string;
+    /**
+     * Subscription message by user
+     */
+    message: string;
+    /**
+     * Amount of consequent months this user already has subscribed.
+     */
+    streak: number;
+    /**
+     * The tier of the subscription.
+     */
+    tier: "1000" | "2000" | "3000" | "prime";
+}>;
+
+export type StreamElementsTipEvent = StreamElementsBaseEvent<"tip", {
+    /**
+     * The amount of money in the given currency that was tipped.
+     */
+    amount: number;
+    /**
+     * The user provided message for this tip.
+     */
+    message: string;
+    /**
+     * The currency symbol.
+     */
+    currency: string;
+    /**
+     * StreamElements's hexadecimal tip ID.
+     */
+    tipId: string;
+}>

From b054e7eb39660a2cb6f5534f1856a70d3377bc6c Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Tue, 26 Jul 2022 22:40:10 +0200
Subject: [PATCH 3/6] feat: Add test-event-specific interface types to
 streamelements

---
 .../extension/StreamElements.ts               |  38 ++++++-
 .../extension/StreamElementsEvent.ts          | 104 ++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/services/nodecg-io-streamelements/extension/StreamElements.ts b/services/nodecg-io-streamelements/extension/StreamElements.ts
index 75ac3f4aa..62d83dc84 100644
--- a/services/nodecg-io-streamelements/extension/StreamElements.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElements.ts
@@ -4,7 +4,14 @@ import {
     StreamElementsCheerEvent,
     StreamElementsEvent,
     StreamElementsFollowEvent,
-    StreamElementsHostEvent, StreamElementsRaidEvent, StreamElementsSubscriberEvent, StreamElementsTipEvent
+    StreamElementsHostEvent,
+    StreamElementsRaidEvent,
+    StreamElementsSubscriberEvent,
+    StreamElementsTestCheerEvent,
+    StreamElementsTestFollowEvent,
+    StreamElementsTestHostEvent, StreamElementsTestRaidEvent,
+    StreamElementsTestSubscriberEvent,
+    StreamElementsTipEvent
 } from "./StreamElementsEvent";
 import { EventEmitter } from "events";
 import { Replicant } from "nodecg-types/types/server";
@@ -50,6 +57,7 @@ export class StreamElementsServiceClient extends EventEmitter {
             this.onTestEvent((data: StreamElementsEvent) => {
                 if (data.listener) {
                     this.emit("test", data);
+                    this.emit("test:" + data.listener, data);
                 }
             });
         }
@@ -148,6 +156,34 @@ export class StreamElementsServiceClient extends EventEmitter {
         this.on("test", handler);
     }
 
+    public onTestSubscription(handler: (data: StreamElementsTestSubscriberEvent) => void): void {
+        this.on("test:subscription-latest", handler);
+    }
+
+    public onTestCheer(handler: (data: StreamElementsTestCheerEvent) => void): void {
+        this.on("test:cheer-latest", handler);
+    }
+
+    public onTestGift(handler: (data: StreamElementsTestSubscriberEvent) => void): void {
+        this.on("test:subscriber-latest", d => {
+            if(d.data.gifted) {
+                handler(d);
+            }
+        });
+    }
+
+    public onTestFollow(handler: (data: StreamElementsTestFollowEvent) => void): void {
+        this.on("test:follow-latest", handler);
+    }
+
+    public onTestRaid(handler: (data: StreamElementsTestRaidEvent) => void): void {
+        this.on("test:raid-latest", handler);
+    }
+
+    public onTestHost(handler: (data: StreamElementsTestHostEvent) => void): void {
+        this.on("test:host-latest", handler);
+    }
+
     public setupReplicant(rep: Replicant<StreamElementsReplicant>): void {
         if (rep.value === undefined) {
             rep.value = {};
diff --git a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
index 883bf5b8b..a3724b019 100644
--- a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
@@ -44,6 +44,7 @@ export interface StreamElementsEvent {
      * Event property for test events
      */
     event?: StreamElementsTestEventData;
+
     [k: string]: unknown;
 }
 
@@ -101,6 +102,7 @@ export interface StreamElementsEventData {
      * URI of user avatar
      */
     avatar: string;
+
     [k: string]: unknown;
 }
 
@@ -158,6 +160,7 @@ export interface StreamElementsTestEventData {
      * URI of user avatar
      */
     avatar: string;
+
     [k: string]: unknown;
 }
 
@@ -290,3 +293,104 @@ export type StreamElementsTipEvent = StreamElementsBaseEvent<"tip", {
      */
     tipId: string;
 }>
+
+interface StreamElementsBaseTestEvent<TListener, TEvent> {
+    /**
+     * Event provider
+     */
+    provider: "twitch" | "youtube" | "facebook";
+    listener: TListener,
+    event: TEvent | StreamElementsTestDataBase
+}
+
+interface StreamElementsTestDataBase {
+    /**
+     * The url of the user's avatar.
+     */
+    avatar: string;
+    /**
+     * The users display name.
+     */
+    displayName: string;
+    /**
+     * The user's Twitch username.
+     */
+    name: string;
+    /**
+     * The Twitch Channel ID
+     */
+    providerId?: string;
+}
+
+export type StreamElementsTestFollowEvent = StreamElementsBaseTestEvent<"follower-latest", {}>
+
+export type StreamElementsTestCheerEvent = StreamElementsBaseTestEvent<"cheer-latest", {
+    /**
+     * The count of bits that were cheered.
+     */
+    amount: number;
+    /**
+     * The message contained in the cheer.
+     */
+    message: string;
+}>
+
+export type StreamElementsTestHostEvent = StreamElementsBaseTestEvent<"host-latest", {
+    /**
+     * Number of viewers that are watching through this host.
+     */
+    amount: number;
+}>
+
+export type StreamElementsTestRaidEvent = StreamElementsBaseTestEvent<"raid-latest", {
+    /**
+     * Number of viewers raiding this channel.
+     */
+    amount: number;
+}>
+
+export type StreamElementsTestSubscriberEvent = StreamElementsBaseTestEvent<"subscriber-latest", {
+    /**
+     * The total amount of months that this user has already subscribed.
+     */
+    amount: number;
+    /**
+     * True if this sub was gifted by someone else.
+     */
+    gifted?: boolean;
+    /**
+     * The username of the user that has gifted this sub.
+     */
+    sender?: string;
+    /**
+     * Subscription message by user
+     */
+    message: string;
+    /**
+     * Amount of consequent months this user already has subscribed.
+     */
+    streak: number;
+    /**
+     * The tier of the subscription.
+     */
+    tier: "1000" | "2000" | "3000" | "prime";
+}>
+
+export type StreamElementsTestTipEvent = StreamElementsBaseTestEvent<"tip-latest", {
+    /**
+     * The amount of money in the given currency that was tipped.
+     */
+    amount: number;
+    /**
+     * The user provided message for this tip.
+     */
+    message: string;
+    /**
+     * The currency symbol.
+     */
+    currency: string;
+    /**
+     * StreamElements's hexadecimal tip ID.
+     */
+    tipId: string;
+}>
\ No newline at end of file

From 5f58abb11fc0c4c16d3960b10c361a08eb964960 Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Wed, 27 Jul 2022 22:00:04 +0200
Subject: [PATCH 4/6] fix: Type and missing Test-Tip in Stream Elements

---
 .../streamelements-events/extension/index.ts  | 69 +++++++++++++------
 .../extension/StreamElements.ts               | 11 +--
 .../extension/StreamElementsEvent.ts          |  4 +-
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/samples/streamelements-events/extension/index.ts b/samples/streamelements-events/extension/index.ts
index 82547c832..2aea82570 100644
--- a/samples/streamelements-events/extension/index.ts
+++ b/samples/streamelements-events/extension/index.ts
@@ -17,45 +17,56 @@ module.exports = function (nodecg: NodeCG) {
             );
         });
 
+        client.onTestCheer((data) => {
+            nodecg.log.info(
+                `${data.event.displayName} just cheered ${data.event.amount} bit(s). Message: ${data.event.message}`,
+            );
+        });
+
         client.onFollow((data) => {
             nodecg.log.info(`${data.data.displayName} just followed.`);
         });
 
+        client.onTestFollow((data) => {
+            nodecg.log.info(`${data.event.displayName} just followed.`);
+        });
+
         client.onSubscriber((data) => {
-            if (data.data.tier) {
-                const tier =
-                    data.data.tier === "prime" ? "Twitch Prime" : "Tier " + Number.parseInt(data.data.tier) / 1000;
-                nodecg.log.info(`${data.data.displayName} just subscribed for ${data.data.amount} months (${tier}).`);
-            }
+            nodecg.log.info(`${data.data.displayName} just subscribed for ${data.data.amount} months (${formatSubTier(data.data.tier)}).`);
         });
 
+        client.onTestSubscription((data) => {
+            nodecg.log.info(`${data.event.displayName} just subscribed for ${data.event.amount} months (${formatSubTier(data.event.tier)}).`);
+        })
+
         client.onGift((data) => {
-            if (data.data.tier) {
-                // We want to display the tier as 1, 2, 3
-                // However StreamElements stores the sub tiers as 1000, 2000 and 3000.
-                // So we divide the tier by 1000 to get the tier in our expected format.
-                // We don't need to care about prime subs here because they cannot be gifted.
-                const tier = (Number.parseInt(data.data.tier) / 1000).toString();
-                if (data.data.sender) {
-                    nodecg.log.info(
-                        `${data.data.displayName} just got a tier ${tier} subscription from ${data.data.sender}! It's ${data.data.displayName}'s ${data.data.amount} month.`,
-                    );
-                } else {
-                    nodecg.log.info(
-                        `${data.data.displayName} just got a tier ${tier} subscription! It's ${data.data.displayName}'s ${data.data.amount} month.`,
-                    );
-                }
-            }
+            nodecg.log.info(
+                `${data.data.displayName} just got a tier ${formatSubTier(data.data.tier)} subscription from ${data.data.sender ?? "anonymous"}! It's ${data.data.displayName}'s ${data.data.amount} month.`,
+            );
         });
 
+        client.onTestGift((data) => {
+            nodecg.log.info(
+                `${data.event.displayName} just got a tier ${formatSubTier(data.event.tier)} subscription from ${data.event.sender ?? "anonymous"}! It's ${data.event.displayName}'s ${data.event.amount} month.`,
+            );
+        })
+
         client.onHost((data) => {
             nodecg.log.info(`${data.data.displayName} just hosted the stream for ${data.data.amount} viewer(s).`);
         });
 
+        client.onTestHost((data) => {
+            nodecg.log.info(`${data.event.displayName} just hosted the stream for ${data.event.amount} viewer(s).`);
+        })
+
         client.onRaid((data) => {
             nodecg.log.info(`${data.data.displayName} just raided the stream with ${data.data.amount} viewers.`);
         });
 
+        client.onTestRaid((data) => {
+            nodecg.log.info(`${data.event.displayName} just raided the stream with ${data.event.amount} viewers.`);
+        });
+
         client.onTip((data) => {
             if (data.data.currency) {
                 nodecg.log.info(
@@ -64,6 +75,12 @@ module.exports = function (nodecg: NodeCG) {
             }
         });
 
+        client.onTestTip((data) => {
+            nodecg.log.info(
+                `${data.event.name} just donated ${data.event.amount} ${data.event.currency}. Message. ${data.event.message}`,
+            );
+        });
+
         client.onTest((data) => {
             nodecg.log.info(JSON.stringify(data));
         });
@@ -73,3 +90,13 @@ module.exports = function (nodecg: NodeCG) {
 
     streamElements?.onUnavailable(() => nodecg.log.info("SE client has been unset."));
 };
+
+function formatSubTier(tier: "1000" | "2000" | "3000" | "prime"): string {
+    if (tier === "prime")
+        return "Twitch Prime";
+
+    // We want to display the tier as 1, 2, 3
+    // However StreamElements stores the sub tiers as 1000, 2000 and 3000.
+    // So we divide the tier by 1000 to get the tier in our expected format.
+    return "Tier " + (Number.parseInt(tier) / 1000).toString();
+}
diff --git a/services/nodecg-io-streamelements/extension/StreamElements.ts b/services/nodecg-io-streamelements/extension/StreamElements.ts
index 62d83dc84..35c7bb233 100644
--- a/services/nodecg-io-streamelements/extension/StreamElements.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElements.ts
@@ -1,8 +1,7 @@
 import io = require("socket.io-client");
 import { Result, emptySuccess, error } from "nodecg-io-core";
 import {
-    StreamElementsCheerEvent,
-    StreamElementsEvent,
+    StreamElementsCheerEvent, StreamElementsEvent,
     StreamElementsFollowEvent,
     StreamElementsHostEvent,
     StreamElementsRaidEvent,
@@ -10,7 +9,7 @@ import {
     StreamElementsTestCheerEvent,
     StreamElementsTestFollowEvent,
     StreamElementsTestHostEvent, StreamElementsTestRaidEvent,
-    StreamElementsTestSubscriberEvent,
+    StreamElementsTestSubscriberEvent, StreamElementsTestTipEvent,
     StreamElementsTipEvent
 } from "./StreamElementsEvent";
 import { EventEmitter } from "events";
@@ -173,7 +172,7 @@ export class StreamElementsServiceClient extends EventEmitter {
     }
 
     public onTestFollow(handler: (data: StreamElementsTestFollowEvent) => void): void {
-        this.on("test:follow-latest", handler);
+        this.on("test:follower-latest", handler);
     }
 
     public onTestRaid(handler: (data: StreamElementsTestRaidEvent) => void): void {
@@ -184,6 +183,10 @@ export class StreamElementsServiceClient extends EventEmitter {
         this.on("test:host-latest", handler);
     }
 
+    public onTestTip(handler: (data: StreamElementsTestTipEvent) => void): void {
+        this.on("test:tip-latest", handler);
+    }
+
     public setupReplicant(rep: Replicant<StreamElementsReplicant>): void {
         if (rep.value === undefined) {
             rep.value = {};
diff --git a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
index a3724b019..61636f928 100644
--- a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
@@ -190,7 +190,7 @@ interface StreamElementsBaseEvent<TType, TData> {
     /**
      * The internal event data.
      */
-    data: TData | StreamElementsDataBase;
+    data: TData & StreamElementsDataBase;
     flagged: boolean;
     /**
      * Event provider
@@ -300,7 +300,7 @@ interface StreamElementsBaseTestEvent<TListener, TEvent> {
      */
     provider: "twitch" | "youtube" | "facebook";
     listener: TListener,
-    event: TEvent | StreamElementsTestDataBase
+    event: TEvent & StreamElementsTestDataBase
 }
 
 interface StreamElementsTestDataBase {

From c97c2f3365d1f7228d1424c2dd7b102dc961775c Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Wed, 27 Jul 2022 22:08:38 +0200
Subject: [PATCH 5/6] feat: Remove legacy types in Stream Elements

BREAKING CHANGE: StreamElementsEvent is now typesafe. For Test Events there is now StreamElementsTestEvent.
---
 .../extension/StreamElements.ts               |   8 +-
 .../extension/StreamElementsEvent.ts          | 186 ++----------------
 2 files changed, 21 insertions(+), 173 deletions(-)

diff --git a/services/nodecg-io-streamelements/extension/StreamElements.ts b/services/nodecg-io-streamelements/extension/StreamElements.ts
index 35c7bb233..1a8e574a9 100644
--- a/services/nodecg-io-streamelements/extension/StreamElements.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElements.ts
@@ -6,7 +6,7 @@ import {
     StreamElementsHostEvent,
     StreamElementsRaidEvent,
     StreamElementsSubscriberEvent,
-    StreamElementsTestCheerEvent,
+    StreamElementsTestCheerEvent, StreamElementsTestEvent,
     StreamElementsTestFollowEvent,
     StreamElementsTestHostEvent, StreamElementsTestRaidEvent,
     StreamElementsTestSubscriberEvent, StreamElementsTestTipEvent,
@@ -53,7 +53,7 @@ export class StreamElementsServiceClient extends EventEmitter {
             this.emit(data.type, data);
         });
         if (this.handleTestEvents) {
-            this.onTestEvent((data: StreamElementsEvent) => {
+            this.onTestEvent((data: StreamElementsTestEvent) => {
                 if (data.listener) {
                     this.emit("test", data);
                     this.emit("test:" + data.listener, data);
@@ -115,8 +115,8 @@ export class StreamElementsServiceClient extends EventEmitter {
         });
     }
 
-    private onTestEvent(handler: (data: StreamElementsEvent) => void): void {
-        this.socket.on("event:test", (data: StreamElementsEvent) => {
+    private onTestEvent(handler: (data: StreamElementsTestEvent) => void): void {
+        this.socket.on("event:test", (data: StreamElementsTestEvent) => {
             if (data) {
                 handler(data);
             }
diff --git a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
index 61636f928..2f80a387f 100644
--- a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
@@ -1,171 +1,3 @@
-/**
- * StreamElementsEvent was automatically generated by json-schema-to-typescript
- * using the schema at https://docs.streamelements.com/docs/connecting-via-websocket.
- */
-
-// Generic types for all events
-
-export interface StreamElementsEvent {
-    /**
-     * StreamElements hexadecimal Event ID
-     */
-    _id: string;
-    /**
-     * StreamElements hexadecimal activity ID
-     */
-    activityId: string;
-    /**
-     * StreamElements hexadecimal Channel ID
-     */
-    channel: string;
-    /**
-     * Event type
-     */
-    type: "cheer" | "follow" | "host" | "raid" | "subscriber" | "tip";
-    /**
-     * Event provider
-     */
-    provider: "twitch" | "youtube" | "facebook";
-    flagged: boolean;
-    data: StreamElementsEventData;
-    /**
-     * Event creation date and time
-     */
-    createdAt: string;
-    /**
-     * Event update date and time
-     */
-    updatedAt: string;
-    /**
-     * Listener property for test events
-     */
-    listener?: string;
-    /**
-     * Event property for test events
-     */
-    event?: StreamElementsTestEventData;
-
-    [k: string]: unknown;
-}
-
-export interface StreamElementsEventData {
-    /**
-     * StreamElements hexadecimal tip ID
-     */
-    tipId?: string;
-    /**
-     * Twitch username
-     */
-    username: string;
-    /**
-     * Twitch channel ID
-     */
-    providerId?: string;
-    /**
-     * Twitch username case-sensitive plus regional characters if provided
-     */
-    displayName: string;
-    /**
-     * Amount of currency in tip, months in subs, hosting/raiding viewers, bits in cheer
-     */
-    amount: number;
-    /**
-     * Current months streak (subs only)
-     */
-    streak?: number;
-    /**
-     * Subscriber tier (subs only)
-     */
-    tier?: "1000" | "2000" | "3000" | "prime";
-    /**
-     * true if the sub was a gift (subs only)
-     */
-    gifted: boolean;
-    /**
-     * The sender of a gifted sub (subs only)
-     */
-    sender?: string;
-    /**
-     * Currency symbol (tips)
-     */
-    currency?: string;
-    /**
-     * User provided message
-     */
-    message: string;
-    quantity?: number;
-    /**
-     * Redeemed items
-     */
-    items: unknown[];
-    /**
-     * URI of user avatar
-     */
-    avatar: string;
-
-    [k: string]: unknown;
-}
-
-export interface StreamElementsTestEventData {
-    /**
-     * StreamElements hexadecimal tip ID
-     */
-    tipId?: string;
-    /**
-     * Twitch username
-     */
-    name: string;
-    /**
-     * Twitch channel ID
-     */
-    providerId?: string;
-    /**
-     * Twitch username case-sensitive plus regional characters if provided
-     */
-    displayName: string;
-    /**
-     * Amount of currency in tip, months in subs, hosting/raiding viewers, bits in cheer
-     */
-    amount: number;
-    /**
-     * Current months streak (subs only)
-     */
-    streak?: number;
-    /**
-     * Subscriber tier (subs only)
-     */
-    tier?: "1000" | "2000" | "3000" | "prime";
-    /**
-     * true if the sub was a gift (subs only)
-     */
-    gifted: boolean;
-    /**
-     * The sender of a gifted sub (subs only)
-     */
-    sender?: string;
-    /**
-     * Currency symbol (tips)
-     */
-    currency?: string;
-    /**
-     * User provided message
-     */
-    message: string;
-    quantity?: number;
-    /**
-     * Redeemed items
-     */
-    items: unknown[];
-    /**
-     * URI of user avatar
-     */
-    avatar: string;
-
-    [k: string]: unknown;
-}
-
-// Specific types for each event:
-
 interface StreamElementsBaseEvent<TType, TData> {
     /**
      * StreamElements hexadecimal Event ID
@@ -393,4 +225,20 @@ export type StreamElementsTestTipEvent = StreamElementsBaseTestEvent<"tip-latest
      * StreamElements's hexadecimal tip ID.
      */
     tipId: string;
-}>
\ No newline at end of file
+}>
+
+export type StreamElementsEvent =
+    StreamElementsFollowEvent
+    | StreamElementsCheerEvent
+    | StreamElementsHostEvent
+    | StreamElementsRaidEvent
+    | StreamElementsSubscriberEvent
+    | StreamElementsTipEvent;
+
+export type StreamElementsTestEvent =
+    StreamElementsTestFollowEvent
+    | StreamElementsTestCheerEvent
+    | StreamElementsTestHostEvent
+    | StreamElementsTestRaidEvent
+    | StreamElementsTestSubscriberEvent
+    | StreamElementsTestTipEvent;
\ No newline at end of file

From e52c65aeea4f2d95e559beb089392aa229e0b773 Mon Sep 17 00:00:00 2001
From: SteffoSpieler <steffo@steffospieler.de>
Date: Wed, 27 Jul 2022 22:17:52 +0200
Subject: [PATCH 6/6] fix: Remove linter errors in StreamElementsEvent.ts

---
 .../nodecg-io-streamelements/extension/StreamElementsEvent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
index 2f80a387f..f8ca0c3b6 100644
--- a/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
+++ b/services/nodecg-io-streamelements/extension/StreamElementsEvent.ts
@@ -53,7 +53,7 @@ interface StreamElementsDataBase {
     providerId?: string;
 }
 
-export type StreamElementsFollowEvent = StreamElementsBaseEvent<"follow", {}>;
+export type StreamElementsFollowEvent = StreamElementsBaseEvent<"follow", unknown>;
 
 export type StreamElementsCheerEvent = StreamElementsBaseEvent<"cheer", {
     /**
@@ -154,7 +154,7 @@ interface StreamElementsTestDataBase {
     providerId?: string;
 }
 
-export type StreamElementsTestFollowEvent = StreamElementsBaseTestEvent<"follower-latest", {}>
+export type StreamElementsTestFollowEvent = StreamElementsBaseTestEvent<"follower-latest", unknown>
 
 export type StreamElementsTestCheerEvent = StreamElementsBaseTestEvent<"cheer-latest", {
     /**
