multichat-ts 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -134,9 +134,10 @@ export type BadgeURLsByNameOrCount = {
         [badge_count: number]: string;
     };
 };
-type StringOrAny = '*' | (string & Record<never, never>);
-export type BadgeURLsBySetIDAndVersionIDOrAny = {
-    [badge_set_id: string]: Record<StringOrAny, string>;
+export type BadgeURLsBySetIDOrSetIDAndVersion = {
+    [set_id: string]: {
+        [version: string]: string;
+    } | string;
 };
 export type EmoteURLsByName = {
     [emote_name: string]: string;

package/dist/kick.d.ts

@@ -8,13 +8,14 @@ type EventNames = keyof EventCallbackFunctions;
 export declare class KickPusher {
     kick_pusher_key: string;
     channel_name?: string;
-    assets: {
-        external_emotes: EmoteURLsByName;
-        badges: BadgeURLsByNameOrCount;
-    };
+    private assets;
     private public_listeners;
     socket?: Pusher;
     isConnected: boolean;
+    setBadges(badges: BadgeURLsByNameOrCount): void;
+    setExternalEmotes(external_emotes: EmoteURLsByName): void;
+    getStoredBadges(): BadgeURLsByNameOrCount;
+    getStoredExternalEmotes(): EmoteURLsByName;
     connect(channel?: {
         channelName?: string;
     }): Promise<void>;

package/dist/kick.js

@@ -25,6 +25,18 @@ export class KickPusher {
     public_listeners = {};
     socket;
     isConnected = false;
+    setBadges(badges) {
+        this.assets.badges = { ...badges, ...this.assets.badges };
+    }
+    setExternalEmotes(external_emotes) {
+        this.assets.external_emotes = { ...external_emotes, ...this.assets.external_emotes };
+    }
+    getStoredBadges() {
+        return this.assets.badges;
+    }
+    getStoredExternalEmotes() {
+        return this.assets.external_emotes;
+    }
     async connect(channel) {
         if (channel?.channelName)
             this.channel_name = channel.channelName;

package/dist/twitch.d.ts

@@ -1,5 +1,5 @@
 import { WebSocket } from 'partysocket';
-import { type ClearMessages, type DeleteMessage, type Message, type Event, type EmoteURLsByName, type BadgeURLsBySetIDAndVersionIDOrAny } from './index.js';
+import { type ClearMessages, type DeleteMessage, type Message, type Event, type EmoteURLsByName, type BadgeURLsBySetIDOrSetIDAndVersion } from './index.js';
 type EventCallbackFunctions = {
     message: (message: Message) => unknown;
     clear_messages: (data: ClearMessages) => unknown;
@@ -10,16 +10,17 @@ type EventCallbackFunctions = {
 type EventNames = keyof EventCallbackFunctions;
 export declare class TwitchIRC {
     channel_name?: string;
-    assets: {
-        external_emotes: EmoteURLsByName;
-        badges: BadgeURLsBySetIDAndVersionIDOrAny;
-    };
+    private assets;
     latency: number;
     private ping;
     private public_listeners;
     socket?: WebSocket;
     ws?: WebSocket | undefined;
     constructor(ws?: WebSocket);
+    setBadges(badges: BadgeURLsBySetIDOrSetIDAndVersion): void;
+    setExternalEmotes(external_emotes: EmoteURLsByName): void;
+    getStoredBadges(): BadgeURLsBySetIDOrSetIDAndVersion;
+    getStoredExternalEmotes(): EmoteURLsByName;
     connect(channel?: {
         channelName?: string;
     }): void;

package/dist/twitch.js

@@ -17,6 +17,18 @@ export class TwitchIRC {
     constructor(ws) {
         this.ws = ws;
     }
+    setBadges(badges) {
+        this.assets.badges = { ...badges, ...this.assets.badges };
+    }
+    setExternalEmotes(external_emotes) {
+        this.assets.external_emotes = { ...external_emotes, ...this.assets.external_emotes };
+    }
+    getStoredBadges() {
+        return this.assets.badges;
+    }
+    getStoredExternalEmotes() {
+        return this.assets.external_emotes;
+    }
     connect(channel) {
         if (channel?.channelName)
             this.channel_name = channel.channelName;
@@ -189,7 +201,10 @@ export class TwitchIRC {
                                 const [set_id, version] = badge.split('/');
                                 if (!set_id || !version)
                                     return [];
-                                const url = this.assets.badges[set_id]?.[version] ?? this.assets.badges[set_id]?.['*'];
+                                const storedBadge = this.assets.badges[set_id];
+                                if (!storedBadge)
+                                    return [];
+                                const url = typeof storedBadge === 'object' ? storedBadge[version] : storedBadge;
                                 if (!url)
                                     return [];
                                 return {
@@ -242,6 +257,10 @@ function parseIRCLine(line) {
             componentIndex++;
         }
     }
+    if (params[0])
+        params[0] = String.raw `${params[0]}`.replaceAll(new RegExp(`\\\\.+ACTION (.*)\\\\.+`, 'g'), function (_original, text_only) {
+            return text_only;
+        });
     const tags = raw_tags_component ? parseTags(raw_tags_component, command) : undefined;
     return {
         channel,

package/package.json

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

package/src/index.ts

@@ -155,10 +155,12 @@ export type BadgeURLsByNameOrCount = {
 		  };
 };
 
-type StringOrAny = '*' | (string & Record<never, never>);
-
-export type BadgeURLsBySetIDAndVersionIDOrAny = {
-	[badge_set_id: string]: Record<StringOrAny, string>;
+export type BadgeURLsBySetIDOrSetIDAndVersion = {
+	[set_id: string]:
+		| {
+				[version: string]: string;
+		  }
+		| string;
 };
 
 export type EmoteURLsByName = {

package/src/kick.ts

@@ -19,7 +19,7 @@ const DEFAULT_KICK_PUSHER_KEY = '32cbd69e4b950bf97679';
 export class KickPusher {
 	public kick_pusher_key = DEFAULT_KICK_PUSHER_KEY;
 	public channel_name?: string;
-	public assets: {
+	private assets: {
 		external_emotes: EmoteURLsByName;
 		badges: BadgeURLsByNameOrCount;
 	} = {
@@ -47,6 +47,22 @@ export class KickPusher {
 	public socket?: Pusher;
 	public isConnected = false;
 
+	public setBadges(badges: BadgeURLsByNameOrCount) {
+		this.assets.badges = { ...badges, ...this.assets.badges };
+	}
+
+	public setExternalEmotes(external_emotes: EmoteURLsByName) {
+		this.assets.external_emotes = { ...external_emotes, ...this.assets.external_emotes };
+	}
+
+	public getStoredBadges() {
+		return this.assets.badges;
+	}
+
+	public getStoredExternalEmotes() {
+		return this.assets.external_emotes;
+	}
+
 	public async connect(channel?: { channelName?: string }) {
 		if (channel?.channelName) this.channel_name = channel.channelName;
 		if (!this.channel_name) return console.error('channel_name not specified');

package/src/twitch.ts

@@ -7,7 +7,7 @@ import {
 	type Message,
 	type Event,
 	type EmoteURLsByName,
-	type BadgeURLsBySetIDAndVersionIDOrAny,
+	type BadgeURLsBySetIDOrSetIDAndVersion,
 } from './index.js';
 
 const ANONYMOUS_IRC_PASS = 'SCHMOOPIIE';
@@ -27,9 +27,9 @@ type EventNames = keyof EventCallbackFunctions;
 
 export class TwitchIRC {
 	public channel_name?: string;
-	public assets: {
+	private assets: {
 		external_emotes: EmoteURLsByName;
-		badges: BadgeURLsBySetIDAndVersionIDOrAny;
+		badges: BadgeURLsBySetIDOrSetIDAndVersion;
 	} = {
 		external_emotes: {},
 		badges: {},
@@ -51,6 +51,22 @@ export class TwitchIRC {
 		this.ws = ws;
 	}
 
+	public setBadges(badges: BadgeURLsBySetIDOrSetIDAndVersion) {
+		this.assets.badges = { ...badges, ...this.assets.badges };
+	}
+
+	public setExternalEmotes(external_emotes: EmoteURLsByName) {
+		this.assets.external_emotes = { ...external_emotes, ...this.assets.external_emotes };
+	}
+
+	public getStoredBadges() {
+		return this.assets.badges;
+	}
+
+	public getStoredExternalEmotes() {
+		return this.assets.external_emotes;
+	}
+
 	public connect(channel?: { channelName?: string }) {
 		if (channel?.channelName) this.channel_name = channel.channelName;
 		if (!this.channel_name) return console.error('channel_name not specified');
@@ -246,8 +262,10 @@ export class TwitchIRC {
 									const [set_id, version] = badge.split('/');
 									if (!set_id || !version) return [];
 
-									const url =
-										this.assets.badges[set_id]?.[version] ?? this.assets.badges[set_id]?.['*'];
+									const storedBadge = this.assets.badges[set_id];
+									if (!storedBadge) return [];
+
+									const url = typeof storedBadge === 'object' ? storedBadge[version] : storedBadge;
 									if (!url) return [];
 
 									return {
@@ -306,6 +324,15 @@ function parseIRCLine(line: string): IRC_Message {
 		}
 	}
 
+	// TODO: handle message actions like "/me"
+	if (params[0])
+		params[0] = String.raw`${params[0]}`.replaceAll(
+			new RegExp(`\\\\.+ACTION (.*)\\\\.+`, 'g'),
+			function (_original, text_only) {
+				return text_only;
+			},
+		);
+
 	const tags = raw_tags_component ? parseTags(raw_tags_component, command) : undefined;
 
 	return {