streamer-emotes 0.0.1 → 0.0.4

package/dist/index.mjs

@@ -190,6 +190,7 @@ const getFfzEmotes = async (channelLogin, options) => {
 const getTwitchEmotes = async (channelLogin, options) => {
 	channelLogin = channelLogin.toLowerCase();
 	const { globals = true } = options ?? {};
+	const channelId = await getTwitchIdByLogin(channelLogin);
 	const emotesFields = [
 		"id",
 		"token",
@@ -211,9 +212,18 @@ const getTwitchEmotes = async (channelLogin, options) => {
 		} },
 		fields: [{ emotes: emotesFields }]
 	};
+	const localEmotesQuery = {
+		operation: "channel",
+		variables: { id: {
+			value: channelId,
+			type: "ID!"
+		} },
+		fields: [{ localEmoteSets: [{ emotes: emotesFields }] }]
+	};
 	const toQuery = [];
 	if (globals) toQuery.push(globalQuery);
 	toQuery.push(channelQuery);
+	toQuery.push(localEmotesQuery);
 	const { data } = await $fetch(providersURL.twitch, {
 		method: "POST",
 		headers: {
@@ -229,15 +239,15 @@ const getTwitchEmotes = async (channelLogin, options) => {
 			id: emote.id,
 			images: [
 				{
-					url: `https://static-cdn.jtvnw.net/emoticons/v1/${emote.id}/1.0`,
+					url: `https://static-cdn.jtvnw.net/emoticons/v2/${emote.id}/default/dark/1.0`,
 					version: "1.0"
 				},
 				{
-					url: `https://static-cdn.jtvnw.net/emoticons/v1/${emote.id}/2.0`,
+					url: `https://static-cdn.jtvnw.net/emoticons/v2/${emote.id}/default/dark/2.0`,
 					version: "2.0"
 				},
 				{
-					url: `https://static-cdn.jtvnw.net/emoticons/v1/${emote.id}/3.0`,
+					url: `https://static-cdn.jtvnw.net/emoticons/v2/${emote.id}/default/dark/3.0`,
 					version: "3.0"
 				}
 			],
@@ -246,7 +256,7 @@ const getTwitchEmotes = async (channelLogin, options) => {
 		}));
 	};
 	return {
-		channel: normalizeData(data?.subscriptionProduct?.emotes),
+		channel: [...normalizeData(data?.channel.localEmoteSets?.[0]?.emotes), ...normalizeData(data?.subscriptionProduct?.emotes)],
 		...globals && { global: normalizeData(data?.emoteSet?.emotes) }
 	};
 };
@@ -267,21 +277,21 @@ const getStreamerEmotes = async (channelLogin, options) => {
 	const { bttv, ffz, sevenTV, twitch } = options;
 	const data = {};
 	let bttvPromise, ffzPromise, sevenTvPromise, twitchPromise;
-	if (bttv || ffz || sevenTV) await getTwitchIdByLogin(channelLogin);
-	if (bttv) bttvPromise = getBttvEmotes(channelLogin, { globals: typeof bttv === "boolean" ? true : bttv?.globals });
-	if (ffz) ffzPromise = getFfzEmotes(channelLogin, { globals: typeof ffz === "boolean" ? true : ffz?.globals });
-	if (sevenTV) sevenTvPromise = get7tvEmotes(channelLogin, { globals: typeof sevenTV === "boolean" ? true : sevenTV?.globals });
-	if (twitch) twitchPromise = getTwitchEmotes(channelLogin, { globals: typeof twitch === "boolean" ? true : twitch?.globals });
+	if (bttv || ffz || sevenTV || twitch) await getTwitchIdByLogin(channelLogin);
+	if (bttv) bttvPromise = getBttvEmotes(channelLogin, { globals: typeof bttv === "boolean" ? true : bttv?.globals }).catch(() => null);
+	if (ffz) ffzPromise = getFfzEmotes(channelLogin, { globals: typeof ffz === "boolean" ? true : ffz?.globals }).catch(() => null);
+	if (sevenTV) sevenTvPromise = get7tvEmotes(channelLogin, { globals: typeof sevenTV === "boolean" ? true : sevenTV?.globals }).catch(() => null);
+	if (twitch) twitchPromise = getTwitchEmotes(channelLogin, { globals: typeof twitch === "boolean" ? true : twitch?.globals }).catch(() => null);
 	const [bttvEmotes, ffzEmotes, sevenTvEmotes, twitchEmotes] = await Promise.all([
 		bttvPromise,
 		ffzPromise,
 		sevenTvPromise,
 		twitchPromise
 	]);
-	if (bttv) data.bttv = bttvEmotes;
-	if (ffz) data.ffz = ffzEmotes;
-	if (sevenTV) data.sevenTV = sevenTvEmotes;
-	if (twitch) data.twitch = twitchEmotes;
+	if (bttv && bttvEmotes) data.bttv = bttvEmotes;
+	if (ffz && ffzEmotes) data.ffz = ffzEmotes;
+	if (sevenTV && sevenTvEmotes) data.sevenTV = sevenTvEmotes;
+	if (twitch && twitchEmotes) data.twitch = twitchEmotes;
 	return data;
 };
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "streamer-emotes",
 	"type": "module",
-	"version": "0.0.1",
+	"version": "0.0.4",
 	"description": "A library to get Twitch, BTTV, FFZ and 7TV emotes for a given Twitch channel.",
 	"keywords": [
 		"streamer",