@mkody/twitch-emoticons 3.0.0-beta.2 → 3.0.0-beta.3

package/README.md

@@ -17,29 +17,28 @@ Gets Twitch, BTTV, FFZ and 7TV emotes as well as parsing text to emotes!
 
 ### List of breaking changes from 2.x to 3.x
 
-- Node.js 20 is required; we've set the minimum to 20.18.1.  
+- Node.js 20 is required; we have set the minimum to 20.18.1.  
   *This library is now an ECMAScript module, so you can use proper `import {...} from '...'` imports.*
 - The initialization of `EmoteFetcher` changed to only use an object as the first parameter for options.
   - API keys for Twitch must now be set with `twitchAppID` and `twitchAppSecret` properties.
   - The previously available `apiClient` is now set in this object too.
-- The defaults for `EmoteParser` changed to use the `html` template, and it doesn't require `:colons:` by default (using `/(\w+)/` to match any words).
-- The default `html` template doesn't have `twitch-emote-{size}` anymore in its `class` attribute.  
-  *The `size` isn't consistent between the different sources, so it can't reliably be used.*
+- The defaults for `EmoteParser` changed to use the `html` template, and it does not require `:colons:` by default (using `/(\w+)/` to match any words).
+- The default `html` template does not have `twitch-emote-{size}` anymore in its `class` attribute.  
+  *The `size` is inconsistent between the different sources, so it cannot be reliably used.*
 - The `EmoteFetcher.fetchSevenTVEmotes()`, `Emote.toLink()`, and `EmoteParse.parse()` methods now have their options as an object.
   - `fetcher.fetchSevenTVEmotes(null, { format: 'avif' })` - The first parameter is still the Twitch user ID (or `null` for global).
   - `emote.toLink({ size: 1, forceStatic: true, themeMode: 'light' })`
   - `parser.parse('Kappa', { size: 2, forceStatic: true, themeMode: 'dark' })` - The first parameter is still the input text.
 - The `owner` getter for `Emote`s has been removed.  
-  *It isn't reliable to get the `Channel` object, more so with 3rd-party providers since emotes might be owned by a channel that we never fetched (for shared/public emotes).*
-- If you've exported 7TV emotes, do note that the `sizes` array changed to not include the leading `x.<format>`.
-- **More may come for the final release, as this is still a work in progress.**
+  *It is not reliable to get the `Channel` object, more so with 3rd-party providers since emotes might be owned by a channel that we never fetched (for shared/public emotes).*
+- If you have exported 7TV emotes, do note that the `sizes` array changed to not include the leading `x.<format>`.  
+  *The rest of the export/import is still compatible with the current implementation.*
 
 
 ### Example of code changes
 
-Our examples are running in an ESM-based project (`"type": "module"`).
-
-We export a CommonJS-compatible build, so you can still use `require(...)`:  
+Our examples are running in an ESM-based project (`"type": "module"`).  
+Do note that we export a CommonJS-compatible build, so you can still use `require(...)`:  
 ```js
 const { EmoteFetcher, EmoteParser } = require('@mkody/twitch-emoticons')
 ``` 
@@ -53,12 +52,12 @@ const { EmoteFetcher, EmoteParser } = TwitchEmoticons // but you should move awa
 
 const fetcher = new EmoteFetcher('<your app ID>', '<your app secret>') // <- The first two parameters were for the Twitch app ID/secret
 
-// Those next three lines didn't have breaking changes
-await fetcher.fetchTwitchEmotes() // Do note that CommonJS doesn't handle `await` at the top level
+// Those next three lines do not have breaking changes
+await fetcher.fetchTwitchEmotes() // Do note that CommonJS does not handle `await` at the top level
 const parser = new EmoteParser(fetcher)
 const emote = emoteFetcher.emotes.get('Kappa')
 
-console.log(emote.toLink(2)) // <- Only the size was available and was set as the first parameter
+console.log(emote.toLink(2)) // <- Only the size was available and set as the first parameter
 // https://static-cdn.jtvnw.net/emoticons/v2/25/default/dark/3.0
 
 console.log(parser.parse('Hello :CoolCat:!')) // <- Used colons and returned Markdown by default
@@ -76,7 +75,7 @@ const fetcher = new EmoteFetcher({ // <- Uses an object!
   twitchAppSecret: '<your app secret>',
 })
 
-// Those next three lines didn't have breaking changes
+// Those next three lines do not have breaking changes
 await fetcher.fetchTwitchEmotes()
 const parser = new EmoteParser(fetcher)
 const emote = emoteFetcher.emotes.get('Kappa')
@@ -84,7 +83,7 @@ const emote = emoteFetcher.emotes.get('Kappa')
 console.log(emote.toLink({ size: 2 })) // <- Uses an object!
 // https://static-cdn.jtvnw.net/emoticons/v2/25/default/dark/3.0
 
-console.log(parser.parse('Hello CoolCat!')) // <- Doesn't require :colons: and returns HTML by default!
+console.log(parser.parse('Hello CoolCat!')) // <- Does not require :colons: and returns HTML by default!
 // Hello <img alt="CoolCat" title="CoolCat" class="twitch-emote" src="https://static-cdn.jtvnw.net/emoticons/v2/58127/default/dark/1.0">
 ```
 
@@ -93,8 +92,8 @@ console.log(parser.parse('Hello CoolCat!')) // <- Doesn't require :colons: and r
 
 ## Prerequisites
 
-To fetch "native" Twitch emotes, you need to [create an app here](https://dev.twitch.tv/console/apps/create), it's free.  
-If you are only using BetterTTV, FrankerFaceZ and 7TV you don't need to provide Twitch app keys.
+To fetch "native" emotes from Twitch.tv, you need to [create an app here](https://dev.twitch.tv/console/apps/create), it is free.  
+If you are only using BetterTTV, FrankerFaceZ and 7TV you do not need to provide Twitch app keys.
 
 You must use a Twitch user ID instead of the username to fetch users' emotes.  
 You can use [this page to manually convert them](https://s.kdy.ch/twitchid/).
@@ -122,13 +121,13 @@ npx jsr add @mkody/twitch-emoticons
 pnpm add jsr:@mkody/twitch-emoticons
 # or
 yarn add jsr:@mkody/twitch-emoticons
-# or (version has to be specified while it's a pre-release)
-deno add jsr:@mkody/twitch-emoticons@3.0.0-beta.1
+# or (version has to be specified while it is a pre-release)
+deno add jsr:@mkody/twitch-emoticons@3.0.0-beta.3
 ```
 
-[npm]: https://www.npmjs.com/package/@mkody/twitch-emoticons/v/3.0.0-beta.1
-[browse on npmx]: https://npmx.dev/package/@mkody/twitch-emoticons/v/3.0.0-beta.1
-[jsr]: https://jsr.io/@mkody/twitch-emoticons@3.0.0-beta.1
+[npm]: https://www.npmjs.com/package/@mkody/twitch-emoticons/v/3.0.0-beta.3
+[browse on npmx]: https://npmx.dev/package/@mkody/twitch-emoticons/v/3.0.0-beta.3
+[jsr]: https://jsr.io/@mkody/twitch-emoticons@3.0.0-beta.3
 
 
 ## Quick docs
@@ -136,7 +135,7 @@ deno add jsr:@mkody/twitch-emoticons@3.0.0-beta.1
 <details>
 <summary>Click here to toggle the docs</summary>
 
-Here's some quick documentation to explain our two classes, the principal methods, and the settings.
+Here is some quick documentation to explain our two classes, the principal methods, and some settings.
 
 > **NOTE:**  
 > If you want a more complete documentation, see: https://mkody.github.io/twitch-emoticons/
@@ -148,18 +147,19 @@ First, you need to load a list of emotes, and for that you create a new `EmoteFe
 
 ```js
 const fetcher = new EmoteFetcher({
-  // If you want to use emotes from twitch.tv, you'll need to be authenticated to use their API. You have two options:
+  // If you want to use emotes from twitch.tv, you will need to be authenticated to use their API.
   // Option 1: Provide your app ID and secret here (get them at https://dev.twitch.tv/console/apps).
   twitchAppID,      // <string>
   twitchAppSecret,  // <string>
-  // Option 2: If you need a different way to auth or already use `@twurple/api`, you can provide your ApiClient object here.
+  // Option 2: If you need a different way to auth or already use `@twurple/api`,
+  //           you can provide your ApiClient object here.
   apiClient, // <ApiClient>
 
   // Force emotes to be static (non-animated).
   forceStatic, // <boolean> - Default: false
 
   // Theme mode (background color) preference for Twitch emotes.
-  twitchThemeMode // <'dark' | 'light'> - Default: 'dark'
+  twitchThemeMode, // <'dark' | 'light'> - Default: 'dark'
 })
 ```
 
@@ -173,7 +173,7 @@ There is one method per platform; all of them return Promises (so you can use `a
 - `fetcher.fetchSevenTVEmotes()`
 
 The first parameter is the Twitch user ID of the channel you want to load emotes from.  
-If not provided or it's `null`/falsy, it loads what we call "global emotes", which are available to all users of the platform.
+If not provided or it is `null`/falsy, it loads what we call "global emotes", which are available to all users of the platform.
 
 Do note that `fetchSevenTVEmotes()` accepts a second parameter with an object:
 
@@ -191,8 +191,8 @@ await fetcher.fetchSevenTVEmotes(null, { format: 'avif' }) // Example of loading
 
 ### Parse strings to include emotes with `EmoteParser`
 
-And now that we have our list of emotes that we can expect to find, let's use it!  
-Let's create our `EmoteParser` object:
+And now that we have our list of emotes that we can expect to find, we should use it!  
+Create an `EmoteParser` object:
 
 ```js
 const parser = new EmoteParser(
@@ -203,16 +203,18 @@ const parser = new EmoteParser(
   {
     // What output should be used when you parse messages? There are two ways to set that up:
     // Option 1: Use one of the provided templates:
-    // - `html`: `<img alt="{name}" title="{name}" class="twitch-emote" src="{link}">`
-    // - `markdown`: `![{name}]({link} "{name}")`
-    // - `bbcode`: `[img]{link}[/img]`
-    // - `plain`: `{link}`
+    // - 'html': `<img alt="{name}" title="{name}" class="twitch-emote" src="{link}">`
+    // - 'markdown': `![{name}]({link} "{name}")`
+    // - 'bbcode': `[img]{link}[/img]`
+    // - 'plain': `{link}`
     type, // <'html' | 'markdown' | 'bbcode' | 'plain'> - Default: 'html'
-    // Option 2: Make your own template; it has priority over option 1. You can use those: `{link}`, `{name}`, `{size}`, `{creator}`.
+    // Option 2: Make your own template; this has priority over option 1.
+    // You can use those: `{link}`, `{name}`, `{size}`, `{creator}`,
+    //                    `{is-animated}`, `{is-nsfw}`, `{is-zero-width}`.
     template, // <string> - Default: ''
 
     // You can customize the regular expression used to find possible emotes.
-    match, // <RegExp>
+    match, // <RegExp> - Default: /(\w+)/g
   },
 ) 
 ```
@@ -221,11 +223,20 @@ Now that you have an EmoteParser object, you can do two things with it:
 look up an `Emote` or parse text and get the output as set by `type` or `template`.
 
 To grab a specific emote, you can do `fetcher.emotes.get('...')`, with the case-sensitive name of the emote in place of the ellipsis.  
-From there, you can read properties like `.code`, `.animated`, `.imageType`, or `.type`,
-but you can also use the `.toLink()` method to… get a link!
+From there, you can read properties like `.id`, `.code`, `.ownerName`,
+`.animated`, `.imageType`, or `.type`, but you can also use the `.toLink()`
+method to… get a link!
+
+> Note: Some extended `Emote`s have additional properties:
+> - FFZ:
+>   - `.zeroWidth` (boolean, can overlay an another emote)
+>   - `.modifier` (boolean, emote effects, should be hidden)
+> - 7TV:
+>   - `.zeroWidth` (boolean, can overlay an another emote)
+>   - `.nsfw` (boolean, flagged "Sexual" or "Twitch disallowed")
 
 To parse text, you use the `parser.parse()` method.  
-The first parameter is the input text. There's also an optional second parameter
+The first parameter is the input text. There is also an optional second parameter
 where you can provide a few settings (which can overwrite the same ones set in the `EmoteFetcher`).
 
 ```js
@@ -235,19 +246,21 @@ const parsed = parser.parse(
 
   // The second parameter is an *optional* object with the settings.
   {
-    // Size (scale) for emotes. It varies by provider, and not all share the same resolution in pixels. Play with this value if you'd like, but no guarantees!
+    // Size (scale) for emotes.
+    // It varies by provider, and not all share the same resolution in pixels.
+    // Play with this value if you would like, but no guarantees!
     size, // <number>
 
     // Force emotes to be static (non-animated).
-    forceStatic, // <boolean> - Default: what's in EmoteFetcher or false
+    forceStatic, // <boolean> - Default: value in EmoteFetcher or false
 
     // Theme mode (background color) preference for Twitch emotes.
-    twitchThemeMode // <'dark' | 'light'> - Default: what's in EmoteFetcher or 'dark'
+    twitchThemeMode // <'dark' | 'light'> - Default: value in EmoteFetcher or 'dark'
   },
 )
 ```
 
-And that's it for the essentials!  
+And that is it for the essentials!  
 You can go through the examples below if you need to see more complete code and direct usage.
 
 </details>
@@ -325,14 +338,21 @@ const fetcher = new EmoteFetcher({
 })
 const parser = new EmoteParser(fetcher, {
   // Custom HTML format
-  template: '<img class="emote" alt="{name}" src="{link}">',
-  // Otherwise, just use our provided template
-  // type: 'html',
+  template:  `
+    <img
+      class="emote"
+      alt="{name}"
+      src="{link}"
+      data-scale="{size}"
+      data-animated="{is-animated}"
+      data-overlay="{is-zero-width}"
+      data-nsfw="{is-nsfw}"
+    >`,
   // Matches words (like \w) but also dashes
   match: /([a-zA-Z0-9_\-]+)/g,
 })
 
-// Fetch all emotes at once and wait for all of them to complete
+// Fetch all the emotes we want and wait for everything to complete
 Promise.all([
   // Twitch global
   fetcher.fetchTwitchEmotes(),
@@ -467,9 +487,9 @@ console.log(kappa)
 
 ### 6. 7TV formats
 
-7TV v3 delivers emotes in either WEBP or AVIF.
+7TV delivers emotes in either WEBP or AVIF.
 
-By default we'll return WEBP emotes, but you can override this.
+By default we will return WEBP emotes, but you can override this.
 
 ```js
 // (setup)
@@ -485,14 +505,14 @@ await fetcher.fetchSevenTVEmotes(44317909)
 // ... which is currently the same as
 await fetcher.fetchSevenTVEmotes(44317909, { format: 'webp' })
 
-// Fetch Anatole's emotes in AVIF
-await fetcher.fetchSevenTVEmotes(24377667, { format: 'avif' })
+// Fetch Nerixyz's emotes in AVIF
+await fetcher.fetchSevenTVEmotes(129546453, { format: 'avif' })
 ```
 
 
 ### 7. Export and import emote data
 
-This can be useful to save the emotes in a cache or for offline content.
+This can be useful to save the emotes in a cache or for offline access.
 
 ```js
 // (setup)
@@ -503,7 +523,7 @@ const fetcher = new EmoteFetcher()
 await fetcher.fetchSevenTVEmotes(null, { format: 'avif' })
 
 // Then you can use .toObject() on an `Emote` to export its data.
-// Here's a map to get them all in a single array.
+// Here is a map to get them all in a single array.
 const emotes = fetcher.emotes.map((emote) => emote.toObject())
 
 // Later, with or without a fresh `EmoteFetcher`, you can use .fromObject() on the fetcher.
@@ -511,7 +531,7 @@ fetcher.fromObject(emotes)
 ```
 
 > **NOTE:**  
-> For offline content, you'll still need to download emotes and proxy their URLs.
+> For offline access, you' will still need to download emotes and proxy their URLs.
 
 </details>
 
@@ -527,4 +547,4 @@ This library uses the following:
 - [Twurple](https://twurple.js.org/) and the [Twitch API](https://dev.twitch.tv/)
 - [BetterTTV API](https://betterttv.com/developers/api)
 - [FrankerFaceZ API](https://api.frankerfacez.com/docs/)
-- [7TV API](https://7tv.io/)
+- [7TV API (v3 via GraphQL)](https://github.com/SevenTV/SevenTV/tree/main/apps/api/src/http/v3/gql)

package/dist/TwitchEmoticons.cjs

@@ -100,8 +100,56 @@ var Constants_default = {
     CDN: (id, size = 0, forceStatic = false) => `https://cdn.betterttv.net/emote/${id}/${size + 1}x.${forceStatic ? "png" : "webp"}`
   },
   SevenTV: {
-    Global: "https://7tv.io/v3/emote-sets/global",
-    Channel: (id) => `https://7tv.io/v3/users/twitch/${id}`,
+    GQL: "https://7tv.io/v3/gql",
+    GlobalQuery: `
+      query GetGlobalEmotes($format: [ImageFormat!]) {
+        namedEmoteSet(name: GLOBAL) {
+          emotes {
+            id
+            name
+            flags
+            data {
+              name
+              flags
+              animated
+              host {
+                files(formats: $format) {
+                  name
+                }
+              }
+              owner {
+                display_name
+              }
+            }
+          }
+        }
+      }`,
+    ChannelQuery: `
+      query GetChannelEmotes($id: String!, $format: [ImageFormat!]) {
+        userByConnection(platform: TWITCH, id: $id) {
+          emote_sets(entitled: false) {
+            flags
+            emotes {
+              id
+              name
+              flags
+              data {
+                name
+                flags
+                animated
+                host {
+                  files(formats: $format) {
+                    name
+                  }
+                }
+                owner {
+                  display_name
+                }
+              }
+            }
+          }
+        }
+      }`,
     CDN: (id, format, size = 1, forceStatic = false) => `https://cdn.7tv.app/emote/${id}/${size}x${forceStatic ? "_static" : ""}.${format}`
   },
   FFZ: {
@@ -277,7 +325,7 @@ var Channel = class {
     this.channel_id = id || null;
     this.emotes = new Collection_default();
   }
-  /* There are tests that those are returning Collections, but c8 doesn't get it. */
+  /* There are tests that those are returning Collections, but c8 does not get it. */
   /* c8 ignore start */
   /**
    * Fetches the BTTV emotes for this channel.
@@ -317,12 +365,12 @@ var FFZEmote = class _FFZEmote extends Emote_default {
     this.type = "ffz";
   }
   _setup(data) {
-    super._setup(data);
     this.code = data.name;
     this.ownerName = "owner" in data ? data.owner.name : null;
     this.sizes = "animated" in data ? Object.keys(data.animated) : Object.keys(data.urls);
     this.animated = "animated" in data;
     this.imageType = "animated" in data ? "webp" : "png";
+    this.zeroWidth = data.modifier && data.modifier_flags === 0;
     this.modifier = data.modifier && (data.modifier_flags & 1) !== 0;
   }
   /**
@@ -353,6 +401,7 @@ var FFZEmote = class _FFZEmote extends Emote_default {
       sizes: this.sizes,
       ownerName: this.ownerName,
       type: this.type,
+      zeroWidth: this.zeroWidth,
       modifier: this.modifier
     };
   }
@@ -363,10 +412,13 @@ var FFZEmote = class _FFZEmote extends Emote_default {
    * @returns {FFZEmote} - A FFZEmote instance.
    */
   static fromObject(emoteObject, channel) {
-    const sizesObj = emoteObject.sizes.reduce((acc, curr) => {
-      acc[curr] = curr;
-      return acc;
-    }, {});
+    const sizesObj = emoteObject.sizes.reduce(
+      (acc, curr) => {
+        acc[curr] = curr;
+        return acc;
+      },
+      {}
+    );
     return new _FFZEmote(
       channel,
       emoteObject.id,
@@ -376,8 +428,8 @@ var FFZEmote = class _FFZEmote extends Emote_default {
         urls: sizesObj,
         ...emoteObject.animated ? { animated: sizesObj } : {},
         owner: { name: emoteObject.ownerName },
-        modifier: emoteObject.modifier,
-        modifier_flags: emoteObject.modifier
+        modifier: emoteObject.zeroWidth || emoteObject.modifier,
+        modifier_flags: emoteObject.modifier ? 1 : 0
       }
     );
   }
@@ -397,11 +449,41 @@ var SevenTVEmote = class _SevenTVEmote extends Emote_default {
     this.type = "7tv";
   }
   _setup(data) {
-    super._setup(data);
-    this.code = data.name;
-    this.ownerName = "owner" in data.data ? data.data.owner.display_name : null;
-    this.sizes = data.data.host.files.filter((el) => el.format === this.channel.format.toUpperCase()).map((el) => el.name.replace(/x\.(\w+)/, ""));
-    this.animated = data.data.animated;
+    const ActiveEmoteFlags = {
+      ZeroWidth: 1,
+      // 1 << 0
+      OverrideTwitchGlobal: 65536,
+      // 1 << 16
+      OverrideTwitchSubscriber: 131072,
+      // 1 << 17
+      OverrideBetterTTV: 262144
+      // 1 << 18
+    };
+    const EmoteFlags = {
+      Private: 1,
+      // 1 << 0
+      Authentic: 2,
+      // 1 << 1
+      ZeroWidth: 256,
+      // 1 << 8
+      Sexual: 65536,
+      // 1 << 16
+      Epilepsy: 131072,
+      // 1 << 17
+      Edgy: 262144,
+      // 1 << 18
+      TwitchDisallowed: 16777216
+      // 1 << 24
+    };
+    this.code = data.name || data.data.name;
+    this.ownerName = data.data.owner?.display_name || null;
+    this.sizes = data.data.host.files.map((el) => el.name.replace(/x\.(\w+)/, "")).sort((a, b) => Number(a) - Number(b));
+    if (this.sizes.length === 0) {
+      this.sizes = ["1", "2", "3", "4"];
+    }
+    this.animated = Boolean(data.data.animated);
+    this.nsfw = (data.data.flags & EmoteFlags.Sexual) !== 0 || (data.data.flags & EmoteFlags.TwitchDisallowed) !== 0;
+    this.zeroWidth = (data.flags & ActiveEmoteFlags.ZeroWidth) !== 0 || (data.data.flags & EmoteFlags.ZeroWidth) !== 0;
     this.imageType = this.channel.format;
   }
   /**
@@ -428,6 +510,8 @@ var SevenTVEmote = class _SevenTVEmote extends Emote_default {
     return {
       ...super.toObject(),
       animated: this.animated,
+      nsfw: this.nsfw,
+      zeroWidth: this.zeroWidth,
       sizes: this.sizes,
       ownerName: this.ownerName,
       type: this.type,
@@ -442,21 +526,22 @@ var SevenTVEmote = class _SevenTVEmote extends Emote_default {
    */
   static fromObject(emoteObject, channel) {
     const sizes = emoteObject.sizes.map((size) => {
-      return { format: channel.format.toUpperCase(), name: size };
+      return { name: size };
     });
+    const flags = (emoteObject.nsfw ? 65536 : 0) | (emoteObject.zeroWidth ? 256 : 0);
     return new _SevenTVEmote(
       channel,
       emoteObject.id,
       {
-        code: emoteObject.code,
         name: emoteObject.code,
         data: {
           animated: emoteObject.animated,
-          owner: {
-            display_name: emoteObject.ownerName
-          },
+          flags,
           host: {
             files: sizes
+          },
+          owner: {
+            display_name: emoteObject.ownerName
           }
         }
       }
@@ -480,8 +565,8 @@ var TwitchEmote = class _TwitchEmote extends Emote_default {
   _setup(data) {
     super._setup(data);
     this.set = data.emoticon_set;
-    this.animated = "animated" in data.formats;
-    this.imageType = "animated" in data.formats ? "gif" : "png";
+    this.animated = data.formats?.includes("animated") || false;
+    this.imageType = data.formats?.includes("animated") ? "gif" : "png";
   }
   /**
    * Gets the image link of the emote.
@@ -526,7 +611,7 @@ var TwitchEmote = class _TwitchEmote extends Emote_default {
         code: emoteObject.code,
         animated: emoteObject.animated,
         emoticon_set: emoteObject.set,
-        formats: emoteObject.animated ? { animated: emoteObject.animated } : {}
+        formats: emoteObject.animated ? ["static", "animated"] : ["static"]
       }
     );
   }
@@ -698,18 +783,30 @@ var EmoteFetcher = class {
    * Gets the raw 7TV emotes data for a channel.
    * @private
    * @param {number} [id] - ID of the channel.
+   * @param {('webp'|'avif')} [format] - The type file format to use (webp/avif).
    * @returns {Promise<object[]>} - A promise that resolves to an array of raw 7TV emote data.
    */
-  _getRawSevenTVEmotes(id) {
-    const endpoint = id ? Constants_default.SevenTV.Channel(id) : Constants_default.SevenTV.Global;
-    return fetch(endpoint).then((response) => response.json());
+  _getRawSevenTVEmotes(id, format) {
+    return fetch(
+      Constants_default.SevenTV.GQL,
+      {
+        method: "POST",
+        headers: {
+          "content-type": "application/json"
+        },
+        body: JSON.stringify({
+          query: id ? Constants_default.SevenTV.ChannelQuery : Constants_default.SevenTV.GlobalQuery,
+          variables: id ? { id: String(id), format: [format.toUpperCase()] } : { format: [format.toUpperCase()] }
+        })
+      }
+    ).then((response) => response.json());
   }
   /**
    * Converts and caches a raw 7TV emote.
    * @private
    * @param {number} channelId - ID of the channel.
    * @param {object} data - Raw data.
-   * @param {string} format - The type file format to use (webp/avif).
+   * @param {('webp'|'avif')} format - The type file format to use (webp/avif).
    * @param {SevenTVEmote} [existingEmote] - Existing emote to cache.
    * @returns {SevenTVEmote} - A SevenTVEmote instance.
    */
@@ -792,15 +889,10 @@ var EmoteFetcher = class {
     const {
       format = "webp"
     } = options || {};
-    return this._getRawSevenTVEmotes(channel).then((rawEmotes) => {
-      if (Object.hasOwn(rawEmotes, "emotes")) {
-        for (const data of rawEmotes.emotes) {
-          this._cacheSevenTVEmote(channel, data, format);
-        }
-      } else {
-        for (const data of rawEmotes.emote_set.emotes) {
-          this._cacheSevenTVEmote(channel, data, format);
-        }
+    return this._getRawSevenTVEmotes(channel, format).then((rawEmotes) => {
+      const emoteItems = channel ? rawEmotes?.data?.userByConnection?.emote_sets?.find((set) => set.flags === 0)?.emotes : rawEmotes?.data?.namedEmoteSet?.emotes;
+      for (const data of Array.isArray(emoteItems) ? emoteItems : []) {
+        this._cacheSevenTVEmote(channel, data, format);
       }
       return this.channels.get(channel).emotes.filter((e) => e.type === "7tv");
     });
@@ -914,7 +1006,7 @@ var EmoteParser = class {
       if (emote.modifier) return "";
       const template = this.options.template || Constants_default.Templates[this.options.type];
       const link = emote.toLink({ size, forceStatic, themeMode });
-      const res = template.replaceAll("{link}", link).replaceAll("{name}", emote.code).replaceAll("{size}", size).replaceAll("{creator}", emote.ownerName || "global");
+      const res = template.replaceAll("{link}", link).replaceAll("{name}", emote.code).replaceAll("{size}", size).replaceAll("{creator}", emote.ownerName || "global").replaceAll("{is-animated}", emote.animated ? "true" : "false").replaceAll("{is-zero-width}", emote.zeroWidth ? "true" : "false").replaceAll("{is-nsfw}", emote.nsfw ? "true" : "false");
       return res;
     });
     return parsed;