Merge pull request #82 from Oceanity/dev

Dev -> Main: 0.7.5a

.github/release.yml

@@ -0,0 +1,25 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - octocat
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Semver-Major
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - Semver-Minor
+        - enhancement
+        - feature
+    - title: Bug Fixes 🐛
+      labels:
+        - Semver-Patch
+        - bugfix
+    - title: Other Changes
+      labels:
+        - "*"

changelogs/changelog-0.7.5a.md

@@ -0,0 +1,4 @@
+## What's Changed
+
+**Fixes**
+- Fixed links from non-english interfaces that include `intl-{country code}` in the URL

package.json

@@ -2,7 +2,7 @@
   "name": "oceanity-spotify",
   "displayName": "Spotify (by Oceanity)",
   "scriptOutputName": "oceanitySpotifyIntegration",
-  "version": "0.7.5",
+  "version": "0.7.5a",
   "description": "Adds Spotify events, effects and variables to Firebot",
   "main": "",
   "scripts": {

src/tamperMonkey/lyricsGrabber.user.js

@@ -16,7 +16,7 @@
     fetch: originalFetch
   } = window;
 
-  const version = "0.7.5";
+  const version = "0.7.5a";
 
   // Consts
   const lyricUrlRegex = /https:\/\/spclient\.wg\.spotify\.com\/color-lyrics\/v2\/track\/([a-zA-Z0-9]+)\/image\/.+/;

src/utils/spotify/player/track.test.ts

@@ -115,6 +115,12 @@ describe("Spotify - Track Service", () => {
       expect(track.isTrackUrl(goodUrl)).toBe(true);
     });
 
+    it("returns true if track url with international link", () => {
+      let goodUrl = "https://open.spotify.com/intl-ja/track/6EdXJoSUjYU3wotVjhDcKl?si=cce7b8dc26754566";
+
+      expect(track.isTrackUrl(goodUrl)).toBe(true);
+    });
+
     it("returns true if track url with extraneous whitespace", () => {
       let goodUrl =
         "     https://open.spotify.com/track/4PTG3Z6ehGkBFwjybzWkR8?si=ac674684a1d3410c      ";
@@ -154,6 +160,13 @@ describe("Spotify - Track Service", () => {
       expect(track.getIdFromTrackUrl(url)).toBe(id);
     });
 
+    it("returns id from track url with international link", () => {
+      const id = "4PTG3Z6ehGkBFwjybzWkR8";
+      const url = `https://open.spotify.com/intl-ja/track/${id}`;
+
+      expect(track.getIdFromTrackUrl(url)).toBe(id);
+    });
+
     it("returns null when url is not a track url", () => {
       const id = "4PTG3Z6ehGkBFwjybzWkR8";
       const url = `https://open.spotify.com/artist/${id}`;

src/utils/spotify/player/track.ts

@@ -1,13 +1,12 @@
 import { formatMsToTimecode } from "@oceanity/firebot-helpers/string";
 import { getBiggestImageUrl } from "@utils/array";
 import { SpotifyService } from "@utils/spotify";
-import { LargeNumberLike } from "crypto";
 import { EventEmitter } from "events";
 
 export class SpotifyTrackService extends EventEmitter {
   private readonly spotify: SpotifyService;
   private readonly urlRegex: RegExp =
-    /(?:https?:)\/\/open\.spotify\.com\/track\/(.+?)(?:\?.+)?(?:\W|$)/;
+    /(?:https?:)\/\/open\.spotify\.com\/(?:intl-[a-z]+\/)?track\/(.+?)(?:\?.+)?(?:\W|$)/;
 
   private _track?: SpotifyTrackDetails | null;
   private _trackSummary?: SpotifyTrackSummary;