Fixed detection if youtube video is music or not

README.md

@@ -88,8 +88,6 @@ Copy `apache2.conf.EXAMPLE` to `/etc/apache2/sites-available/moshingmammut.conf`
 Domain. If you do not need or want SSL support, remove the whole `<IfModule mod_ssl.c>` block.
 If you do, add the path to your SSLCertificateFile and SSLCertificateKeyFile.
 
-Modify DocumentRoot and the two Alias and Directory statements, so that thumbnails and avatars are served directly by apache.
-
 Copy `moshing-mammut.service.EXAMPLE` to `/etc/systemd/system/moshing-mammut.service`
 and set your `User`, `Group`, `ExecStart` and `WorkingDirectory` accordingly.
 

apache2.conf.EXAMPLE

@@ -15,23 +15,6 @@
 
     Include /etc/letsencrypt/options-ssl-apache.conf
 
-    DocumentRoot /home/moshing-mammut/app/
-
-    ProxyPass /avatars/ !
-    ProxyPass /thumbnails/ !
-    Alias /avatars/ /home/moshing-mammut/app/avatars/
-    Alias /thumbnails/ /home/moshing-mammut/app/thumbnails/
-
-    <Directory "/home/moshing-mammut/app/avatars/">
-      Require all granted
-      Header set Cache-Control "public,max-age=31536000,immutable"
-    </Directory>
-
-    <Directory "/home/moshing-mammut/app/thumbnails/">
-      Require all granted
-      Header set Cache-Control "public,max-age=31536000,immutable"
-    </Directory>
-
     ProxyPass / http://localhost:3000/
     ProxyPassReverse / http://localhost:3000/
 

src/app.html

@@ -10,10 +10,6 @@
     <meta name="apple-mobile-web-app-title" content="Moshing Mammut" />
     <meta name="application-name" content="Moshing Mammut" />
     <meta name="msapplication-TileColor" content="#2e0b78" />
-    <meta
-      name="description"
-      content="A collection of music recommendations and now-listenings by the users of metalhead.club"
-    />
 
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta name="theme-color" content="#17063b" media="(prefers-color-scheme: dark)" />

src/lib/server/timeline.ts

@@ -4,7 +4,7 @@ import {
   ODESLI_API_KEY,
   YOUTUBE_API_KEY
 } from '$env/static/private';
-import { log } from '$lib/log';
+import { enableVerboseLog, log } from '$lib/log';
 import type {
   Account,
   AccountAvatar,
@@ -59,13 +59,17 @@ export class TimelineReader {
     }
 
     const item = respObj.items[0];
-    if (item.tags?.includes('music')) {
+    if (!item.snippet) {
+      console.warn('Could not load snippet for video', videoId, item);
+      return false;
+    }
+    if (item.snippet.tags?.includes('music')) {
       return true;
     }
 
     const categorySearchParams = new URLSearchParams([
       ['part', 'snippet'],
-      ['id', item.categoryId],
+      ['id', item.snippet.categoryId],
       ['key', YOUTUBE_API_KEY]
     ]);
     const youtubeCategoryUrl = new URL(
@@ -73,7 +77,25 @@ export class TimelineReader {
     );
     const categoryTitle: string = await fetch(youtubeCategoryUrl)
       .then((r) => r.json())
-      .then((r) => r.items[0]?.title);
+      .then((r) => r.items[0]?.snippet?.title);
+    if (enableVerboseLog) {
+      log.verbose(
+        'Video',
+        videoId,
+        'category',
+        categoryTitle,
+        'tags',
+        item.snippet.tags,
+        'category id',
+        item.snippet.categoryId,
+        'response',
+        respObj,
+        'snippet',
+        item.snippet
+      );
+    } else {
+      log.debug('Video', videoId, 'category', categoryTitle);
+    }
     return categoryTitle === 'Music';
   }
 

svelte.config.js

@@ -11,14 +11,15 @@ const config = {
     // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
     // If your environment is not supported or you settled on a specific environment, switch out the adapter.
     // See https://kit.svelte.dev/docs/adapters for more information about adapters.
-    adapter: adapter(),
+    adapter: adapter()
+  },
 
-    csp: {
-      directives: {
-        'script-src': ['self', 'unsafe-inline'],
-        'base-uri': ['self'],
-        'object-src': ['none']
-      }
+  csp: {
+    directives: {
+      'script-src': ['self']
+    },
+    reportOnly: {
+      'script-src': ['self']
     }
   }
 };