Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion ts/packages/agents/player/src/agent/playerHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { PlayerActions } from "./playerSchema.js";
import registerDebug from "debug";
import { resolveMusicDeviceEntity } from "../devices.js";
import { getUserDevices } from "../endpoints.js";
import { getUserDataCompletions } from "../userData.js";
import { addUserDataStrings, getUserDataCompletions } from "../userData.js";

const debugSpotify = registerDebug("typeagent:spotify");

Expand Down Expand Up @@ -184,6 +184,18 @@ async function validateTrack(
album: string | undefined,
context: IClientContext,
) {
if (artists === undefined && album === undefined) {
const data = context.userData?.data;
if (data && data.tracks) {
if (data.nameMap === undefined) {
addUserDataStrings(data);
}
// if user data has exact match return true
if (data.nameMap!.get(trackName.toLocaleLowerCase())) {
return true;
}
}
}
const resolvedArtists = artists
? await resolveArtists(artists, context)
: [];
Expand Down Expand Up @@ -254,6 +266,20 @@ async function validateAlbum(
}

async function validateArtist(artistName: string, context: IClientContext) {
// if user data has exact match return true
const userData = context.userData;
if (userData && userData.data) {
const artists = userData.data.artists;
if (artists) {
if (!userData.data.nameMap) {
addUserDataStrings(userData.data);
}
if (userData.data.nameMap!.get(artistName.toLocaleLowerCase())) {
return true;
}
}
}

const data = await searchArtists(artistName, context);

if (data && data.artists && data.artists.items.length > 0) {
Expand Down
Loading