@rocksky/cli 0.1.1 → 0.3.0

package/src/cmd/scrobble.ts

@@ -1,69 +1,22 @@
-import chalk from "chalk";
-import { RockskyClient } from "client";
-import fs from "fs/promises";
-import md5 from "md5";
-import os from "os";
-import path from "path";
+import { matchTrack } from "lib/matchTrack";
+import { publishScrobble } from "scrobble";
 
-export async function scrobble(track, artist, { timestamp }) {
-  const tokenPath = path.join(os.homedir(), ".rocksky", "token.json");
-  try {
-    await fs.access(tokenPath);
-  } catch (err) {
-    console.error(
-      `You are not logged in. Please run ${chalk.greenBright(
-        "`rocksky login <username>.bsky.social`"
-      )} first.`
-    );
-    return;
-  }
+export async function scrobble(
+  track: string,
+  artist: string,
+  { timestamp, dryRun },
+) {
+  const match = await matchTrack(track, artist);
 
-  const tokenData = await fs.readFile(tokenPath, "utf-8");
-  const { token } = JSON.parse(tokenData);
-  if (!token) {
-    console.error(
-      `You are not logged in. Please run ${chalk.greenBright(
-        "`rocksky login <username>.bsky.social`"
-      )} first.`
-    );
-    return;
+  if (!match) {
+    process.exit(1);
   }
 
-  const client = new RockskyClient(token);
-  const apikeys = await client.getApiKeys();
+  const success = await publishScrobble(match, timestamp, dryRun);
 
-  if (!apikeys || apikeys.length === 0 || !apikeys[0].enabled) {
-    console.error(
-      `You don't have any API keys. Please create one using ${chalk.greenBright(
-        "`rocksky create apikey`"
-      )} command.`
-    );
-    return;
+  if (!success) {
+    process.exit(1);
   }
 
-  const signature = md5(
-    `api_key${
-      apikeys[0].apiKey
-    }artist[0]${artist}methodtrack.scrobblesk${token}timestamp[0]${
-      timestamp || Math.floor(Date.now() / 1000)
-    }track[0]${track}${apikeys[0].sharedSecret}`
-  );
-
-  const response = await client.scrobble(
-    apikeys[0].apiKey,
-    signature,
-    track,
-    artist,
-    timestamp
-  );
-
-  console.log(
-    `Scrobbled ${chalk.greenBright(track)} by ${chalk.greenBright(
-      artist
-    )} at ${chalk.greenBright(
-      new Date(
-        (timestamp || Math.floor(Date.now() / 1000)) * 1000
-      ).toLocaleString()
-    )}`
-  );
+  process.exit(0);
 }

package/src/cmd/search.ts

@@ -1,71 +1,73 @@
 import chalk from "chalk";
 import { RockskyClient } from "client";
+import _ from "lodash";
 
 export async function search(
   query: string,
-  { limit = 20, albums = false, artists = false, tracks = false, users = false }
+  {
+    limit = 20,
+    albums = false,
+    artists = false,
+    tracks = false,
+    users = false,
+  },
 ) {
   const client = new RockskyClient();
   const results = await client.search(query, { size: limit });
-  if (results.records.length === 0) {
+  if (results.hits.length === 0) {
     console.log(`No results found for ${chalk.magenta(query)}.`);
     return;
   }
 
-  // merge all results into one array with type and sort by xata_scrore
-  let mergedResults = results.records.map((record) => ({
+  let mergedResults = results.hits.map((record) => ({
     ...record,
-    type: record.table,
+    type: _.get(record, "_federation.indexUid"),
   }));
 
   if (albums) {
-    mergedResults = mergedResults.filter((record) => record.table === "albums");
+    mergedResults = mergedResults.filter((record) => record.type === "albums");
   }
 
   if (artists) {
-    mergedResults = mergedResults.filter(
-      (record) => record.table === "artists"
-    );
+    mergedResults = mergedResults.filter((record) => record.type === "artists");
   }
 
   if (tracks) {
-    mergedResults = mergedResults.filter(({ table }) => table === "tracks");
+    mergedResults = mergedResults.filter(({ type }) => type === "tracks");
   }
 
   if (users) {
-    mergedResults = mergedResults.filter(({ table }) => table === "users");
+    mergedResults = mergedResults.filter(({ type }) => type === "users");
   }
 
-  mergedResults.sort((a, b) => b.xata_score - a.xata_score);
-
-  for (const { table, record } of mergedResults) {
-    if (table === "users") {
+  for (const { type, ...record } of mergedResults) {
+    if (type === "users") {
       console.log(
         `${chalk.bold.magenta(record.handle)} ${
-          record.display_name
-        } ${chalk.yellow(`https://rocksky.app/profile/${record.did}`)}`
+          record.displayName
+        } ${chalk.yellow(`https://rocksky.app/profile/${record.did}`)}`,
       );
     }
 
-    if (table === "albums") {
+    if (type === "albums") {
       const link = record.uri
-        ? `https://rocksky.app/${record.uri?.split("at://")[1]}`
+        ? `https://rocksky.app/${record.uri?.split("at://")[1]?.replace("app.rocksky.", "")}`
         : "";
       console.log(
         `${chalk.bold.magenta(record.title)} ${record.artist} ${chalk.yellow(
-          link
-        )}`
+          link,
+        )}`,
       );
     }
 
-    if (table === "tracks") {
+    if (type === "tracks") {
       const link = record.uri
-        ? `https://rocksky.app/${record.uri?.split("at://")[1]}`
+        ? `https://rocksky.app/${record.uri?.split("at://")[1]?.replace("app.rocksky.", "")}`
         : "";
       console.log(
         `${chalk.bold.magenta(record.title)} ${record.artist} ${chalk.yellow(
-          link
-        )}`
+          link,
+        )}`,
       );
     }
   }