update now

Author: mrmartineau

.github/workflows/deploy.yml

@@ -8,6 +8,7 @@ env:
   SPOTIFY_CLIENT_ID: ${{ secrets.SPOTIFY_CLIENT_ID }}
   SPOTIFY_CLIENT_SECRET: ${{ secrets.SPOTIFY_CLIENT_SECRET }}
   ZM_API: ${{ secrets.ZM_API }}
+  SUPABASE_USER_API_KEY: ${{ secrets.SUPABASE_USER_API_KEY }}
 
 on:
   schedule:
@@ -38,4 +39,3 @@ jobs:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           command: pages deploy dist --project-name=zander-wtf
-          # gitHubToken: ${{ secrets.GITHUB_TOKEN }}

src/fetching/apis.rest

@@ -0,0 +1,10 @@
+# This file can be used to test the API locally in conjunction with the REST Client VS Code extension.
+# https://marketplace.visualstudio.com/items?itemName=humao.rest-client
+
+# Variables
+@otter_base_url = http://localhost:5678/api
+@token = {{$dotenv SUPABASE_USER_API_KEY}}
+
+# Get media with per-status limit
+GET {{otter_base_url}}/media?limit=3
+Authorization: Bearer {{token}}

src/fetching/books.ts

@@ -0,0 +1,64 @@
+import axios from 'axios';
+import urlJoin from 'proper-url-join';
+import type { NowMediaItem } from 'src/types';
+
+type Enums = {
+  media_rating:
+    | '0'
+    | '0.5'
+    | '1'
+    | '1.5'
+    | '2'
+    | '2.5'
+    | '3'
+    | '3.5'
+    | '4'
+    | '4.5'
+    | '5';
+  media_status: 'now' | 'skipped' | 'done' | 'wishlist';
+  media_type: 'tv' | 'film' | 'game' | 'book' | 'podcast' | 'music' | 'other';
+};
+export interface Media {
+  created_at: string;
+  id: number;
+  media_id: string | null;
+  modified_at: string | null;
+  name: string;
+  platform: string | null;
+  rating: Enums['media_rating'] | null;
+  sort_order: number | null;
+  status: Enums['media_status'] | null;
+  type: Enums['media_type'] | null;
+  image?: string;
+}
+
+type MediaByStatus = Record<Enums['media_status'], Media[]>;
+type MediaResponse = Record<Enums['media_type'], MediaByStatus>;
+
+export const fetchMedia = async (): Promise<MediaResponse> => {
+  const path = urlJoin('https://otter3.zander.wtf/api/media', {
+    query: {
+      user: import.meta.env.SUPABASE_USER_ID || '',
+    },
+  });
+  const mediaResponse = await axios.get<MediaResponse>(path, {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.SUPABASE_USER_API_KEY}`,
+    },
+  });
+  return mediaResponse.data;
+};
+
+export const transformMediaToNow = (media: MediaByStatus): NowMediaItem[] => {
+  let items = media.now ?? [];
+  const doneItems = media.done;
+  if (items.length < 5) {
+    items.push(...doneItems.slice(0, 5 - items.length));
+  }
+
+  return items.map((item) => ({
+    title: item.name,
+    image: item?.image ?? '',
+    rating: item?.rating ?? undefined,
+  }));
+};

src/fetching/media.ts

@@ -4,29 +4,29 @@ import NowMedia from '~/components/NowMedia.astro';
 import { SITE_METADATA } from 'src/consts';
 import { fetchMovies, transformMoviesToNow } from 'src/fetching/movies';
 import { fetchMusic, transformMusicToNow } from 'src/fetching/music';
-import { fetchShows, transformShowsToNow } from 'src/fetching/tv';
-import { fetchPodcasts } from 'src/fetching/podcasts';
-import { fetchBooks, transformBooksToNow } from 'src/fetching/books';
+import { fetchMedia, transformMediaToNow } from 'src/fetching/media';
 import type { NowMediaItem } from 'src/types';
 
 const slug = 'now';
 
 let transformedMovies: NowMediaItem[] = [];
-let transformedShows: NowMediaItem[] = [];
+let tv: NowMediaItem[] = [];
 let transformedMusicArtists: NowMediaItem[] = [];
 let transformedMusicAlbums: NowMediaItem[] = [];
 let podcasts: NowMediaItem[] = [];
 let books: NowMediaItem[] = [];
 
 try {
-  const movies = await fetchMovies(5);
-  transformedMovies = transformMoviesToNow(movies);
+  const media = await fetchMedia();
+  books = transformMediaToNow(media.book);
+  tv = transformMediaToNow(media.tv);
+  podcasts = transformMediaToNow(media.podcast);
 } catch (err) {
   console.error(err);
 }
 try {
-  const shows = await fetchShows();
-  transformedShows = transformShowsToNow(shows);
+  const movies = await fetchMovies(5);
+  transformedMovies = transformMoviesToNow(movies);
 } catch (err) {
   console.error(err);
 }
@@ -38,18 +38,6 @@ try {
 } catch (err) {
   console.error(err);
 }
-
-try {
-  podcasts = await fetchPodcasts(5);
-} catch (err) {
-  console.error(err);
-}
-
-try {
-  books = await fetchBooks(5);
-} catch (err) {
-  console.error(err);
-}
 ---
 
 <PageLayout
@@ -64,10 +52,10 @@ try {
     </p>
     <h2>Watching</h2>
     {transformedMovies?.length ? (<NowMedia title="Movies" items={transformedMovies} />) : null}
-    {transformedShows?.length ? (<NowMedia title="TV Shows" items={transformedShows} />) : null}
+    {tv?.length ? (<NowMedia title="TV Shows" items={tv} />) : null}
     <h2>Listening</h2>
-    {transformedMusicAlbums?.length ? (<NowMedia title="Top albums" items={transformedMusicAlbums} showInfo square />) : null}
-    {transformedMusicArtists?.length ? (<NowMedia title="Top artists" items={transformedMusicArtists} showInfo square />) : null}
+    {transformedMusicAlbums?.length ? (<NowMedia title="Top albums" items={transformedMusicAlbums} square />) : null}
+    {transformedMusicArtists?.length ? (<NowMedia title="Top artists" items={transformedMusicArtists} square />) : null}
     {podcasts?.length ? (<NowMedia title="Podcasts" items={podcasts} square />) : null}
     <h2>Reading</h2>
     {books?.length ? (<NowMedia title="Books" items={books} />) : null}