Improvements to use Kirby's content API for output in the snippet.

Author: scottboms

classes/MusicKit.php

@@ -7,6 +7,7 @@
 use Scottboms\MusicKit\Utils;
 use Kirby\Http\Response;
 use Kirby\Http\Remote;
+use Kirby\Cms\Content;
 
 class MusicKit
 {
@@ -403,64 +404,92 @@ public static function albumDetails(string $albumId, string $language = 'en-US')
 	 * server-side helper for front-end snippet
 	 * fetches recently played using shared token, caches response,
 	 * and normalize to a render-friendly array
+	 *
 	 * @return Array
 	 */
-	public static function recentForFrontend(int $limit = 12, string $language = 'en-US', int $cacheTtl = 120): array
+	public static function recentForFrontend(
+		int $limit = 12,
+		string $language = 'en-US',
+		int $cacheTtl = 120,
+		bool $asContent = true): array
 	{
 		$cache     = kirby()->cache('scottboms.applemusic');
 		$cacheKey  = 'am:recent:site:' . md5(json_encode([$limit, $language]));
+
+		// try cache (always arrays)
 		if ($cacheTtl > 0 && ($cached = $cache->get($cacheKey))) {
-			return $cached;
+			return static::toContentPayload($cached);
 		}
 
+		// need a shared (site-level) Music-User-Token
 		$mut = Auth::readAnyToken();
 		if (!$mut) {
 			$payload = ['items' => [], 'error' => 'Missing shared Music-User-Token (site)'];
 			if ($cacheTtl > 0) $cache->set($cacheKey, $payload, $cacheTtl);
-			return $payload;
+			return static::toContentPayload($payload);
 		}
 
+		// dev token + fetch from api
 		$opts = static::opts();
 		$dev  = Auth::devToken($opts);
-		$resp = static::appleGet(
-			'/v1/me/recent/played/tracks?limit=' . $limit . '&l=' . rawurlencode($language),
-			$dev,
-			$mut
-		);
-		$json = json_decode($resp->body() ?? 'null', true);
-
-		if (!is_array($json) || $resp->code() >= 400) {
+
+		$path = '/v1/me/recent/played/tracks?limit=' . (int)$limit . '&l=' . rawurlencode($language);
+		$res  = static::appleGet($path, $dev, $mut);
+		$json = json_decode($res->body() ?? 'null', true);
+
+		if (!is_array($json) || !isset($json['data'])) {
 			$payload = ['items' => [], 'error' => 'Apple Music API error'];
 			if ($cacheTtl > 0) $cache->set($cacheKey, $payload, $cacheTtl);
-			return $payload;
+			return static::toContentPayload($payload);
 		}
 
-		// normalize for rendering
+		// normalize items to cache-friendly arrays
 		$items = array_map(function ($i) {
 			$a   = $i['attributes'] ?? [];
 			$img = null;
+
 			if (!empty($a['artwork']['url'])) {
 				$img = str_replace(['{w}', '{h}'], [240, 240], $a['artwork']['url']);
 			}
 
-			// convert millis -> mm:ss
-			$duration = $a['durationInMillis'] ?? null;
-			$songLength = Utils::format_mmss($duration);
+			$id  = $i['id'] ?? null;
+			$url = $a['url'] ?? null;
+
+			// if the id starts with i., clear the url (internal ids)
+			if (is_string($id) && str_starts_with($id, 'i.')) {
+				$url = null;
+			}
 
 			return [
-				'id'          => $i['id'] ?? null,
+				'id'          => $id,
 				'name'        => $a['name'] ?? '',
 				'artist'      => $a['artistName'] ?? '',
 				'album'       => $a['albumName'] ?? '',
-				'duration'    => $songLength,
-				'releaseDate' => $a['releaseDate'] ?? null,
-				'url'         => $a['url'] ?? null,
+				'duration'    => Utils::format_mmss($a['durationInMillis'] ?? null),
+				'releaseDate' => $a['releaseDate'] ?? null, // ISO 8601 (use ->toDate() in templates)
+				'url'         => $url,
 				'image'       => $img,
 			];
 		}, $json['data'] ?? []);
 
 		$payload = ['items' => $items, 'error' => null];
-		if ($cacheTtl > 0) $cache->set($cacheKey, $payload, $cacheTtl);
+
+		// cache arrays
+		if ($cacheTtl > 0) {
+			$cache->set($cacheKey, $payload, $cacheTtl);
+		}
+
+		return static::toContentPayload($payload);
+	}
+
+
+	/**
+	 * convert ['items' => [array...]] to ['items' => [Content...]]
+	 * @return Array
+	 */
+	protected static function toContentPayload(array $payload): array
+	{
+		$payload['items'] = array_map(fn ($i) => new Content($i), $payload['items'] ?? []);
 		return $payload;
 	}
 

index.php

@@ -159,7 +159,7 @@
 	],
 
 	'info' => [
-		'version'  => '2.3.5',
+		'version'  => '2.3.6',
 		'homepage' => 'https://github.com/scottboms/kirby-applemusic',
 		'license'  => 'MIT',
 		'authors'  => [[ 'name' => 'Scott Boms' ]],

package.json

@@ -2,7 +2,7 @@
 	"name": "scottboms/applemusic",
 	"description": "Apple Music Embed",
 	"author": "Scott Boms <[email protected]>",
-	"version": "2.3.5",
+	"version": "2.3.6",
 	"type": "kirby-plugin",
 	"license": "MIT",
 	"scripts": {

snippets/recently-played.php

@@ -7,6 +7,7 @@
 $cacheTtl = (int)($cacheTtl ?? 120);
 
 $result = MusicKit::recentForFrontend($limit, $language, $cacheTtl);
+
 $items  = $result['items'];
 $error  = $result['error'];
 ?>
@@ -20,19 +21,37 @@
 		<p class="am-empty">No items.</p>
 	<?php else: ?>
 		<ul class="am-grid">
-			<?php foreach ($items as $t): ?>
+			<?php foreach ($items as $song): ?>
 				<li class="am-card">
-					<a<?= $t['url'] ? ' href="' . html($t['url']) . '" target="_blank" rel="noopener"' : '' ?>>
-						<?php if ($t['image']): ?>
-							<figure>
-								<img src="<?= html($t['image']) ?>" alt="<?= html($t['name']) ?>" loading="lazy">
-							</figure>
-						<?php endif; ?>
-						<span class="am-title"><?= html($t['name']) ?></span>
-						<span class="am-subtitle"><?= html($t['album']) ?></span>
-						<span class="am-sub"><?= html($t['artist']) ?></span>
-						<span class="am-sub"><?= html($t['duration']) ?></span>
-					</a>
+					<?php if ($song->url()->isNotEmpty()): ?>
+						<a href="<?= $song->url() ?>" target="_blank" rel="noopener">
+					<?php endif ?>
+
+					<?php if ($song->image()->isNotEmpty()): ?>
+						<figure>
+							<img src="<?= $song->image() ?>" alt="<?= $song->name() ?>" loading="lazy">
+						</figure>
+					<?php endif ?>
+
+					<?php if ($song->name()->isNotEmpty()): ?>
+						<span class="am-title"><?= $song->name() ?></span>
+					<?php endif ?>
+
+					<?php if ($song->album()->isNotEmpty()): ?>
+						<span class="am-subtitle"><?= $song->album() ?></span>
+					<?php endif ?>
+
+					<?php if ($song->artist()->isNotEmpty()): ?>
+						<span class="am-sub"><?= $song->artist() ?></span>
+					<?php endif ?>
+
+					<?php if ($song->duration()->isNotEmpty()): ?>
+						<span class="am-sub"><?= $song->duration() ?></span>
+					<?php endif ?>
+
+					<?php if ($song->url()->isNotEmpty()): ?>
+						</a>
+					<?php endif ?>
 				</li>
 			<?php endforeach; ?>
 		</ul>