multichat-ts 0.0.84 → 0.0.86

package/dist/default/index.d.ts

@@ -9,6 +9,11 @@ export type Message = {
     id: string;
     raw_text: string;
     timestamp_sent: number;
+    resubscription?: {
+        id: string;
+        months: number;
+        subscribed_since_timestamp: string;
+    };
     user: {
         badges: Badge[];
         color: string;

package/dist/default/kick.d.ts

@@ -1,10 +1,16 @@
 import Pusher from 'pusher-js';
 import { type BadgeURLsByNameOrCount, type EmoteURLsByName, type Message } from './index.js';
+type ConnectionState = 'initialized' | 'connecting' | 'connected' | 'unavailable' | 'failed';
+type ConnectionStateEvent = {
+    previous: ConnectionState;
+    current: ConnectionState;
+};
 type EventCallbackFunctions = {
     message: (message: Message) => unknown;
     subscription: (data: ChatSubscriptionEvent) => unknown;
     gifted: (data: ChatGiftedEvent) => unknown;
     raw_message: (message: ChatMessageEvent) => unknown;
+    connection_state_changed: (state: ConnectionStateEvent) => unknown;
 };
 type EventNames = keyof EventCallbackFunctions;
 export declare class KickPusher {
@@ -20,7 +26,7 @@ export declare class KickPusher {
     getStoredExternalEmotes(): EmoteURLsByName;
     connect(channel?: {
         channelName?: string;
-    }): Promise<void>;
+    }, get_channel?: (channelName: string) => Promise<GetChannelResponse | undefined>): Promise<void>;
     disconnect(): void;
     on<EventName extends EventNames>(event_name: EventName, callback_fn: EventCallbackFunctions[EventName]): void;
     private onSubscriptionSuccess;
@@ -163,8 +169,16 @@ export interface ChatMessageEvent {
     id: string;
     chatroom_id: number;
     content: string;
-    type: string;
+    type: 'message' | 'celebration';
     created_at: string;
+    metadata?: {
+        celebration: {
+            created_at: string;
+            id: string;
+            total_months: number;
+            type: 'subscription_renewed';
+        };
+    };
     sender: {
         id: number;
         username: string;

package/dist/default/kick.js

@@ -37,15 +37,22 @@ export class KickPusher {
     getStoredExternalEmotes() {
         return this.assets.external_emotes;
     }
-    async connect(channel) {
+    async connect(channel, get_channel = async (channelName) => {
+        const res = await fetch(`https://kick.com/api/v2/channels/${channelName}`, {
+            headers: {
+                accept: 'aplication/json',
+                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+            },
+        });
+        const json = await res.json();
+        return json;
+    }) {
         if (channel?.channelName)
             this.channel_name = channel.channelName;
         if (!this.channel_name)
             return console.error('channel_name not specified');
         console.log(`connecting to ${this.channel_name}...`);
-        const channel_response = await fetch(`https://kick.com/api/v2/channels/${this.channel_name}`)
-            .then((res) => res.json())
-            .then((json) => json);
+        const channel_response = await get_channel(this.channel_name);
         if (!channel_response)
             return console.error('Failed to connect to Kick.com chat');
         channel_response.subscriber_badges.forEach((subscriber_badge) => {
@@ -60,10 +67,31 @@ export class KickPusher {
         });
         this.socket
             .subscribe(`chatrooms.${channel_response.chatroom.id}.v2`)
-            .bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess())
+            .bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess('pusher:subscription_succeeded'))
             .bind('App\\Events\\ChatMessageEvent', (data) => this.onChatMessage(data))
             .bind('App\\Events\\SubscriptionEvent', (data) => this.onChatSubscription(data))
             .bind('App\\Events\\GiftedSubscriptionsEvent', (data) => this.onChatGifted(data));
+        this.socket.connection.bind('state_change', (state) => {
+            switch (state.current) {
+                case 'connected': {
+                    console.log(`Connected to Kick Pusher (${this.channel_name})!`);
+                    break;
+                }
+                case 'connecting': {
+                    console.log(`Connecting to Kick Pusher (${this.channel_name})...`);
+                    break;
+                }
+                case 'failed': {
+                    console.log(`Failed to connect to Kick Pusher (${this.channel_name})`);
+                    break;
+                }
+                case 'unavailable': {
+                    console.log(`Disconnected from Kick Pusher (${this.channel_name})`);
+                    break;
+                }
+            }
+            this.public_listeners.connection_state_changed?.(state);
+        });
     }
     disconnect() {
         this.socket?.disconnect();
@@ -72,8 +100,8 @@ export class KickPusher {
     on(event_name, callback_fn) {
         this.public_listeners[event_name] = callback_fn;
     }
-    onSubscriptionSuccess() {
-        console.log(`Connected to Kick Pusher (${this.channel_name})`);
+    onSubscriptionSuccess(channel) {
+        console.log(`Subscribed to Channel on Kick Pusher (${channel})`);
     }
     onChatSubscription(data) {
         this.public_listeners.subscription?.(data);
@@ -85,7 +113,6 @@ export class KickPusher {
         this.public_listeners.raw_message?.(data);
         const text = data.content;
         const emote_matches = [...data.content.matchAll(/\[emote:\d+:[a-zA-Z0-9]*\]/g)];
-        console.log(emote_matches);
         const body = [];
         emote_matches.forEach((match) => {
             const emote_string = match[0];
@@ -135,7 +162,7 @@ export class KickPusher {
             });
         }
         body.sort((a, b) => a.start_inclusive - b.start_inclusive);
-        this.public_listeners.message?.({
+        const message = {
             id: data.id,
             user: {
                 id: `${data.sender.id}`,
@@ -172,6 +199,14 @@ export class KickPusher {
             },
             raw_text: data.content,
             timestamp_sent: Date.parse(data.created_at),
-        });
+        };
+        if (data.type === 'celebration' && data.metadata?.celebration) {
+            message.resubscription = {
+                id: data.metadata.celebration.id,
+                months: data.metadata.celebration.total_months,
+                subscribed_since_timestamp: data.metadata.celebration.created_at,
+            };
+        }
+        this.public_listeners.message?.(message);
     }
 }

package/dist/worker/index.d.ts

@@ -9,6 +9,11 @@ export type Message = {
     id: string;
     raw_text: string;
     timestamp_sent: number;
+    resubscription?: {
+        id: string;
+        months: number;
+        subscribed_since_timestamp: string;
+    };
     user: {
         badges: Badge[];
         color: string;

package/dist/worker/kick.d.ts

@@ -1,10 +1,16 @@
 import Pusher from 'pusher-js/worker';
 import { type BadgeURLsByNameOrCount, type EmoteURLsByName, type Message } from './index.js';
+type ConnectionState = 'initialized' | 'connecting' | 'connected' | 'unavailable' | 'failed';
+type ConnectionStateEvent = {
+    previous: ConnectionState;
+    current: ConnectionState;
+};
 type EventCallbackFunctions = {
     message: (message: Message) => unknown;
     subscription: (data: ChatSubscriptionEvent) => unknown;
     gifted: (data: ChatGiftedEvent) => unknown;
     raw_message: (message: ChatMessageEvent) => unknown;
+    connection_state_changed: (state: ConnectionStateEvent) => unknown;
 };
 type EventNames = keyof EventCallbackFunctions;
 export declare class KickPusher {
@@ -20,7 +26,7 @@ export declare class KickPusher {
     getStoredExternalEmotes(): EmoteURLsByName;
     connect(channel?: {
         channelName?: string;
-    }): Promise<void>;
+    }, get_channel?: (channelName: string) => Promise<GetChannelResponse | undefined>): Promise<void>;
     disconnect(): void;
     on<EventName extends EventNames>(event_name: EventName, callback_fn: EventCallbackFunctions[EventName]): void;
     private onSubscriptionSuccess;
@@ -163,8 +169,16 @@ export interface ChatMessageEvent {
     id: string;
     chatroom_id: number;
     content: string;
-    type: string;
+    type: 'message' | 'celebration';
     created_at: string;
+    metadata?: {
+        celebration: {
+            created_at: string;
+            id: string;
+            total_months: number;
+            type: 'subscription_renewed';
+        };
+    };
     sender: {
         id: number;
         username: string;

package/dist/worker/kick.js

@@ -37,20 +37,22 @@ export class KickPusher {
     getStoredExternalEmotes() {
         return this.assets.external_emotes;
     }
-    async connect(channel) {
+    async connect(channel, get_channel = async (channelName) => {
+        const res = await fetch(`https://kick.com/api/v2/channels/${channelName}`, {
+            headers: {
+                accept: 'aplication/json',
+                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+            },
+        });
+        const json = await res.json();
+        return json;
+    }) {
         if (channel?.channelName)
             this.channel_name = channel.channelName;
         if (!this.channel_name)
             return console.error('channel_name not specified');
         console.log(`connecting to ${this.channel_name}...`);
-        const channel_response = await fetch(`https://kick.com/api/v2/channels/${this.channel_name}`, {
-            headers: {
-                accept: 'aplication/json',
-                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-            },
-        })
-            .then((res) => res.json())
-            .then((json) => json);
+        const channel_response = await get_channel(this.channel_name);
         if (!channel_response)
             return console.error('Failed to connect to Kick.com chat');
         channel_response.subscriber_badges.forEach((subscriber_badge) => {
@@ -65,10 +67,31 @@ export class KickPusher {
         });
         this.socket
             .subscribe(`chatrooms.${channel_response.chatroom.id}.v2`)
-            .bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess())
+            .bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess('pusher:subscription_succeeded'))
             .bind('App\\Events\\ChatMessageEvent', (data) => this.onChatMessage(data))
             .bind('App\\Events\\SubscriptionEvent', (data) => this.onChatSubscription(data))
             .bind('App\\Events\\GiftedSubscriptionsEvent', (data) => this.onChatGifted(data));
+        this.socket.connection.bind('state_change', (state) => {
+            switch (state.current) {
+                case 'connected': {
+                    console.log(`Connected to Kick Pusher (${this.channel_name})!`);
+                    break;
+                }
+                case 'connecting': {
+                    console.log(`Connecting to Kick Pusher (${this.channel_name})...`);
+                    break;
+                }
+                case 'failed': {
+                    console.log(`Failed to connect to Kick Pusher (${this.channel_name})`);
+                    break;
+                }
+                case 'unavailable': {
+                    console.log(`Disconnected from Kick Pusher (${this.channel_name})`);
+                    break;
+                }
+            }
+            this.public_listeners.connection_state_changed?.(state);
+        });
     }
     disconnect() {
         this.socket?.disconnect();
@@ -77,8 +100,8 @@ export class KickPusher {
     on(event_name, callback_fn) {
         this.public_listeners[event_name] = callback_fn;
     }
-    onSubscriptionSuccess() {
-        console.log(`Connected to Kick Pusher (${this.channel_name})`);
+    onSubscriptionSuccess(channel) {
+        console.log(`Subscribed to Channel on Kick Pusher (${channel})`);
     }
     onChatSubscription(data) {
         this.public_listeners.subscription?.(data);
@@ -90,7 +113,6 @@ export class KickPusher {
         this.public_listeners.raw_message?.(data);
         const text = data.content;
         const emote_matches = [...data.content.matchAll(/\[emote:\d+:[a-zA-Z0-9]*\]/g)];
-        console.log(emote_matches);
         const body = [];
         emote_matches.forEach((match) => {
             const emote_string = match[0];
@@ -140,7 +162,7 @@ export class KickPusher {
             });
         }
         body.sort((a, b) => a.start_inclusive - b.start_inclusive);
-        this.public_listeners.message?.({
+        const message = {
             id: data.id,
             user: {
                 id: `${data.sender.id}`,
@@ -177,6 +199,14 @@ export class KickPusher {
             },
             raw_text: data.content,
             timestamp_sent: Date.parse(data.created_at),
-        });
+        };
+        if (data.type === 'celebration' && data.metadata?.celebration) {
+            message.resubscription = {
+                id: data.metadata.celebration.id,
+                months: data.metadata.celebration.total_months,
+                subscribed_since_timestamp: data.metadata.celebration.created_at,
+            };
+        }
+        this.public_listeners.message?.(message);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "multichat-ts",
-	"version": "0.0.84",
+	"version": "0.0.86",
 	"type": "module",
 	"description": "Receive type-safe realtime events for chat-related messages on multiple platforms (Twitch, Kick)",
 	"repository": {

package/src/default/index.ts

@@ -10,6 +10,11 @@ export type Message = {
 	id: string;
 	raw_text: string;
 	timestamp_sent: number;
+	resubscription?: {
+		id: string;
+		months: number;
+		subscribed_since_timestamp: string;
+	};
 	user: {
 		badges: Badge[];
 		color: string;

package/src/default/kick.ts

@@ -7,11 +7,15 @@ import {
 	type Message,
 } from './index.js';
 
+type ConnectionState = 'initialized' | 'connecting' | 'connected' | 'unavailable' | 'failed';
+type ConnectionStateEvent = { previous: ConnectionState; current: ConnectionState };
+
 type EventCallbackFunctions = {
 	message: (message: Message) => unknown;
 	subscription: (data: ChatSubscriptionEvent) => unknown;
 	gifted: (data: ChatGiftedEvent) => unknown;
 	raw_message: (message: ChatMessageEvent) => unknown;
+	connection_state_changed: (state: ConnectionStateEvent) => unknown;
 };
 
 type EventNames = keyof EventCallbackFunctions;
@@ -65,15 +69,28 @@ export class KickPusher {
 		return this.assets.external_emotes;
 	}
 
-	public async connect(channel?: { channelName?: string }) {
+	public async connect(
+		channel?: { channelName?: string },
+		get_channel: (channelName: string) => Promise<GetChannelResponse | undefined> = async (
+			channelName,
+		) => {
+			const res = await fetch(`https://kick.com/api/v2/channels/${channelName}`, {
+				headers: {
+					accept: 'aplication/json',
+					'user-agent':
+						'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+				},
+			});
+			const json = await res.json();
+			return json as GetChannelResponse | undefined;
+		},
+	) {
 		if (channel?.channelName) this.channel_name = channel.channelName;
 		if (!this.channel_name) return console.error('channel_name not specified');
 
 		console.log(`connecting to ${this.channel_name}...`);
 
-		const channel_response = await fetch(`https://kick.com/api/v2/channels/${this.channel_name}`)
-			.then((res) => res.json())
-			.then((json) => json as GetChannelResponse | undefined);
+		const channel_response = await get_channel(this.channel_name);
 
 		if (!channel_response) return console.error('Failed to connect to Kick.com chat');
 
@@ -89,7 +106,6 @@ export class KickPusher {
 		this.socket = new Pusher(this.kick_pusher_key, {
 			cluster: 'us2',
 		});
-
 		/*
 		| 'App\\Events\\ChatMessageEvent'
 		| 'App\\Events\\ChatroomClearEvent'
@@ -107,7 +123,9 @@ export class KickPusher {
 		*/
 		this.socket
 			.subscribe(`chatrooms.${channel_response.chatroom.id}.v2`)
-			.bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess())
+			.bind('pusher:subscription_succeeded', () =>
+				this.onSubscriptionSuccess('pusher:subscription_succeeded'),
+			)
 			.bind('App\\Events\\ChatMessageEvent', (data: ChatMessageEvent) => this.onChatMessage(data))
 			.bind('App\\Events\\SubscriptionEvent', (data: ChatSubscriptionEvent) =>
 				this.onChatSubscription(data),
@@ -115,6 +133,28 @@ export class KickPusher {
 			.bind('App\\Events\\GiftedSubscriptionsEvent', (data: ChatGiftedEvent) =>
 				this.onChatGifted(data),
 			);
+
+		this.socket.connection.bind('state_change', (state: ConnectionStateEvent) => {
+			switch (state.current) {
+				case 'connected': {
+					console.log(`Connected to Kick Pusher (${this.channel_name})!`);
+					break;
+				}
+				case 'connecting': {
+					console.log(`Connecting to Kick Pusher (${this.channel_name})...`);
+					break;
+				}
+				case 'failed': {
+					console.log(`Failed to connect to Kick Pusher (${this.channel_name})`);
+					break;
+				}
+				case 'unavailable': {
+					console.log(`Disconnected from Kick Pusher (${this.channel_name})`);
+					break;
+				}
+			}
+			this.public_listeners.connection_state_changed?.(state);
+		});
 	}
 
 	public disconnect() {
@@ -129,8 +169,8 @@ export class KickPusher {
 		this.public_listeners[event_name] = callback_fn;
 	}
 
-	private onSubscriptionSuccess() {
-		console.log(`Connected to Kick Pusher (${this.channel_name})`);
+	private onSubscriptionSuccess(channel: string) {
+		console.log(`Subscribed to Channel on Kick Pusher (${channel})`);
 	}
 
 	private onChatSubscription(data: ChatSubscriptionEvent) {
@@ -145,7 +185,6 @@ export class KickPusher {
 		this.public_listeners.raw_message?.(data);
 		const text = data.content;
 		const emote_matches = [...data.content.matchAll(/\[emote:\d+:[a-zA-Z0-9]*\]/g)];
-		console.log(emote_matches);
 
 		const body: BodyComponent[] = [];
 
@@ -203,8 +242,7 @@ export class KickPusher {
 		}
 
 		body.sort((a, b) => a.start_inclusive - b.start_inclusive);
-
-		this.public_listeners.message?.({
+		const message: Message = {
 			id: data.id,
 			user: {
 				id: `${data.sender.id}`,
@@ -241,7 +279,16 @@ export class KickPusher {
 			},
 			raw_text: data.content,
 			timestamp_sent: Date.parse(data.created_at),
-		});
+		};
+
+		if (data.type === 'celebration' && data.metadata?.celebration) {
+			message.resubscription = {
+				id: data.metadata.celebration.id,
+				months: data.metadata.celebration.total_months,
+				subscribed_since_timestamp: data.metadata.celebration.created_at,
+			};
+		}
+		this.public_listeners.message?.(message);
 	}
 }
 
@@ -381,8 +428,16 @@ export interface ChatMessageEvent {
 	id: string;
 	chatroom_id: number;
 	content: string;
-	type: string;
+	type: 'message' | 'celebration';
 	created_at: string;
+	metadata?: {
+		celebration: {
+			created_at: string;
+			id: string;
+			total_months: number;
+			type: 'subscription_renewed';
+		};
+	};
 	sender: {
 		id: number;
 		username: string;

package/src/worker/index.ts

@@ -10,6 +10,11 @@ export type Message = {
 	id: string;
 	raw_text: string;
 	timestamp_sent: number;
+	resubscription?: {
+		id: string;
+		months: number;
+		subscribed_since_timestamp: string;
+	};
 	user: {
 		badges: Badge[];
 		color: string;

package/src/worker/kick.ts

@@ -7,11 +7,15 @@ import {
 	type Message,
 } from './index.js';
 
+type ConnectionState = 'initialized' | 'connecting' | 'connected' | 'unavailable' | 'failed';
+type ConnectionStateEvent = { previous: ConnectionState; current: ConnectionState };
+
 type EventCallbackFunctions = {
 	message: (message: Message) => unknown;
 	subscription: (data: ChatSubscriptionEvent) => unknown;
 	gifted: (data: ChatGiftedEvent) => unknown;
 	raw_message: (message: ChatMessageEvent) => unknown;
+	connection_state_changed: (state: ConnectionStateEvent) => unknown;
 };
 
 type EventNames = keyof EventCallbackFunctions;
@@ -65,21 +69,28 @@ export class KickPusher {
 		return this.assets.external_emotes;
 	}
 
-	public async connect(channel?: { channelName?: string }) {
+	public async connect(
+		channel?: { channelName?: string },
+		get_channel: (channelName: string) => Promise<GetChannelResponse | undefined> = async (
+			channelName,
+		) => {
+			const res = await fetch(`https://kick.com/api/v2/channels/${channelName}`, {
+				headers: {
+					accept: 'aplication/json',
+					'user-agent':
+						'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+				},
+			});
+			const json = await res.json();
+			return json as GetChannelResponse | undefined;
+		},
+	) {
 		if (channel?.channelName) this.channel_name = channel.channelName;
 		if (!this.channel_name) return console.error('channel_name not specified');
 
 		console.log(`connecting to ${this.channel_name}...`);
 
-		const channel_response = await fetch(`https://kick.com/api/v2/channels/${this.channel_name}`, {
-			headers: {
-				accept: 'aplication/json',
-				'user-agent':
-					'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-			},
-		})
-			.then((res) => res.json())
-			.then((json) => json as GetChannelResponse | undefined);
+		const channel_response = await get_channel(this.channel_name);
 
 		if (!channel_response) return console.error('Failed to connect to Kick.com chat');
 
@@ -95,7 +106,6 @@ export class KickPusher {
 		this.socket = new Pusher(this.kick_pusher_key, {
 			cluster: 'us2',
 		});
-
 		/*
 		| 'App\\Events\\ChatMessageEvent'
 		| 'App\\Events\\ChatroomClearEvent'
@@ -113,7 +123,9 @@ export class KickPusher {
 		*/
 		this.socket
 			.subscribe(`chatrooms.${channel_response.chatroom.id}.v2`)
-			.bind('pusher:subscription_succeeded', () => this.onSubscriptionSuccess())
+			.bind('pusher:subscription_succeeded', () =>
+				this.onSubscriptionSuccess('pusher:subscription_succeeded'),
+			)
 			.bind('App\\Events\\ChatMessageEvent', (data: ChatMessageEvent) => this.onChatMessage(data))
 			.bind('App\\Events\\SubscriptionEvent', (data: ChatSubscriptionEvent) =>
 				this.onChatSubscription(data),
@@ -121,6 +133,28 @@ export class KickPusher {
 			.bind('App\\Events\\GiftedSubscriptionsEvent', (data: ChatGiftedEvent) =>
 				this.onChatGifted(data),
 			);
+
+		this.socket.connection.bind('state_change', (state: ConnectionStateEvent) => {
+			switch (state.current) {
+				case 'connected': {
+					console.log(`Connected to Kick Pusher (${this.channel_name})!`);
+					break;
+				}
+				case 'connecting': {
+					console.log(`Connecting to Kick Pusher (${this.channel_name})...`);
+					break;
+				}
+				case 'failed': {
+					console.log(`Failed to connect to Kick Pusher (${this.channel_name})`);
+					break;
+				}
+				case 'unavailable': {
+					console.log(`Disconnected from Kick Pusher (${this.channel_name})`);
+					break;
+				}
+			}
+			this.public_listeners.connection_state_changed?.(state);
+		});
 	}
 
 	public disconnect() {
@@ -135,8 +169,8 @@ export class KickPusher {
 		this.public_listeners[event_name] = callback_fn;
 	}
 
-	private onSubscriptionSuccess() {
-		console.log(`Connected to Kick Pusher (${this.channel_name})`);
+	private onSubscriptionSuccess(channel: string) {
+		console.log(`Subscribed to Channel on Kick Pusher (${channel})`);
 	}
 
 	private onChatSubscription(data: ChatSubscriptionEvent) {
@@ -151,7 +185,6 @@ export class KickPusher {
 		this.public_listeners.raw_message?.(data);
 		const text = data.content;
 		const emote_matches = [...data.content.matchAll(/\[emote:\d+:[a-zA-Z0-9]*\]/g)];
-		console.log(emote_matches);
 
 		const body: BodyComponent[] = [];
 
@@ -209,8 +242,7 @@ export class KickPusher {
 		}
 
 		body.sort((a, b) => a.start_inclusive - b.start_inclusive);
-
-		this.public_listeners.message?.({
+		const message: Message = {
 			id: data.id,
 			user: {
 				id: `${data.sender.id}`,
@@ -247,7 +279,16 @@ export class KickPusher {
 			},
 			raw_text: data.content,
 			timestamp_sent: Date.parse(data.created_at),
-		});
+		};
+
+		if (data.type === 'celebration' && data.metadata?.celebration) {
+			message.resubscription = {
+				id: data.metadata.celebration.id,
+				months: data.metadata.celebration.total_months,
+				subscribed_since_timestamp: data.metadata.celebration.created_at,
+			};
+		}
+		this.public_listeners.message?.(message);
 	}
 }
 
@@ -387,8 +428,16 @@ export interface ChatMessageEvent {
 	id: string;
 	chatroom_id: number;
 	content: string;
-	type: string;
+	type: 'message' | 'celebration';
 	created_at: string;
+	metadata?: {
+		celebration: {
+			created_at: string;
+			id: string;
+			total_months: number;
+			type: 'subscription_renewed';
+		};
+	};
 	sender: {
 		id: number;
 		username: string;