streamer-emotes 0.0.2 → 0.0.5

package/dist/index.mjs

@@ -48,14 +48,14 @@ const get7tvEmotes = async (channelLogin, options) => {
 	const channelDataPromise = $fetch(`/users/twitch/${channelId}`, {
 		baseURL: providersURL.sevenTV,
 		method: "GET"
-	});
+	}).catch(() => null);
 	let globalDataPromise;
 	if (globals) globalDataPromise = $fetch("/emote-sets/global", {
 		baseURL: providersURL.sevenTV,
 		method: "GET"
 	});
 	const [channelData, globalData] = await Promise.all([channelDataPromise, globalDataPromise]);
-	channel.push(...channelData.emote_set.emotes);
+	if (channelData) channel.push(...channelData.emote_set.emotes);
 	if (globalData) global.push(...globalData.emotes);
 	const normalizeData = (data) => {
 		if (!data?.length) return [];
@@ -95,14 +95,14 @@ const getBttvEmotes = async (channelLogin, options) => {
 	const channelDataPromise = $fetch(`/cached/users/twitch/${channelId}`, {
 		baseURL: providersURL.bttv,
 		method: "GET"
-	});
+	}).catch(() => null);
 	let globalDataPromise;
 	if (globals) globalDataPromise = $fetch("/cached/emotes/global", {
 		baseURL: providersURL.bttv,
 		method: "GET"
 	});
 	const [channelData, globalData] = await Promise.all([channelDataPromise, globalDataPromise]);
-	channel.push(...channelData.channelEmotes, ...channelData.sharedEmotes);
+	if (channelData) channel.push(...channelData.channelEmotes, ...channelData.sharedEmotes);
 	if (globalData) global.push(...globalData);
 	const normalizeData = (data) => {
 		if (!data?.length) return [];
@@ -149,14 +149,14 @@ const getFfzEmotes = async (channelLogin, options) => {
 	const channelDataPromise = $fetch(`/room/id/${channelId}`, {
 		baseURL: providersURL.ffz,
 		method: "GET"
-	});
+	}).catch(() => null);
 	let globalDataPromise;
 	if (globals) globalDataPromise = $fetch("/set/global", {
 		baseURL: providersURL.ffz,
 		method: "GET"
 	});
 	const [channelData, globalData] = await Promise.all([channelDataPromise, globalDataPromise]);
-	channel.push(...channelData.sets[channelData.room.set].emoticons);
+	if (channelData) channel.push(...channelData.sets[channelData.room.set].emoticons);
 	if (globalData) global.push(...globalData.default_sets.flatMap((setId) => globalData.sets[setId].emoticons));
 	const normalizeData = (data) => {
 		if (!data?.length) return [];
@@ -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,19 @@ const getTwitchEmotes = async (channelLogin, options) => {
 		} },
 		fields: [{ emotes: emotesFields }]
 	};
+	const localEmotesQuery = {
+		operation: "channel",
+		variables: { channelId: {
+			name: "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 +240,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 +257,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,11 +278,11 @@ 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 }).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);
+	if (bttv || ffz || sevenTV || twitch) await getTwitchIdByLogin(channelLogin);
+	if (bttv) bttvPromise = getBttvEmotes(channelLogin, { globals: typeof bttv === "boolean" ? true : bttv?.globals ?? true }).catch(() => null);
+	if (ffz) ffzPromise = getFfzEmotes(channelLogin, { globals: typeof ffz === "boolean" ? true : ffz?.globals ?? true }).catch(() => null);
+	if (sevenTV) sevenTvPromise = get7tvEmotes(channelLogin, { globals: typeof sevenTV === "boolean" ? true : sevenTV?.globals ?? true }).catch(() => null);
+	if (twitch) twitchPromise = getTwitchEmotes(channelLogin, { globals: typeof twitch === "boolean" ? true : twitch?.globals ?? true }).catch(() => null);
 	const [bttvEmotes, ffzEmotes, sevenTvEmotes, twitchEmotes] = await Promise.all([
 		bttvPromise,
 		ffzPromise,

package/package.json

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