feat: v2.2.1

- Pass location from listener to toggleButton function
- Refactor
  - Move fetching functions to services.ts
  - Rename util.ts to utils.ts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lucky-lp",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "private": true,
   "scripts": {
     "build": "spicetify-creator",

src/app.ts

@@ -1,16 +1,20 @@
 import { toggleButton } from "./button";
 
 async function main() {
-  while (!Spicetify?.showNotification || !Spicetify?.Platform?.History) {
+  while (
+    !Spicetify?.showNotification &&
+    !Spicetify?.Platform?.History &&
+    !Spicetify?.CosmosAsync
+  ) {
     await new Promise((resolve) => setTimeout(resolve, 500));
   }
 
   // Show button on app load
-  toggleButton();
+  toggleButton(Spicetify.Platform.History.location);
 
   // Show button depending on navigation
-  Spicetify.Platform.History.listen(() => {
-    toggleButton();
+  Spicetify.Platform.History.listen((location: Location) => {
+    toggleButton(location);
   });
 }
 

src/button.ts

@@ -1,8 +1,8 @@
 import ShuffleIcon from "./shuffleIcon";
-import { handleClick, isAlbumPage, isHomePage } from "./util";
+import { handleClick, isAlbumPage, isHomePage } from "./utils";
 
-export const toggleButton = () => {
-  if (isHomePage() || isAlbumPage()) {
+export const toggleButton = (location: Location) => {
+  if (isHomePage(location.pathname) || isAlbumPage(location.pathname)) {
     addButton();
   } else {
     removeButton();

src/services.ts

@@ -0,0 +1,19 @@
+import { IAlbum, ISavedAlbums } from "./types/api";
+
+export const getAlbumsCount = async (): Promise<number> => {
+  const result: ISavedAlbums = await Spicetify.CosmosAsync.get(
+    "https://api.spotify.com/v1/me/albums?limit=1",
+  );
+
+  return result.total;
+};
+
+export const getRandomAlbum = async (total: number): Promise<IAlbum> => {
+  const randomIndex = Math.floor(Math.random() * (total + 1));
+
+  const randomResult: ISavedAlbums = await Spicetify.CosmosAsync.get(
+    `https://api.spotify.com/v1/me/albums?limit=1&offset=${randomIndex - 1}`,
+  );
+
+  return randomResult.items[0];
+};

src/util.ts → src/utils.ts

@@ -1,31 +1,20 @@
 import { IAlbum, ISavedAlbums } from "./types/api";
+import { getAlbumsCount, getRandomAlbum } from "./services";
 
-export const isHomePage = () => {
-  const pathname = Spicetify.Platform.History.location.pathname;
+export const isHomePage = (pathname: string) => {
   return pathname === "/";
 };
 
-export const isAlbumPage = () => {
-  const pathname = Spicetify.Platform.History.location.pathname;
+export const isAlbumPage = (pathname: string) => {
   return pathname.startsWith("/album/");
 };
 
-const getRandomAlbumIndex = (total: number): number =>
-  Math.floor(Math.random() * (total + 1));
-
 const getRandomSavedAlbum = async (): Promise<false | IAlbum> => {
   try {
-    const result: ISavedAlbums = await Spicetify.CosmosAsync.get(
-      "https://api.spotify.com/v1/me/albums?limit=1",
-    );
+    const albumsCount = await getAlbumsCount();
 
-    if (result && result?.total) {
-      const albumsCount = result.total;
-      const randomIndex = getRandomAlbumIndex(albumsCount);
-      const randomResult: ISavedAlbums = await Spicetify.CosmosAsync.get(
-        `https://api.spotify.com/v1/me/albums?limit=1&offset=${randomIndex - 1}`,
-      );
-      const randomAlbum = randomResult.items[0];
+    if (albumsCount) {
+      const randomAlbum = await getRandomAlbum(albumsCount);
 
       Spicetify.Platform.History.push(`/album/${randomAlbum.album.id}`);