Inlined stylesheet, fixed colors

Reviewed-on: https://phlaym.net/git/phlaym/moshing-mammut/pulls/20

.editorconfig

@@ -2,4 +2,4 @@ root = true
 
 [*.{svelte, ts, cjs, json}]
 indent_style = space
-indent_size = 4
+indent_size = 2

.env.EXAMPLE

@@ -1,6 +1,11 @@
-HASHTAG_FILTER = ichlausche,music,musik,nowplaying,tunetuesday
+HASHTAG_FILTER = ichlausche,music,musik,nowplaying,tunetuesday,nowlistening
-URL_FILTER = song.link,album.link,spotify.com,music.apple.com,bandcamp.com
 YOUTUBE_API_KEY = CHANGE_ME
+ODESLI_API_KEY = CHANGE_ME
+MASTODON_INSTANCE = 'metalhead.club'
+BASE_URL = 'https://moshingmammut.phlaym.net'
 VERBOSE = false
+IGNORE_USERS = @moshhead@metalhead.club
+WEBSUB_HUB = 'http://pubsubhubbub.superfeedr.com'
 
 PUBLIC_REFRESH_INTERVAL = 10000
+PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME = 'Metalhead.club'

.gitignore

@@ -1,4 +1,8 @@
 *.db
+feed.xml
+playbook.yml
+inventory.yml
+ansible.cfg
 
 node_modules
 /build

.nova/Configuration.json

@@ -1,7 +1,11 @@
 {
-  "apexskier.typescript.config.formatDocumentOnSave": "true",
+  "apexskier.eslint.config.eslintConfigPath" : ".eslintrc.cjs",
+  "apexskier.eslint.config.eslintPath" : "node_modules\/@eslint\/eslintrc\/dist\/eslintrc.cjs",
+  "apexskier.eslint.config.fixOnSave" : "Enable",
+  "apexskier.typescript.config.formatDocumentOnSave" : "false",
   "apexskier.typescript.config.isEnabledForJavascript" : "Enable",
   "apexskier.typescript.config.organizeImportsOnSave" : "true",
   "apexskier.typescript.config.userPreferences.quotePreference" : "single",
-  "apexskier.typescript.config.userPreferences.useLabelDetailsInCompletionEntries": true
+  "apexskier.typescript.config.userPreferences.useLabelDetailsInCompletionEntries" : true,
+  "prettier.format-on-save" : "Global Default"
 }

.prettierignore

@@ -6,6 +6,7 @@ node_modules
 .env
 .env.*
 !.env.example
+/.nova
 
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml

README.md

@@ -1,3 +1,6 @@
+[![License: MIT](https://img.shields.io/badge/License-LGPL-blue.svg)](https://opensource.org/license/lgpl-3-0/)
+[![Release](https://shields.io/badge/dynamic/json.svg?label=release&url=https://phlaym.net/git/api/v1/repos/phlaym/moshing-mammut/releases&query=$[0].tag_name)](https://phlaym.net/phlaym/moshing-mammut/releases)
+
 # Moshing Mammut
 
 The fine folks on the [metalhead.club Mastodon Server](https://metalhead.club) occasionally share like to share
@@ -8,8 +11,8 @@ Having a quick overview over what is being posted can be a great way to discover
 
 This is fairly simple from a technical point of view! metalhead.club's local timeline is being watched using the
 Mastodon Streaming API over a Websocket. Every time a new post arrives, it is checked if it contains any music by
-checking included hashtags and URLs. A list of tags and URLs can be found in [the configuration](.env.EXAMPLE).
+checking included hashtags and URLs. A list of tags can be found in [the configuration](.env.EXAMPLE).
-Additionally, lins to YouTube are queried, if they are music or other videos using the YouTube API.
+Additionally, links are vetted if they are music by checking if https://song.link finds info on them.
 
 If a post passes this check it is saved to a SQLite database.
 
@@ -30,12 +33,12 @@ I can see that there are plenty of posts using only descriptions and links witho
 be missed. This isn't a great solution.
 
 Another idea was to store only URLs of posts and resolve the content and account information live.
-This would be better, but I'm *still* storing post information while also slowing the app down and introduce more code
+This would be better, but I'm _still_ storing post information while also slowing the app down and introduce more code
 complexity. I'm willing to make this change if people prefer this though.
 
 Additionally, I ended up adding a few things which turned out to be not needed:
 The `tags` table (tags are included in the post's content and I don't do anything separately with tags) and
-`accounts.username` and `accounts.avatar_static`. I will keep these in until the initial wave of feedback arrives, and
+~~`accounts.username`~~ (s being used for #18) ~~and `accounts.avatar_static`~~ (has been removed). I will keep these in until the initial wave of feedback arrives, and
 remove it if no new features required them.
 
 I'll gladly accept any help in coming up with a good solution which doesn't need to store anything at all!
@@ -46,38 +49,56 @@ This might not be the ideal setup to run this, but here's how I am doing it. Ins
 or Debian derivative, using Apache as HTTP Proxy. Other setups are possible, but not covered here.
 By default, NVM is used to install NodeJS, but you can install it any way you want.
 
-This is based on [SvelteKit's instructions](https://kit.svelte.dev/docs/adapter-node#deploying)
+This is based on [SvelteKit's instructions](https://kit.svelte.dev/docs/adapter-node#deploying) and [How To Deploy Node.js Applications Using Systemd and Nginx](https://www.digitalocean.com/community/tutorials/how-to-deploy-node-js-applications-using-systemd-and-nginx)
-
-On your server, install the requirements:
-- Apache2 HTTP Server
-- NodeJS (via [NVM](https://github.com/nvm-sh/nvm))
 
 #### On your server
 
-Create a directory for the app. This will be called `$APP_DIR` from now on.
+Install Apache2 if not already installed.
 
-Place `package.json`, `apache2.conf.EXAMPLE`, `moshing-mammut.service.EXAMPLE` and `start.sh.EXAMPLE` in this directory.
+Copy `apache2.conf.EXAMPLE` and `moshing-mammut.service.EXAMPLE` to your server.
+
+Set up a user for the app: `useradd -mrU moshing-mammut`
+
+Switch to your newly created user: `su moshing-mammut`
+
+Set up NVM:
+
+```
+$ cd
+$ curl https://raw.github.com/creationix/nvm/master/install.sh | sh
+$ source ~/.nvm/nvm.sh
+$ nvm install --lts
+```
+
+Create a directory for the app. This will be called `$APP_DIR` from now on. I use `/home/moshing-mammut/app`.
+
+Enter `$APP_DIR`.
+
+Place `package-lock.json` and `start.sh.EXAMPLE` in this directory.
+Run `npm ci --omit dev` to install the dependencies.
+
+Rename `start.sh.EXAMPLE` to `start.sh` and set the path to your NVM.
+
+If you do not have NVM installed, simply remove the line and make sure your node executable can be found either by
+specifying the full path or by adding it to your $PATH.
+
+Exit out of your `moshing-mammut` user shell.
 
 Copy `apache2.conf.EXAMPLE` to `/etc/apache2/sites-available/moshingmammut.conf` and replace `ServerName` with your
 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.
 
 Copy `moshing-mammut.service.EXAMPLE` to `/etc/systemd/system/moshing-mammut.service`
-and replace `/PATH_TO_MOSHING_MAMMUT` with your `$APP_DIR`. Also replace `MOSHING_MAMMUT_USER` with the user you want
+and set your `User`, `Group`, `ExecStart` and `WorkingDirectory` accordingly.
-to run the app as.
-
-Rename `start.sh.EXAMPLE` to `start.sh` and replace `/PATH_TO_YOUR_NVM/.nvm/nvm.sh` with the path to your NVM
-installation.
-If you do not have NVM installed, simply remove the line and make sure your node executable can be found either by
-specifying the full path or by adding it to your $PATH.
-
-Run `npm ci --omit dev` to install the dependencies.
 
 #### On your development machine
 
-Copy `.env.EXAMPLE` to `.env` and add your `YOUTUBE_API_KEY`.
+Copy `.env.EXAMPLE` to `.env` and add your `YOUTUBE_API_KEY` and `ODESLI_API_KEY`.
 To obtain one follow [YouTube's guide](https://developers.google.com/youtube/registering_an_application) to create an
-*API key*. As soon as #13 is implemented, this will be optional!
+_API key_.
+If `YOUTUBE_API_KEY` is unset, no playlist will be updated.
+
+If `ODESLI_API_KEY` is unset, your rate limit to the song.link API will be lower.
 
 Run `npm run build` and copy the output folder, usually `build` to `$APP_DIR` on your server.
 
@@ -94,3 +115,21 @@ Verify that everything is okay with `service moshing-mammut status`.
 
 The app should now be reachable on http://localhost:3000 or whatever you configured your domain to be!
 
+# Icons
+
+Favicon is a combination of [speaker-line by remix icon](https://remixicon.com/icon/speaker-line)
+and [the official Mastodon icon](https://joinmastodon.org/en/branding).
+
+It has been mushed together by me, saved as SVG file in [icon.svg](./icon.svg)
+and turned into a slew of icons by [https://realfavicongenerator.net/](https://realfavicongenerator.net/):
+
+```sh
+npm install -g cli-real-favicon
+real-favicon generate faviconDescription.json faviconData.json static
+```
+
+Other icons:
+
+- [error-warning-fill by remix icon](https://remixicon.com/icon/error-warning-fill)
+- [git-branch-fill by remix icon](https://remixicon.com/icon/git-branch-fill)
+- [rss-fill by remix icon](https://remixicon.com/icon/rss-line)

faviconDescription.json

@@ -0,0 +1,63 @@
+{
+  "masterPicture": "./icon.svg",
+  "iconsPath": "/static",
+  "design": {
+    "ios": {
+      "pictureAspect": "backgroundAndMargin",
+      "backgroundColor": "#ffffff",
+      "margin": "0%",
+      "assets": {
+        "ios6AndPriorIcons": false,
+        "ios7AndLaterIcons": true,
+        "precomposedIcons": true,
+        "declareOnlyDefaultIcon": true
+      },
+      "appName": "Moshing Mammut"
+    },
+    "desktopBrowser": {
+      "design": "raw"
+    },
+    "windows": {
+      "pictureAspect": "whiteSilhouette",
+      "backgroundColor": "#2e0b78",
+      "onConflict": "override",
+      "assets": {
+        "windows80Ie10Tile": false,
+        "windows10Ie11EdgeTiles": {
+          "small": true,
+          "medium": true,
+          "big": true,
+          "rectangle": true
+        }
+      },
+      "appName": "Moshing Mammut"
+    },
+    "androidChrome": {
+      "pictureAspect": "noChange",
+      "themeColor": "#2e0b78",
+      "manifest": {
+        "name": "Moshing Mammut",
+        "display": "standalone",
+        "orientation": "notSet",
+        "onConflict": "override",
+        "declared": true
+      },
+      "assets": {
+        "legacyIcon": false,
+        "lowResolutionIcons": false
+      }
+    },
+    "safariPinnedTab": {
+      "pictureAspect": "blackAndWhite",
+      "threshold": 27.5,
+      "themeColor": "#2e0b78"
+    }
+  },
+  "settings": {
+    "scalingAlgorithm": "Mitchell",
+    "errorOnImageTooSmall": false,
+    "readmeFile": false,
+    "htmlCodeFile": false,
+    "usePathAsIs": false
+  }
+}

icon.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1080 1080" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1.1479,0,0,1.1479,-30.6849,-184.606)">
+        <path d="M394.962,828.42C395.182,833.842 395.637,839.066 396.328,844.053C407.304,927.369 478.944,932.362 546.806,934.687C615.3,937.031 676.288,917.8 676.288,917.8L679.102,979.724C679.102,979.724 631.194,1005.45 545.847,1010.18C498.785,1012.77 440.352,1009 372.293,990.982C224.682,951.913 199.297,794.568 195.412,634.913C194.228,587.513 194.958,542.815 194.958,505.432C194.958,389.045 229.261,290.625 266.058,262.36C280.549,251.229 294.537,251.58 309.264,251.58L770.736,251.58C786.666,251.58 799.578,264.493 799.578,280.422L799.578,799.578C799.578,815.508 786.666,828.42 770.736,828.42L394.962,828.42ZM540,759.411C619.644,759.411 684.21,694.845 684.21,615.201C684.21,535.557 619.644,470.991 540,470.991C523.462,470.991 507.575,473.775 492.781,478.899C436.326,498.454 395.79,552.094 395.79,615.201C395.79,694.845 460.355,759.411 540,759.411ZM540,701.727C492.212,701.727 453.474,662.989 453.474,615.201C453.474,567.413 492.212,528.675 540,528.675C587.788,528.675 626.526,567.413 626.526,615.201C626.526,662.989 587.788,701.727 540,701.727ZM540,408.951C563.893,408.951 583.263,389.582 583.263,365.688C583.263,341.794 563.893,322.425 540,322.425C516.107,322.425 496.737,341.794 496.737,365.688C496.737,389.582 516.107,408.951 540,408.951Z" style="fill:rgb(46,11,120);stroke:white;stroke-width:29.62px;"/>
+    </g>
+</svg>

moshing-mammut.service.EXAMPLE

@@ -2,14 +2,13 @@
 Description=Moshing Mammut
 
 [Service]
-ExecStart=/PATH_TO_MOSHING_MAMMUT/start.sh
+ExecStart=/home/moshing-mammut/app/start.sh
 Restart=always
-User=MOSHING_MAMMUT_USER
+User=moshing-mammut
-Group=nogroup
+Group=moshing-mammut
 Environment=PATH=/usr/bin:/usr/local/bin
 Environment=NODE_ENV=production
-WorkingDirectory=/PATH_TO_MOSHING_MAMMUT/
+WorkingDirectory=/home/moshing-mammut/app
-KillMode=process
 
 [Install]
 WantedBy=multi-user.target

package.json

@@ -1,9 +1,11 @@
 {
   "name": "moshing-mammut",
-  "version": "0.0.1",
+  "version": "1.3.1",
   "private": true,
+  "license": "LGPL-3.0-or-later",
   "scripts": {
     "dev": "vite dev",
+    "devn": "vite dev --host",
     "build": "vite build",
     "preview": "vite preview",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
@@ -14,8 +16,11 @@
   "devDependencies": {
     "@sveltejs/adapter-node": "^1.2.3",
     "@sveltejs/kit": "^1.5.0",
+    "@types/sqlite3": "^3.1.8",
+    "@types/ws": "^8.5.4",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
+    "@zerodevx/svelte-toast": "^0.9.3",
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-svelte3": "^4.0.0",
@@ -29,9 +34,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@types/sqlite3": "^3.1.8",
-    "@types/ws": "^8.5.4",
     "dotenv": "^16.0.3",
+    "feed": "^4.2.2",
     "sqlite3": "^5.1.6",
     "ws": "^8.13.0"
   }

src/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

src/app.html

@@ -2,22 +2,57 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+    <link rel="apple-touch-icon" sizes="180x180" href="%sveltekit.assets%/apple-touch-icon.png" />
-		<link rel="stylesheet" href="%sveltekit.assets%/style.css" />
+    <link rel="icon" type="image/png" sizes="32x32" href="%sveltekit.assets%/favicon-32x32.png" />
-		<meta name="viewport" content="width=device-width" />
+    <link rel="icon" type="image/png" sizes="16x16" href="%sveltekit.assets%/favicon-16x16.png" />
-		<meta name="theme-color" content="#17063B" media="(prefers-color-scheme: dark)" />
+    <link rel="manifest" href="%sveltekit.assets%/site.webmanifest" />
-		<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)" />
+    <link rel="mask-icon" href="%sveltekit.assets%/safari-pinned-tab.svg" color="#2e0b78" />
+    <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="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
+    <meta name="theme-color" content="#17063b" media="(prefers-color-scheme: dark)" />
+    <meta name="theme-color" content="#BCB9B2" media="(prefers-color-scheme: light)" />
+    <link rel="alternate" type="application/atom+xml" href="/feed.xml" title="Atom Feed" />
+    <link rel="hub" href="https://pubsubhubbub.superfeedr.com" />
     %sveltekit.head%
     <style>
       body {
-				--color-text: #2F0C7A;
+        --color-blue: hsl(259, 82%, 26%);
-				--color-bg: white;
+        --color-blue-dark: hsl(259, 82%, 13%);
-				--color-border: #17063B;
+        --color-lavender: hsl(253, 82%, 33%);
-				--color-link: #563ACC;
+        --color-mauve: hsl(273, 82%, 38%);
-				--color-link-visited: #858AFA;
+
+        --color-grey: hsl(44, 7%, 41%);
+        --color-grey-translucent: hsla(44, 7%, 41%, 0.2);
+        --color-grey-light: hsl(0, 0%, 98%);
+
+        --color-red: hsl(7, 100%, 56%);
+        --color-red-light: hsl(7, 100%, 61%);
+        --color-red-lighter: hsl(7, 100%, 68%);
+        --color-red-dark: hsl(7, 100%, 48%);
+        --color-red-desat: hsl(7, 20%, 56%);
+        --color-red-desat-dark: hsl(7, 20%, 30%);
+        --color-red-desat-desat: hsl(7, 8%, 56%);
+
+        --color-text: var(--color-blue-dark);
+        --color-border: var(--color-grey);
+        --color-link: var(--color-mauve);
+        --color-link-visited: var(--color-lavender);
+        --color-bg: var(--color-grey-light);
+        --color-bg-translucent: hsla(42, 7%, 72%, 0.5);
+        --color-button: var(--color-red-light);
+        --color-button-shadow: var(--color-red-desat-dark);
+        --color-button-hover: var(--color-red);
+        --color-button-deactivated: var(--color-red-desat-desat);
+        --color-button-text: var(--color-blue-dark);
 
         color: var(--color-text);
         background-color: var(--color-bg);
+        font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans,
+          Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji',
+          'Segoe UI Emoji', 'Segoe UI Symbol';
       }
 
       a {
@@ -29,11 +64,20 @@
 
       @media (prefers-color-scheme: dark) {
         body {
-					--color-text: white;
+          --color-lavender: hsl(273, 43%, 65%);
-					--color-bg: #17063B;
+          --color-mauve: hsl(286, 73%, 81%);
-					--color-border: white;
+
-					--color-link: #8A9BF0;
+          --color-text: var(--color-grey-light);
-					--color-link-visited: #C384FB;
+          --color-border: var(--color-grey-light);
+          --color-link: var(--color-lavender);
+          --color-link-visited: var(--color-mauve);
+          --color-bg: var(--color-blue-dark);
+          --color-bg-translucent: hsla(259, 82%, 26%, 0.5);
+          --color-button: var(--color-red-light);
+          --color-button-shadow: var(--color-red-desat);
+          --color-button-hover: var(--color-red);
+          --color-button-deactivated: var(--color-red-desat-desat);
+          --color-button-text: var(--color-blue-dark);
         }
       }
     </style>

src/hooks.server.ts

@@ -1,15 +1,32 @@
+import { log } from '$lib/log';
 import { TimelineReader } from '$lib/server/timeline';
 import type { HandleServerError } from '@sveltejs/kit';
+import fs from 'fs/promises';
 
 TimelineReader.init();
 
 export const handleError = (({ error }) => {
   if (error instanceof Error) {
-    console.error('Something went wrong: ', error.name, error.message);
+    log.error('Something went wrong: ', error.name, error.message);
   }
 
   return {
-    message: 'Whoops!',
+    message: `Something went wrong! ${error}`
-    code: (error as any)?.code ?? 'UNKNOWN'
   };
 }) satisfies HandleServerError;
+
+import type { Handle } from '@sveltejs/kit';
+
+export const handle = (async ({ event, resolve }) => {
+  // Reeder *insists* on checking /feed instead of /feed.xml
+  if (event.url.pathname === '/feed') {
+    return new Response('', { status: 301, headers: { Location: '/feed.xml' } });
+  }
+  if (event.url.pathname === '/feed.xml') {
+    const f = await fs.readFile('feed.xml', { encoding: 'utf8' });
+    return new Response(f, { headers: [['Content-Type', 'application/atom+xml']] });
+  }
+
+  const response = await resolve(event);
+  return response;
+}) satisfies Handle;

src/lib/assets/error-warning-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22ZM11 15V17H13V15H11ZM11 7V13H13V7H11Z" fill="#000"></path></svg>

src/lib/assets/rss-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M3 3C12.9411 3 21 11.0589 21 21H18C18 12.7157 11.2843 6 3 6V3ZM3 10C9.07513 10 14 14.9249 14 21H11C11 16.5817 7.41828 13 3 13V10ZM3 17C5.20914 17 7 18.7909 7 21H3V17Z" fill="#000"></path></svg>

src/lib/components/AccountComponent.svelte

@@ -4,4 +4,4 @@
   export let account: Account;
 </script>
 
-<a href="{account.url}" target="_blank">{account.display_name} @{account.acct}</a>
+<a href={account.url} target="_blank">{account.display_name} @{account.acct}</a>

src/lib/components/AvatarComponent.svelte

@@ -3,18 +3,18 @@
 
   export let account: Account;
   let avatarDescription: string;
-  $: avatarDescription = `Avatar for ${account.acct}`
+  $: avatarDescription = `Avatar for ${account.acct}`;
 </script>
 
-<img src="{account.avatar}" alt={avatarDescription}/>
+<img src={account.avatar} alt={avatarDescription} />
 
 <style>
   img {
-  max-width: 50px;
+    max-width: 100%;
-  max-height: 50px;
+    max-height: 100%;
     width: auto;
     height: auto;
     object-fit: contain;
-  border-radius: 3px;;
+    border-radius: 3px;
   }
 </style>

src/lib/components/FooterComponent.svelte

@@ -1,17 +1,29 @@
 <script>
   import git from '$lib/assets/git-branch-fill.svg';
+  import rss from '$lib/assets/rss-fill.svg';
 </script>
 
 <div class="footer">
   <div>
-        <span>Made with &#x1F918; by&nbsp;</span>
+    <span class="label"
-        <a href="https://metalhead.club/@aymm" rel="me">@aymm@metalhead.club</a>
+      >Made<span class="secretIngredient">&nbsp;with &#x1F918;</span>&nbsp;by&nbsp;</span
+    >
+    <a href="https://metalhead.club/@aymm" rel="me"
+      >@aymm<span class="mastodonInstance">@metalhead.club</span></a
+    >
   </div>
   |
   <div>
     <a href="https://phlaym.net/git/phlaym/moshing-mammut">
       <img alt="Git branch" src={git} class="icon" />
-            Source Code&nbsp;
+      <span class="label">Source Code</span>
+    </a>
+  </div>
+  |
+  <div>
+    <a href="/feed.xml">
+      <img alt="RSS" src={rss} class="icon" />
+      <span class="label">RSS<span class="feedSuffix">&nbsp;Feed</span></span>
     </a>
   </div>
 </div>
@@ -26,10 +38,11 @@
     gap: 10px;
     backdrop-filter: blur(10px);
     -webkit-backdrop-filter: blur(10px);
-    background-color: #54546788;
+    background-color: var(--color-grey-translucent);
     padding: 0.3em 1em;
     margin: 0 -8px;
     border-radius: 3px;
+    padding-bottom: env(safe-area-inset-bottom);
   }
   .icon {
     position: relative;
@@ -42,7 +55,30 @@
       filter: invert();
     }
     .footer {
-      background-color: #6364FF88;
+      background-color: var(--color-grey-translucent);
+    }
+  }
+  @media only screen and (max-width: 620px) {
+    .mastodonInstance,
+    .feedSuffix {
+      display: none;
+    }
+    .footer {
+      justify-content: center;
+    }
+  }
+
+  @media only screen and (max-width: 430px) {
+    .mastodonInstance,
+    .feedSuffix,
+    .secretIngredient {
+      display: none;
+    }
+  }
+
+  @media only screen and (max-width: 370px) {
+    .label {
+      display: none;
     }
   }
 </style>

src/lib/components/LoadMoreComponent.svelte

@@ -0,0 +1,81 @@
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte';
+  import LoadingSpinnerComponent from '$lib/components/LoadingSpinnerComponent.svelte';
+
+  export let moreAvailable = false;
+  export let isLoading = false;
+  let displayText = '';
+  let title = '';
+  let disabled: boolean;
+
+  $: if (isLoading) {
+    displayText = 'Loading...';
+  } else if (!moreAvailable) {
+    displayText = 'You reached the end';
+  } else {
+    displayText = 'Load More';
+  }
+  $: disabled = !moreAvailable || isLoading;
+  $: title = moreAvailable ? 'Load More' : 'There be dragons!';
+
+  const dispatch = createEventDispatcher();
+
+  function loadOlderPosts() {
+    dispatch('loadOlderPosts');
+  }
+</script>
+
+<button on:click={loadOlderPosts} {disabled} {title}>
+  <div class="loading" class:collapsed={!isLoading}>
+    <LoadingSpinnerComponent size="0.5em" thickness="6px" />
+  </div>
+  <span>{displayText}</span>
+</button>
+
+<style>
+  button {
+    padding: 0.75em;
+    border-radius: 3px;
+    border: none;
+    background-color: var(--color-button);
+    color: var(--color-button-text);
+    cursor: grab;
+    transition: all 0.3s ease-in-out;
+    font-size: large;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+  }
+
+  button:hover:not(:disabled) {
+    background-color: var(--color-button-hover);
+  }
+
+  button:hover:not(:disabled):not(:active) {
+    box-shadow: 6px 6px 5px 0 var(--color-button-shadow);
+    translate: -2px -2px;
+  }
+
+  button:disabled {
+    cursor: not-allowed;
+    background-color: var(--color-button-deactivated);
+  }
+
+  button:not(:disabled) {
+    box-shadow: 4px 4px 2px 0 var(--color-button-shadow);
+  }
+
+  .loading {
+    margin-right: 3px;
+    display: flex;
+    overflow: hidden;
+    max-width: 100%;
+    transition: all 0.3s 0.5s;
+  }
+
+  /* Cannot be removed, so that it animates its width change */
+  .collapsed {
+    max-width: 0;
+    margin-right: 0;
+  }
+</style>

src/lib/components/LoadingSpinnerComponent.svelte

@@ -0,0 +1,38 @@
+<script lang="ts">
+  export let size = '64px';
+  export let thickness = '6px';
+</script>
+
+<div class="lds-dual-ring" style="--size: {size}; --thickness: {thickness}" />
+
+<style>
+  .lds-dual-ring {
+    display: inline-block;
+    width: 100%;
+    height: 100%;
+  }
+  .lds-dual-ring:after {
+    content: ' ';
+    display: block;
+    width: var(--size);
+    height: var(--size);
+    border-radius: 50%;
+    border: var(--thickness) solid #fff;
+    border-color: #fff transparent #fff transparent;
+    animation: lds-dual-ring 1.2s linear infinite;
+  }
+  @keyframes lds-dual-ring {
+    0% {
+      transform: rotate(0deg);
+    }
+    25% {
+      transform: rotate(36deg);
+    }
+    75% {
+      transform: rotate(234deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+</style>

src/lib/components/PostComponent.svelte

@@ -2,42 +2,160 @@
   import type { Post } from '$lib/mastodon/response';
   import AvatarComponent from '$lib/components/AvatarComponent.svelte';
   import AccountComponent from '$lib/components/AccountComponent.svelte';
+  import { secondsSince, relativeTime } from '$lib/relativeTime';
+  import { onMount } from 'svelte';
 
   export let post: Post;
-  let dateCreated: string;
+  let displayRelativeTime = false;
-  $: dateCreated = new Date(post.created_at).toLocaleString();
+  const absoluteDate = new Date(post.created_at).toLocaleString();
-</script>
+  let dateCreated = absoluteDate;
+  const timePassed = secondsSince(new Date(post.created_at));
+  $: if (displayRelativeTime) {
+    dateCreated = relativeTime($timePassed) ?? absoluteDate;
+  }
 
+  onMount(() => {
+    // Display relative time only after mount:
+    // When JS is disabled the server-side rendered absolute date will be shown,
+    // otherwise the relative date would be outdated very quickly
+    displayRelativeTime = true;
+  });
+</script>
 
 <div class="wrapper">
   <div class="avatar"><AvatarComponent account={post.account} /></div>
-  <div class="post">
+  <div class="account"><AccountComponent account={post.account} /></div>
   <div class="meta">
-      <AccountComponent account={post.account} />
+    <small><a href={post.url} target="_blank" title={absoluteDate}>{dateCreated}</a></small>
-      <small><a href={post.url} target="_blank">{dateCreated}</a></small>
   </div>
   <div class="content">{@html post.content}</div>
+  <div class="song">
+    {#if post.songs}
+      {#each post.songs as song (song.pageUrl)}
+        <div class="info-wrapper">
+          <div class="bgimage" style="background-image: url({song.thumbnailUrl});" />
+          <a href={song.pageUrl ?? song.postedUrl} target="_blank">
+            <div class="info">
+              <img
+                src={song.thumbnailUrl}
+                class="cover"
+                alt="Cover for {song.artistName} - {song.title}"
+              />
+              <span class="text">{song.artistName} - {song.title}</span>
+            </div>
+          </a>
+        </div>
+      {/each}
+    {/if}
   </div>
 </div>
 
 <style>
   .wrapper {
-    display: flex;
+    display: grid;
-  }
+    grid-template-columns: 50px 1fr auto auto;
-  .post {
+    grid-template-rows: auto 1fr auto;
-    display: flex;
+    grid-template-areas:
-    flex-direction: column;
+      'avatar account account meta'
-    flex-grow: 2;
+      'avatar content content song'
-  }
+      '. content content song';
-  .meta {
+    grid-column-gap: 6px;
-    display: flex;
+    column-gap: 6px;
-    justify-content: space-between;
+    grid-row-gap: 6px;
+    row-gap: 6px;
   }
   .avatar {
-    margin-right: 1em;
+    grid-area: avatar;
+    max-width: 50px;
+    max-height: 50px;
+  }
+  .account {
+    grid-area: account;
+  }
+  .meta {
+    grid-area: meta;
+    justify-self: end;
   }
   .content {
-    max-width: calc(600px - 1em - 50px);
+    grid-area: content;
-    overflow-x: auto;
+    word-break: break-word;
+    translate: 0 -0.5em;
+  }
+  .song {
+    grid-area: song;
+    align-self: center;
+    justify-self: center;
+    max-width: 200px;
+  }
+  .cover {
+    max-width: 200px;
+    display: block;
+    border-radius: 3px;
+    margin-bottom: 3px;
+  }
+  .bgimage {
+    display: none;
+    background-color: var(--color-bg);
+  }
+  .info {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 0.5em;
+    z-index: 1;
+  }
+  .info * {
+    z-index: inherit;
+  }
+  @media only screen and (max-width: 650px) {
+    .wrapper {
+      grid-template-areas:
+        'avatar account account meta'
+        'content content content content'
+        'song song song song';
+      grid-row-gap: 3px;
+      row-gap: 3px;
+    }
+    .song {
+      width: 100%;
+    }
+    .song,
+    .cover {
+      max-width: 100%;
+    }
+    .cover {
+      height: 60px;
+    }
+    .cover:not(.background) {
+      z-index: 1;
+      backdrop-filter: blur(10px);
+      -webkit-backdrop-filter: blur(10px);
+    }
+    .bgimage {
+      display: block;
+      width: 100%;
+      height: 60px;
+      z-index: 0;
+      filter: blur(10px);
+      background-repeat: no-repeat;
+      background-size: cover;
+      background-position: center;
+    }
+    .info {
+      position: relative;
+      top: -60px;
+      flex-direction: row;
+    }
+    .info-wrapper {
+      margin-bottom: -50px;
+    }
+    .text {
+      padding: 3px;
+      backdrop-filter: blur(10px);
+      -webkit-backdrop-filter: blur(10px);
+      border-radius: 3px;
+      background-color: var(--color-bg-translucent);
+      color: var(--color-text);
+    }
   }
 </style>

src/lib/errorToast.ts

@@ -0,0 +1,8 @@
+import errorIcon from '$lib/assets/error-warning-fill.svg';
+import { toast } from '@zerodevx/svelte-toast';
+
+export function errorToast(message: string): number {
+  return toast.push(`<img src="${errorIcon}" />${message}`, {
+    classes: ['error']
+  });
+}

src/lib/log.ts

@@ -0,0 +1,32 @@
+import { env } from '$env/dynamic/private';
+import { isTruthy } from '$lib/truthyString';
+const { DEV } = import.meta.env;
+
+export const enableVerboseLog = isTruthy(env.VERBOSE);
+
+export const log = {
+  verbose: (...params: any[]) => {
+    if (!enableVerboseLog) {
+      return;
+    }
+    console.debug(new Date().toISOString(), ...params);
+  },
+  debug: (...params: any[]) => {
+    if (!DEV) {
+      return;
+    }
+    console.debug(new Date().toISOString(), ...params);
+  },
+  log: (...params: any[]) => {
+    console.log(new Date().toISOString(), ...params);
+  },
+  info: (...params: any[]) => {
+    console.info(new Date().toISOString(), ...params);
+  },
+  warn: (...params: any[]) => {
+    console.warn(new Date().toISOString(), ...params);
+  },
+  error: (...params: any[]) => {
+    console.error(new Date().toISOString(), ...params);
+  }
+};

src/lib/mastodon/response.ts

@@ -1,29 +1,40 @@
+import type { SongInfo } from '$lib/odesliResponse';
+
 export interface TimelineEvent {
-  event: string,
+  event: string;
-  payload: string
+  payload: string;
 }
 
 export interface Post {
-  id: string,
+  id: string;
-  created_at: string,
+  created_at: string;
-  tags: Tag[],
+  tags: Tag[];
-  url: string,
+  url: string;
-  content: string,
+  content: string;
-  account: Account
+  account: Account;
+  card?: PreviewCard;
+  songs?: SongInfo[];
+}
 
+export interface PreviewCard {
+  url: string;
+  title: string;
+  image?: string;
+  blurhash?: string;
+  width: number;
+  height: number;
 }
 
 export interface Tag {
-  name: string,
+  name: string;
-  url: string
+  url: string;
 }
 
 export interface Account {
-  id: string,
+  id: string;
-  acct: string,
+  acct: string;
-  username: string,
+  username: string;
-  display_name: string,
+  display_name: string;
-  url: string,
+  url: string;
-  avatar: string,
+  avatar: string;
-  avatar_static: string
 }

src/lib/odesliResponse.ts

@@ -0,0 +1,144 @@
+export type SongInfo = {
+  pageUrl: string;
+  youtubeUrl?: string;
+  type: 'song' | 'album';
+  title?: string;
+  artistName?: string;
+  thumbnailUrl?: string;
+  postedUrl: string;
+};
+
+export type SongwhipReponse = {
+  type: 'track' | 'album';
+  name: string;
+  image?: string;
+  url: string;
+};
+
+export type OdesliResponse = {
+  /**
+   * The unique ID for the input entity that was supplied in the request. The
+   * data for this entity, such as title, artistName, etc. will be found in
+   * an object at `nodesByUniqueId[entityUniqueId]`
+   */
+  entityUniqueId: string;
+
+  /**
+   * The userCountry query param that was supplied in the request. It signals
+   * the country/availability we use to query the streaming platforms. Defaults
+   * to 'US' if no userCountry supplied in the request.
+   *
+   * NOTE: As a fallback, our service may respond with matches that were found
+   * in a locale other than the userCountry supplied
+   */
+  userCountry: string;
+
+  /**
+   * A URL that will render the Songlink page for this entity
+   */
+  pageUrl: string;
+
+  /**
+   * A collection of objects. Each key is a platform, and each value is an
+   * object that contains data for linking to the match
+   */
+  linksByPlatform: {
+    /**
+     * Each key in `linksByPlatform` is a Platform. A Platform will exist here
+     * only if there is a match found. E.g. if there is no YouTube match found,
+     * then neither `youtube` or `youtubeMusic` properties will exist here
+     */
+    [k in Platform]: {
+      /**
+       * The unique ID for this entity. Use it to look up data about this entity
+       * at `entitiesByUniqueId[entityUniqueId]`
+       */
+      entityUniqueId: string;
+
+      /**
+       * The URL for this match
+       */
+      url: string;
+
+      /**
+       * The native app URI that can be used on mobile devices to open this
+       * entity directly in the native app
+       */
+      nativeAppUriMobile?: string;
+
+      /**
+       * The native app URI that can be used on desktop devices to open this
+       * entity directly in the native app
+       */
+      nativeAppUriDesktop?: string;
+    };
+  };
+
+  // A collection of objects. Each key is a unique identifier for a streaming
+  // entity, and each value is an object that contains data for that entity,
+  // such as `title`, `artistName`, `thumbnailUrl`, etc.
+  entitiesByUniqueId: {
+    [entityUniqueId: string]: {
+      // This is the unique identifier on the streaming platform/API provider
+      id: string;
+
+      type: 'song' | 'album';
+
+      title?: string;
+      artistName?: string;
+      thumbnailUrl?: string;
+      thumbnailWidth?: number;
+      thumbnailHeight?: number;
+
+      // The API provider that powered this match. Useful if you'd like to use
+      // this entity's data to query the API directly
+      apiProvider: APIProvider;
+
+      // An array of platforms that are "powered" by this entity. E.g. an entity
+      // from Apple Music will generally have a `platforms` array of
+      // `["appleMusic", "itunes"]` since both those platforms/links are derived
+      // from this single entity
+      platforms: Platform[];
+    };
+  };
+};
+
+export type Platform =
+  | 'spotify'
+  | 'itunes'
+  | 'appleMusic'
+  | 'youtube'
+  | 'youtubeMusic'
+  | 'google'
+  | 'googleStore'
+  | 'pandora'
+  | 'deezer'
+  | 'tidal'
+  | 'amazonStore'
+  | 'amazonMusic'
+  | 'soundcloud'
+  | 'napster'
+  | 'yandex'
+  | 'spinrilla'
+  | 'audius'
+  | 'audiomack'
+  | 'anghami'
+  | 'boomplay';
+
+export type APIProvider =
+  | 'spotify'
+  | 'itunes'
+  | 'youtube'
+  | 'google'
+  | 'pandora'
+  | 'deezer'
+  | 'tidal'
+  | 'amazon'
+  | 'soundcloud'
+  | 'napster'
+  | 'yandex'
+  | 'spinrilla'
+  | 'audius'
+  | 'audiomack'
+  | 'anghami'
+  | 'boomplay';

src/lib/relativeTime.ts

@@ -0,0 +1,37 @@
+import { derived, readable, type Readable } from 'svelte/store';
+
+export const time = readable(new Date(), function start(set) {
+  const interval = setInterval(() => {
+    set(new Date());
+  }, 10000); //Every 10sec is enough, we don't need that much granularity
+
+  return function stop() {
+    clearInterval(interval);
+  };
+});
+
+export function secondsSince(date: Date): Readable<number> {
+  return derived(time, ($time) => Math.round(($time.getTime() - date.getTime()) / 1000));
+}
+
+export function relativeTime(seconds: number): string | null {
+  const min = 60;
+  if (seconds < min) {
+    return 'just now';
+  }
+
+  const hour = 60 * min;
+  if (seconds < hour) {
+    return `${Math.floor(seconds / min)}min`;
+  }
+
+  const day = hour * 24;
+  if (seconds < day) {
+    return `${Math.floor(seconds / hour)}h`;
+  }
+  const maxRelative = day * 31;
+  if (seconds < maxRelative) {
+    return `${Math.floor(seconds / day)}d`;
+  }
+  return null;
+}

src/lib/server/db.ts

@@ -1,66 +1,176 @@
-import { env } from '$env/dynamic/private';
+import { IGNORE_USERS, MASTODON_INSTANCE } from '$env/static/private';
+import { enableVerboseLog, log } from '$lib/log';
 import type { Account, Post, Tag } from '$lib/mastodon/response';
+import type { SongInfo } from '$lib/odesliResponse';
+import { TimelineReader } from '$lib/server/timeline';
 import sqlite3 from 'sqlite3';
+
 const { DEV } = import.meta.env;
 
-const db: sqlite3.Database = new sqlite3.Database('moshingmammut.db');
+type FilterParameter = {
+  $limit: number | undefined | null;
+  $since?: string | undefined | null;
+  $before?: string | undefined | null;
+  [x: string]: string | number | undefined | null;
+};
 
-if (DEV && env.VERBOSE === 'true') {
+type PostRow = {
+  id: string;
+  content: string;
+  created_at: string;
+  url: string;
+  account_id: string;
+  acct: string;
+  username: string;
+  display_name: string;
+  account_url: string;
+  avatar: string;
+};
+
+type PostTagRow = {
+  post_id: string;
+  tag: string;
+  url: string;
+};
+
+type SongRow = {
+  post_url: string;
+  postedUrl: string;
+  overviewUrl?: string;
+  type: 'album' | 'song';
+  youtubeUrl?: string;
+  title?: string;
+  artistName?: string;
+  thumbnailUrl?: string;
+};
+
+type Migration = {
+  id: number;
+  name: string;
+  statement: string;
+};
+
+const db: sqlite3.Database = new sqlite3.Database('moshingmammut.db');
+// for the local masto instance, the instance name is *not* saved
+// as part of the username or acct, so it needs to be stripped
+const ignoredUsers: string[] =
+  IGNORE_USERS === undefined
+    ? []
+    : IGNORE_USERS.split(',')
+        .map((u) => (u.startsWith('@') ? u.substring(1) : u))
+        .map((u) =>
+          u.endsWith('@' + MASTODON_INSTANCE)
+            ? u.substring(0, u.length - ('@' + MASTODON_INSTANCE).length)
+            : u
+        );
+let databaseReady = false;
+
+if (enableVerboseLog) {
   sqlite3.verbose();
   db.on('change', (t, d, table, rowid) => {
-    console.debug('DB change event', t, d, table, rowid);
+    log.verbose('DB change event', t, d, table, rowid);
-  })
+  });
 
   db.on('trace', (sql) => {
-    console.debug('Running', sql);
+    log.verbose('Running', sql);
   });
 
   db.on('profile', (sql) => {
-    console.debug('Finished', sql);
+    log.verbose('Finished', sql);
   });
 }
 
-interface Migration {
+async function applyDbMigration(migration: Migration): Promise<void> {
-  id: number,
+  return new Promise(async (resolve, reject) => {
-  name: string,
+    db.exec(migration.statement, (err) => {
-  statement: string
+      if (err !== null) {
+        log.error(`Failed to apply migration ${migration.name}`, err);
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+}
+
+async function applyMigration(migration: Migration) {
+  if (migration.id === 4) {
+    // When this is run, no posts will have added song data,
+    // so filtering won't help
+    const posts = await getPostsInternal(null, null, 10000);
+    let current = 0;
+    let total = posts.length.toString().padStart(4, '0');
+    for (const post of posts) {
+      current++;
+      if (post.songs && post.songs.length) {
+        continue;
+      }
+      log.info(
+        `Fetching songs for existing post ${current.toString().padStart(4, '0')} of ${total}`,
+        post.url
+      );
+      const songs = await TimelineReader.getSongInfoInPost(post);
+      await saveSongInfoData(post.url, songs);
+      log.debug(`Fetched ${songs.length} songs for existing post`, post.url);
+    }
+    log.debug(`Finished fetching songs`);
+  } else {
+    await applyDbMigration(migration);
+  }
 }
 
 db.on('open', () => {
-  console.log('Opened database');
+  log.info('Opened database');
   db.serialize();
   db.run('CREATE TABLE IF NOT EXISTS "migrations" ("id" integer,"name" TEXT, PRIMARY KEY (id))');
-  db.all('SELECT id FROM migrations', (err, rows) => {
+  db.all('SELECT id FROM migrations', (err, rows: Migration[]) => {
     if (err !== null) {
-      console.error('Could not fetch existing migrations', err);
+      log.error('Could not fetch existing migrations', err);
+      databaseReady = true;
       return;
     }
-    console.debug('Already applied migrations', rows);
+    log.debug('Already applied migrations', rows);
-    const appliedMigrations: Set<number> = new Set(rows.map((row: any) => row['id']));
+    const appliedMigrations: Set<number> = new Set(rows.map((row) => row['id']));
-    const toApply = getMigrations().filter(m => !appliedMigrations.has(m.id));
+    const toApply = getMigrations().filter((m) => !appliedMigrations.has(m.id));
-    for (let migration of toApply) {
+    let remaining = toApply.length;
-      db.exec(migration.statement, (err) => {
+    if (remaining === 0) {
-        if (err !== null) {
+      databaseReady = true;
-          console.error(`Failed to apply migration ${migration.name}`, err);
       return;
     }
-        db.run('INSERT INTO migrations (id, name) VALUES(?, ?)', [migration.id, migration.name], (e: Error) => {
+    for (const migration of toApply) {
+      applyMigration(migration).then(() => {
+        remaining--;
+        // This will set databaseReady to true before the migration has been inserted as applies,
+        // but that doesn't matter. It's only important that is has been applied
+        if (remaining === 0) {
+          databaseReady = true;
+        }
+        if (err !== null) {
+          log.error(`Failed to apply migration ${migration.name}`, err);
+          return;
+        }
+        db.run(
+          'INSERT INTO migrations (id, name) VALUES(?, ?)',
+          [migration.id, migration.name],
+          (e: Error) => {
             if (e !== null) {
-            console.error(`Failed to mark migration ${migration.name} as applied`, e);
+              log.error(`Failed to mark migration ${migration.name} as applied`, e);
               return;
             }
-          console.info(`Applied migration ${migration.name}`);
+            log.info(`Applied migration ${migration.name}`);
-        });
+          }
+        );
       });
     }
   });
 });
 db.on('error', (err) => {
-  console.error('Error opening database', err);
+  log.error('Error opening database', err);
 });
 
 function getMigrations(): Migration[] {
-  return [{
+  return [
+    {
       id: 1,
       name: 'initial',
       statement: `
@@ -89,79 +199,192 @@ function getMigrations(): Migration[] {
         FOREIGN KEY (post_id) REFERENCES posts(id),
         FOREIGN KEY (tag_url) REFERENCES tags(url)
       )`
-  }];
+    },
+    {
+      id: 2,
+      name: 'urls as keys',
+      statement: `
+      CREATE TABLE accounts_new (
+        id TEXT NOT NULL,
+        acct TEXT,
+        username TEXT,
+        display_name TEXT,
+        url TEXT NOT NULL PRIMARY KEY,
+        avatar TEXT
+      );
+      INSERT INTO accounts_new (id, acct, username, display_name, url, avatar)
+         SELECT id, acct, username, display_name, url, avatar
+         FROM accounts;
+      DROP TABLE accounts;
+      ALTER TABLE accounts_new RENAME TO accounts;
+
+      CREATE TABLE posts_new (
+        id TEXT NOT NULL,
+        content TEXT,
+        created_at TEXT,
+        url TEXT NOT NULL PRIMARY KEY,
+        account_id TEXT NOT NULL,
+        FOREIGN KEY (account_id) REFERENCES accounts(url)
+      );
+      INSERT INTO posts_new (id, content, created_at, url, account_id)
+         SELECT p.id, p.content, p.created_at, p.url, accounts.url
+         FROM posts as p
+         JOIN accounts ON accounts.id = p.account_id;
+      DROP TABLE posts;
+      ALTER TABLE posts_new RENAME TO posts;
+
+      CREATE TABLE poststags_new (
+        id integer PRIMARY KEY,
+        post_id TEXT NOT NULL,
+        tag_url TEXT NOT NULL,
+        FOREIGN KEY (post_id) REFERENCES posts(url),
+        FOREIGN KEY (tag_url) REFERENCES tags(url)
+      );
+
+      INSERT INTO poststags_new (id, post_id, tag_url)
+         SELECT pt.id, posts.url, pt.tag_url
+         FROM poststags as pt
+         JOIN posts ON posts.id = pt.post_id;
+      DROP TABLE poststags;
+      ALTER TABLE poststags_new RENAME TO poststags;
+      `
+    },
+    {
+      id: 3,
+      name: 'song info for posts',
+      statement: `
+      CREATE TABLE songs (
+        id integer PRIMARY KEY,
+        postedUrl TEXT NOT NULL,
+        overviewUrl TEXT,
+        type TEXT CHECK ( type in ('album', 'song') ),
+        youtubeUrl TEXT,
+        title TEXT,
+        artistName TEXT,
+        thumbnailUrl TEXT,
+        post_url TEXT,
+        FOREIGN KEY (post_url) REFERENCES posts(url)
+      );`
+    },
+    {
+      id: 4,
+      name: 'song info for existing posts',
+      statement: ``
+    }
+  ];
 }
 
-export function savePost(post: Post): void {
+async function waitReady(): Promise<void> {
-  console.debug(`Saving post ${post.url}`);
+  // Simpler than a semaphore and is really only needed on startup
-  const account = post.account;
+  return new Promise((resolve) => {
-  db.run(`
+    const interval = setInterval(() => {
-    INSERT INTO accounts (id, acct, username, display_name, url, avatar, avatar_static)
+      if (DEV) {
-    VALUES(?, ?, ?, ?, ?, ?, ?)
+        log.debug('Waiting for database to be ready');
-    ON CONFLICT(id)
+      }
+      if (databaseReady) {
+        if (DEV) {
+          log.debug('DB is ready');
+        }
+        clearInterval(interval);
+        resolve();
+      }
+    }, 100);
+  });
+}
+
+function saveAccountData(account: Account): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    db.run(
+      `
+      INSERT INTO accounts (id, acct, username, display_name, url, avatar)
+      VALUES(?, ?, ?, ?, ?, ?)
+      ON CONFLICT(url)
       DO UPDATE SET
       acct=excluded.acct,
       username=excluded.username,
       display_name=excluded.display_name,
-    url=excluded.url,
+      id=excluded.id,
-    avatar=excluded.avatar,
+      avatar=excluded.avatar;`,
-    avatar_static=excluded.avatar_static;`,
       [
         account.id,
         account.acct,
         account.username,
         account.display_name,
         account.url,
-      account.avatar,
+        account.avatar
-      account.avatar_static
       ],
       (err) => {
         if (err !== null) {
-        console.error(`Could not insert/update account ${account.id}`, err);
+          log.error(`Could not insert/update account ${account.id}`, err);
+          reject(err);
           return;
         }
-      db.run(`
+        resolve();
+      }
+    );
+  });
+}
+
+function savePostData(post: Post): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    db.run(
+      `
     INSERT INTO posts (id, content, created_at, url, account_id)
-        VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET
+    VALUES (?, ?, ?, ?, ?) ON CONFLICT(url) DO UPDATE SET
     content=excluded.content,
     created_at=excluded.created_at,
-        url=excluded.url,
+    id=excluded.id,
     account_id=excluded.account_id;`,
-        [
+      [post.id, post.content, post.created_at, post.url, post.account.url],
-          post.id,
-          post.content,
-          post.created_at,
-          post.url,
-          post.account.id
-        ],
       (postErr) => {
         if (postErr !== null) {
-            console.error(`Could not insert post ${post.url}`, postErr);
+          log.error(`Could not insert post ${post.url}`, postErr);
+          reject(postErr);
+          return;
+        }
+        resolve();
+      }
+    );
+  });
+}
+
+function savePostTagData(post: Post): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    if (!post.tags.length) {
+      resolve();
       return;
     }
 
     db.parallelize(() => {
-            for (let tag of post.tags) {
+      let remaining = post.tags.length;
-              db.run(`
+      for (const tag of post.tags) {
+        db.run(
+          `
           INSERT INTO tags (url, tag) VALUES (?, ?)
           ON CONFLICT(url) DO UPDATE SET
           tag=excluded.tag;`,
-                [
+          [tag.url, tag.name],
-                  tag.url,
-                  tag.name
-                ],
           (tagErr) => {
             if (tagErr !== null) {
-                    console.error(`Could not insert/update tag ${tag.url}`, tagErr);
+              log.error(`Could not insert/update tag ${tag.url}`, tagErr);
+              reject(tagErr);
               return;
             }
-                  db.run('INSERT INTO poststags (post_id, tag_url) VALUES (?, ?)',
+            db.run(
-                    [post.id, tag.url],
+              'INSERT INTO poststags (post_id, tag_url) VALUES (?, ?)',
+              [post.url, tag.url],
               (posttagserr) => {
                 if (posttagserr !== null) {
-                        console.error(`Could not insert poststags ${tag.url}, ${post.url}`, posttagserr);
+                  log.error(`Could not insert poststags ${tag.url}, ${post.url}`, posttagserr);
+                  reject(posttagserr);
                   return;
                 }
+                // Don't decrease on fail
+                remaining--;
+                // Only resolve after all have been inserted
+                if (remaining === 0) {
+                  resolve();
+                }
               }
             );
           }
@@ -169,87 +392,220 @@ export function savePost(post: Post): void {
       }
     });
   });
-    });
 }
 
-export async function getPosts(since: string | null, limit: number) {
+function saveSongInfoData(postUrl: string, songs: SongInfo[]): Promise<void> {
-  let promise = await new Promise<Post[]>((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
-    let filter_query;
+    if (songs.length === 0) {
-    let params: any = { $limit: limit };
+      resolve();
-    if (since === null) {
+      return;
-      filter_query = '';
-    } else {
-      filter_query = 'WHERE posts.created_at > $since';
-      params.$since = since;
     }
+    db.parallelize(() => {
+      let remaining = songs.length;
+      for (const song of songs) {
+        db.run(
+          `
+          INSERT INTO songs (postedUrl, overviewUrl, type, youtubeUrl, title, artistName, thumbnailUrl, post_url)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+          `,
+          [
+            song.postedUrl,
+            song.pageUrl,
+            song.type,
+            song.youtubeUrl,
+            song.title,
+            song.artistName,
+            song.thumbnailUrl,
+            postUrl
+          ],
+          (songErr) => {
+            if (songErr !== null) {
+              log.error(`Could not insert song ${song.postedUrl}`, songErr);
+              reject(songErr);
+              return;
+            }
+            // Don't decrease on fail
+            remaining--;
+            // Only resolve after all have been inserted
+            if (remaining === 0) {
+              resolve();
+            }
+          }
+        );
+      }
+    });
+  });
+}
+
+export async function savePost(post: Post, songs: SongInfo[]) {
+  if (!databaseReady) {
+    await waitReady();
+  }
+
+  log.debug(`Saving post ${post.url}`);
+  const account = post.account;
+  await saveAccountData(account);
+  log.debug(`Saved account data ${post.url}`);
+  await savePostData(post);
+  log.debug(`Saved post data ${post.url}`);
+  await savePostTagData(post);
+  log.debug(`Saved ${post.tags.length} tag data ${post.url}`);
+  await saveSongInfoData(post.url, songs);
+  log.debug(`Saved ${songs.length} song info data ${post.url}`);
+}
+
+function getPostData(filterQuery: string, params: FilterParameter): Promise<PostRow[]> {
   const sql = `SELECT posts.id, posts.content, posts.created_at, posts.url,
   accounts.id AS account_id, accounts.acct, accounts.username, accounts.display_name,
   accounts.url AS account_url, accounts.avatar
   FROM posts
-    JOIN accounts ON posts.account_id = accounts.id
+  JOIN accounts ON posts.account_id = accounts.url
-    ${filter_query}
+  ${filterQuery}
   ORDER BY created_at DESC
   LIMIT $limit`;
-    db.all(
+
-      sql,
+  return new Promise((resolve, reject) => {
-      params,
+    db.all(sql, params, (err, rows: PostRow[]) => {
-      (err, rows: any[]) => {
       if (err != null) {
-          console.error('Error loading posts', err);
+        log.error('Error loading posts', err);
         reject(err);
         return;
       }
-        if (rows.length === 0) {
+      resolve(rows);
-          // No need to check for tags
+    });
-          resolve([]);
+  });
-          return;
 }
-        const postIdsParams = rows.map(() => '?').join(', ');
+
+function getTagData(postIdsParams: String, postIds: string[]): Promise<Map<string, Tag[]>> {
+  return new Promise((resolve, reject) => {
     db.all(
       `SELECT post_id, tags.url, tags.tag
       FROM poststags
       JOIN tags ON poststags.tag_url = tags.url
       WHERE post_id IN (${postIdsParams});`,
-          rows.map((r: any) => r.id),
+      postIds,
-          (tagErr, tagRows: any[]) => {
+      (tagErr, tagRows: PostTagRow[]) => {
         if (tagErr != null) {
-              console.error('Error loading post tags', tagErr);
+          log.error('Error loading post tags', tagErr);
           reject(tagErr);
           return;
         }
-            const tagMap: Map<string, Tag[]> = tagRows.reduce(
+        const tagMap: Map<string, Tag[]> = tagRows.reduce((result: Map<string, Tag[]>, item) => {
-              (result: Map<string, Tag[]>, item) => {
           const tag: Tag = {
             url: item.url,
             name: item.tag
           };
-                result.set(item.post_id, [...result.get(item.post_id) || [], tag]);
+          result.set(item.post_id, [...(result.get(item.post_id) || []), tag]);
           return result;
         }, new Map());
-            const posts = rows.map(row => {
+        resolve(tagMap);
+      }
+    );
+  });
+}
+
+function getSongData(postIdsParams: String, postIds: string[]): Promise<Map<string, SongInfo[]>> {
+  return new Promise((resolve, reject) => {
+    db.all(
+      `SELECT post_url, songs.postedUrl, songs.overviewUrl, songs.type, songs.youtubeUrl,
+      songs.title, songs.artistName, songs.thumbnailUrl, songs.post_url
+      FROM songs
+      WHERE post_url IN (${postIdsParams});`,
+      postIds,
+      (tagErr, tagRows: SongRow[]) => {
+        if (tagErr != null) {
+          log.error('Error loading post tags', tagErr);
+          reject(tagErr);
+          return;
+        }
+        const songMap: Map<string, SongInfo[]> = tagRows.reduce(
+          (result: Map<string, SongInfo[]>, item) => {
+            const info = {
+              pageUrl: item.overviewUrl,
+              youtubeUrl: item.youtubeUrl,
+              type: item.type,
+              title: item.title,
+              artistName: item.artistName,
+              thumbnailUrl: item.thumbnailUrl,
+              postedUrl: item.postedUrl
+            } as SongInfo;
+            result.set(item.post_url, [...(result.get(item.post_url) || []), info]);
+            return result;
+          },
+          new Map()
+        );
+        resolve(songMap);
+      }
+    );
+  });
+}
+
+export async function getPosts(
+  since: string | null,
+  before: string | null,
+  limit: number
+): Promise<Post[]> {
+  if (!databaseReady) {
+    await waitReady();
+  }
+  return await getPostsInternal(since, before, limit);
+}
+
+async function getPostsInternal(
+  since: string | null,
+  before: string | null,
+  limit: number
+): Promise<Post[]> {
+  let filterQuery = '';
+  const params: FilterParameter = { $limit: limit };
+  if (since === null && before === null) {
+    filterQuery = '';
+  } else if (since !== null) {
+    filterQuery = 'WHERE posts.created_at > $since';
+    params.$since = since;
+  } else if (before !== null) {
+    // Setting both, before and since doesn't make sense, so this case is not explicitly handled
+    filterQuery = 'WHERE posts.created_at < $before';
+    params.$before = before;
+  }
+
+  ignoredUsers.forEach((ignoredUser, index) => {
+    const userParam = `$user_${index}`;
+    const acctParam = userParam + 'a';
+    const usernameParam = userParam + 'u';
+    const prefix = filterQuery === '' ? ' WHERE' : ' AND';
+    filterQuery += `${prefix} acct != ${acctParam} AND username != ${usernameParam} `;
+    params[acctParam] = ignoredUser;
+    params[usernameParam] = ignoredUser;
+  });
+
+  const rows = await getPostData(filterQuery, params);
+  if (rows.length === 0) {
+    // No need to check for tags and songs
+    return [];
+  }
+
+  const postIdsParams = rows.map(() => '?').join(', ');
+  const postIds = rows.map((r: PostRow) => r.url);
+  const tagMap = await getTagData(postIdsParams, postIds);
+  const songMap = await getSongData(postIdsParams, postIds);
+  const posts = rows.map((row) => {
     return {
       id: row.id,
       content: row.content,
       created_at: row.created_at,
       url: row.url,
-                tags: tagMap.get(row.id) || [],
+      tags: tagMap.get(row.url) || [],
       account: {
         id: row.account_id,
         acct: row.acct,
         username: row.username,
         display_name: row.display_name,
         url: row.account_url,
-                  avatar: row.avatar,
+        avatar: row.avatar
-                  avatar_static: ''
+      } as Account,
-                } as Account
+      songs: songMap.get(row.url) || []
-              } as Post
+    } as Post;
   });
-            resolve(posts);
+  return posts;
 }
-        );
-      }
-    );
-  });
-  return promise;
-}
-

src/lib/server/rss.ts

@@ -0,0 +1,65 @@
+import { BASE_URL, WEBSUB_HUB } from '$env/static/private';
+import { PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME } from '$env/static/public';
+import type { Post } from '$lib//mastodon/response';
+import { log } from '$lib/log';
+import { Feed } from 'feed';
+import fs from 'fs/promises';
+
+export function createFeed(posts: Post[]): Feed {
+  const baseUrl = BASE_URL.endsWith('/') ? BASE_URL : BASE_URL + '/';
+  const hub = WEBSUB_HUB ? WEBSUB_HUB : undefined;
+  const feed = new Feed({
+    title: `${PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music feed`,
+    description: `Posts about music on ${PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME}`,
+    id: baseUrl,
+    link: baseUrl,
+    language: 'en',
+    //image: "http://example.com/image.png",
+    //favicon: "http://example.com/favicon.ico",
+    copyright: '',
+    generator: 'moshing-mamut',
+    feedLinks: {
+      atom: `${BASE_URL}/feed.xml`
+    },
+    hub: hub,
+    author: {
+      name: '@aymm',
+      link: 'https://metalhead.club/@aymm'
+    }
+  });
+  posts.forEach((p) => {
+    feed.addItem({
+      title: p.content,
+      id: p.url,
+      link: p.url,
+      content: p.content,
+      author: [
+        {
+          name: p.account.acct,
+          link: p.account.url
+        }
+      ],
+      date: new Date(p.created_at)
+    });
+  });
+  feed.addCategory('Music');
+
+  return feed;
+}
+export async function saveAtomFeed(feed: Feed) {
+  await fs.writeFile('feed.xml', feed.atom1(), { encoding: 'utf8' });
+  if (!WEBSUB_HUB) {
+    return;
+  }
+  try {
+    const params = new URLSearchParams();
+    params.append('hub.mode', 'publish');
+    params.append('hub.url', `${BASE_URL}/feed.xml`);
+    await fetch(WEBSUB_HUB, {
+      method: 'POST',
+      body: params
+    });
+  } catch (e) {
+    log.error('Failed to update WebSub hub', e);
+  }
+}

src/lib/server/timeline.ts

@@ -1,65 +1,101 @@
-import { HASHTAG_FILTER, URL_FILTER, YOUTUBE_API_KEY } from '$env/static/private';
+import { HASHTAG_FILTER, MASTODON_INSTANCE, ODESLI_API_KEY } from '$env/static/private';
+import { log } from '$lib/log';
 import type { Post, Tag, TimelineEvent } from '$lib/mastodon/response';
-import { savePost } from '$lib/server/db';
+import type { OdesliResponse, Platform, SongInfo } from '$lib/odesliResponse';
-import { WebSocket } from "ws";
+import { getPosts, savePost } from '$lib/server/db';
+import { createFeed, saveAtomFeed } from '$lib/server/rss';
+import { sleep } from '$lib/sleep';
+import { WebSocket } from 'ws';
 
-const YOUTUBE_REGEX = new RegExp(/https?:\/\/(www\.)?youtu((be.com\/.*v=)|(\.be\/))(?<videoId>[a-zA-Z_0-9-]+)/gm);
+const URL_REGEX = new RegExp(/href="(?<postUrl>[^>]+?)" target="_blank"/gm);
 
 export class TimelineReader {
   private static _instance: TimelineReader;
 
-  private static async isMusicVideo(videoId: string) {
+  public static async getSongInfoInPost(post: Post): Promise<SongInfo[]> {
-    const searchParams = new URLSearchParams([
+    const urlMatches = post.content.matchAll(URL_REGEX);
-      ['part', 'snippet'],
+    const songs: SongInfo[] = [];
-      ['id', videoId],
+    for (const match of urlMatches) {
-      ['key', YOUTUBE_API_KEY]]);
-    const youtubeVideoUrl = new URL(`https://www.googleapis.com/youtube/v3/videos?${searchParams}`);
-    const resp = await fetch(youtubeVideoUrl);
-    const respObj = await resp.json();
-    if (!respObj.items.length) {
-      console.warn('Could not find video with id', videoId);
-      return false;
-    }
-
-    const item = respObj.items[0];
-    if (item.tags?.includes('music')) {
-      return true;
-    }
-
-    const categorySearchParams = new URLSearchParams([
-      ['part', 'snippet'],
-      ['id', item.categoryId],
-      ['key', YOUTUBE_API_KEY]]);
-    const youtubeCategoryUrl = new URL(`https://www.googleapis.com/youtube/v3/videoCategories?${categorySearchParams}`);
-    const categoryTitle: string = await fetch(youtubeCategoryUrl).then(r => r.json()).then(r => r.items[0]?.title);
-    return categoryTitle === 'Music';
-  }
-
-  private static async checkYoutubeMatches(postContent: string): Promise<boolean> {
-    const matches = postContent.matchAll(YOUTUBE_REGEX);
-    for (let match of matches) {
       if (match === undefined || match.groups === undefined) {
+        log.warn('Match listed in allMatches, but either it or its groups are undefined', match);
         continue;
       }
-      const videoId = match.groups.videoId.toString();
+      const urlMatch = match.groups.postUrl.toString();
+      let url: URL;
       try {
-        const isMusic = await TimelineReader.isMusicVideo(videoId);
+        url = new URL(urlMatch);
-        if (isMusic) {
-          return true;
-        }
       } catch (e) {
-        console.error('Could not check if', videoId, 'is a music video', e);
+        log.error('URL found via Regex does not seem to be a valud url', urlMatch, e);
-      }
+        continue;
-    }
-    return false;
       }
 
-  private constructor() {
+      // Check *all* found url and let odesli determine if it is music or not
-    const socket = new WebSocket("wss://metalhead.club/api/v1/streaming")
+      log.debug(`Checking ${url} if it contains song data`);
-    socket.onopen = (_event) => {
+      const info = await TimelineReader.getSongInfo(url);
+      log.debug(`Found song info for ${url}?`, info);
+      if (info) {
+        songs.push(info);
+      }
+    }
+    return songs;
+  }
+
+  private static async getSongInfo(url: URL, remainingTries = 6): Promise<SongInfo | null> {
+    if (remainingTries === 0) {
+      log.error('No tries remaining. Lookup failed!');
+      return null;
+    }
+    if (url.hostname === 'songwhip.com') {
+      // song.link doesn't support songwhip links and songwhip themselves will provide metadata if you pass in a
+      // Apple Music/Spotify/etc link, but won't when provided with their own link, so no way to extract song info
+      // except maybe scraping their HTML
+      return null;
+    }
+
+    const odesliParams = new URLSearchParams();
+    odesliParams.append('url', url.toString());
+    odesliParams.append('userCountry', 'DE');
+    odesliParams.append('songIfSingle', 'true');
+    if (ODESLI_API_KEY && ODESLI_API_KEY !== 'CHANGE_ME') {
+      odesliParams.append('key', ODESLI_API_KEY);
+    }
+    const odesliApiUrl = `https://api.song.link/v1-alpha.1/links?${odesliParams}`;
+    try {
+      return fetch(odesliApiUrl).then(async (response) => {
+        if (response.status === 429) {
+          throw new Error('Rate limit reached', { cause: 429 });
+        }
+        const odesliInfo: OdesliResponse = await response.json();
+        if (!odesliInfo || !odesliInfo.entitiesByUniqueId || !odesliInfo.entityUniqueId) {
+          return null;
+        }
+        const info = odesliInfo.entitiesByUniqueId[odesliInfo.entityUniqueId];
+        const platform: Platform = 'youtube';
+        return {
+          ...info,
+          pageUrl: odesliInfo.pageUrl,
+          youtubeUrl: odesliInfo.linksByPlatform[platform]?.url,
+          postedUrl: url.toString()
+        } as SongInfo;
+      });
+    } catch (e) {
+      if (e instanceof Error && e.cause === 429) {
+        log.warn('song.link rate limit reached. Trying again in 10 seconds');
+        await sleep(10_000);
+        return await this.getSongInfo(url, remainingTries - 1);
+      }
+      log.error(`Failed to load ${url} info from song.link`, e);
+      return null;
+    }
+  }
+
+  private startWebsocket() {
+    const socket = new WebSocket(`wss://${MASTODON_INSTANCE}/api/v1/streaming`);
+    socket.onopen = () => {
+      log.log('Connected to WS');
       socket.send('{ "type": "subscribe", "stream": "public:local"}');
     };
-    socket.onmessage = (async (event) => {
+    socket.onmessage = async (event) => {
       try {
         const data: TimelineEvent = JSON.parse(event.data.toString());
         if (data.event !== 'update') {
@@ -69,30 +105,42 @@ export class TimelineReader {
         const hashttags: string[] = HASHTAG_FILTER.split(',');
         const found_tags: Tag[] = post.tags.filter((t: Tag) => hashttags.includes(t.name));
 
-        const urls: string[] = URL_FILTER.split(',');
+        const songs = await TimelineReader.getSongInfoInPost(post);
-        const found_urls = urls.filter(t => post.content.includes(t));
 
         // If we don't have any tags or non-youtube urls, check youtube
         // YT is handled separately, because it requires an API call and therefore is slower
-        if (found_urls.length === 0 &&
+        if (songs.length === 0 && found_tags.length === 0) {
-          found_tags.length === 0 &&
+          log.log('Ignoring post', post.url);
-          !await TimelineReader.checkYoutubeMatches(post.content)) {
           return;
         }
-        savePost(post);
 
+        await savePost(post, songs);
+        log.debug('Saved post', post.url);
+
+        const posts = await getPosts(null, null, 100);
+        await saveAtomFeed(createFeed(posts));
       } catch (e) {
-        console.error("error message", event, event.data, e)
+        log.error('error message', event, event.data, e);
       }
-
+    };
-    });
     socket.onclose = (event) => {
-      console.log("Closed", event, event.code, event.reason)
+      log.warn(
+        `Websocket connection to ${MASTODON_INSTANCE} closed. Code: ${event.code}, reason: '${event.reason}'`
+      );
+      setTimeout(() => {
+        log.info(`Attempting to reconenct to WS`);
+        this.startWebsocket();
+      }, 10000);
     };
     socket.onerror = (event) => {
-      console.log("error", event, event.message, event.error)
+      log.error(
+        `Websocket connection to ${MASTODON_INSTANCE} failed. ${event.type}: ${event.error}, message: '${event.message}'`
+      );
     };
+  }
 
+  private constructor() {
+    this.startWebsocket();
   }
 
   public static init() {

src/lib/sleep.ts

@@ -0,0 +1,5 @@
+export function sleep(timeInMs: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, timeInMs);
+  });
+}

src/lib/truthyString.ts

@@ -0,0 +1,7 @@
+export function isTruthy(value: string | number | boolean | null | undefined): boolean {
+  if (typeof value === 'string') {
+    return value.toLowerCase() === 'true' || !!+value; // here we parse to number first
+  }
+
+  return !!value;
+}

src/routes/+layout.svelte

@@ -1,7 +1,15 @@
 <script lang="ts">
-  import FooterComponent from '$lib/components/FooterComponent.svelte'
+  import FooterComponent from '$lib/components/FooterComponent.svelte';
+  import { SvelteToast } from '@zerodevx/svelte-toast';
+
+  const options = {
+    pausable: true,
+    classes: ['toast']
+  };
 </script>
+
 <slot />
+<SvelteToast {options} />
 <div class="footer">
   <FooterComponent />
 </div>
@@ -12,4 +20,23 @@
     bottom: 0px;
     display: inline-block;
   }
+  :global(.toast.error) {
+    --toastColor: var(--color-button-text);
+    --toastBackground: var(--color-red-dark);
+    --toastBarBackground: var(--color-red-lighter);
+  }
+  :global(._toastMsg > img) {
+    position: relative;
+    height: 1.5em;
+  }
+  :global(._toastMsg) {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+  @media only screen and (max-width: 620px) {
+    .footer {
+      width: 100%;
+    }
+  }
 </style>

src/routes/+page.svelte

@@ -1,64 +1,193 @@
 <script lang="ts">
-import { onMount } from "svelte";
+  import { onMount } from 'svelte';
   import type { PageData } from './$types';
   import type { Post } from '$lib/mastodon/response';
-import { PUBLIC_REFRESH_INTERVAL } from '$env/static/public';
+  import {
+    PUBLIC_REFRESH_INTERVAL,
+    PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME
+  } from '$env/static/public';
   import PostComponent from '$lib/components/PostComponent.svelte';
+  import LoadMoreComponent from '$lib/components/LoadMoreComponent.svelte';
+  import { fly, type FlyParams } from 'svelte/transition';
+  import { cubicInOut } from 'svelte/easing';
+  import { errorToast } from '$lib/errorToast';
 
   export let data: PageData;
 
-let interval: NodeJS.Timer | null = null;
+  interface FetchOptions {
+    since?: string;
+    before?: string;
+    count?: number;
+  }
+
+  interface EdgeFlyParams extends FlyParams {
+    created_at: string;
+  }
+
+  const refreshInterval = parseInt(PUBLIC_REFRESH_INTERVAL);
+  let interval: ReturnType<typeof setTimeout> | null = null;
+  let moreOlderPostsAvailable = true;
+  let loadingOlderPosts = false;
+
+  // Needed, so that edgeFly() can do its thing:
+  // To determine whether a newly loaded post is older than the existing ones, is required to know what the oldest
+  // post was, before the fetch happened.
+  let oldestBeforeLastFetch: number | null = null;
+
+  /**
+   * Animate either from the top, or the bottom of the window, depending if the post is
+   * newer than the existing ones or older.
+   */
+  function edgeFly(node: Element, opts: EdgeFlyParams) {
+    const createdAt = new Date(opts.created_at).getTime();
+    const diffNewest = Math.abs(new Date(data.posts[0].created_at).getTime() - createdAt);
+    const oldest =
+      oldestBeforeLastFetch !== null
+        ? oldestBeforeLastFetch
+        : new Date(data.posts[data.posts.length - 1].created_at).getTime();
+    const diffOldest = Math.abs(oldest - createdAt);
+    const fromTop = diffNewest <= diffOldest;
+
+    const rect = node.getBoundingClientRect();
+    const paramY = +`${opts.y}`;
+    let offset = isNaN(paramY) ? 0 : paramY + rect.height;
+    opts.y = fromTop ? -offset : window.innerHeight + offset;
+    return fly(node, opts);
+  }
+
+  async function fetchPosts(options: FetchOptions): Promise<Post[]> {
+    const params = new URLSearchParams();
+    if (options?.since !== undefined) {
+      params.set('since', options.since);
+    }
+    if (options?.before !== undefined) {
+      params.set('before', options.before);
+    }
+    if (options?.count !== undefined) {
+      params.set('count', options.count.toFixed(0));
+    }
+
+    const response = await fetch(`/api/posts?${params}`);
+    return await response.json();
+  }
+
+  function filterDuplicates(posts: Post[]): Post[] {
+    return posts.filter((obj, index, arr) => {
+      return arr.map((mapObj) => mapObj.url).indexOf(obj.url) === index;
+    });
+  }
+
+  function refresh() {
+    let filter: FetchOptions = {};
+    if (data.posts.length > 0) {
+      filter = { since: data.posts[0].created_at };
+    }
+    fetchPosts(filter)
+      .then((resp) => {
+        if (resp.length > 0) {
+          // Prepend new posts, filter dupes
+          // There shouldn't be any duplicates, but better be safe than sorry
+          data.posts = filterDuplicates(resp.concat(data.posts));
+        }
+      })
+      .catch((e: Error) => {
+        errorToast('Error loading newest posts: ' + e.message);
+      });
+  }
 
   onMount(async () => {
-  interval = setInterval(async () => {
-    const params = new URLSearchParams();
     if (data.posts.length > 0) {
-      params.set('since', data.posts[0].created_at);
+      oldestBeforeLastFetch = new Date(data.posts[data.posts.length - 1].created_at).getTime();
     }
-    await fetch(`/api/posts?${params}`)
+    interval = setInterval(refresh, refreshInterval);
-    .then(r => r.json())
+
-    .then((resp: Post[]) => {
+    // - If the page is hidden, slow down refresh rate
-      if (resp.length > 0) {
+    // - If the page is shown, bump up refresh rate
-        data.posts = resp.concat(data.posts);
+    document.addEventListener('visibilitychange', () => {
-        console.log('updated data', resp, data.posts);
+      const delay = document.hidden ? refreshInterval * 10 : refreshInterval;
+      if (interval) {
+        clearInterval(interval);
       }
-    })
+      interval = setInterval(refresh, delay);
-    .catch(e => {
-      // TODO: Show error in UI
-      console.error('Error loading newest posts', e);
     });
-  }, parseInt(PUBLIC_REFRESH_INTERVAL));
+
     return () => {
       if (interval !== null) {
-      clearInterval(interval)
+        clearInterval(interval);
       }
+    };
+  });
+
+  function loadOlderPosts() {
+    loadingOlderPosts = true;
+    const filter: FetchOptions = { count: 20 };
+    if (data.posts.length > 0) {
+      const before = data.posts[data.posts.length - 1].created_at;
+      filter.before = before;
+      oldestBeforeLastFetch = new Date(before).getTime();
     }
+
+    fetchPosts(filter)
+      .then((resp) => {
+        if (resp.length > 0) {
+          // Append old posts, filter dupes
+          // There shouldn't be any duplicates, but better be safe than sorry
+          data.posts = filterDuplicates(data.posts.concat(resp));
+          // If we got less than we expected, there are no older posts available
+          moreOlderPostsAvailable = resp.length >= (filter.count ?? 20);
+        } else {
+          moreOlderPostsAvailable = false;
+        }
+        loadingOlderPosts = false;
       })
+      .catch((e) => {
+        loadingOlderPosts = false;
+        errorToast('Error loading older posts: ' + e.message);
+      });
+  }
 </script>
+
 <svelte:head>
-    <title>Metalhead.club music list</title>
+  <title>{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list</title>
 </svelte:head>
-<h2>Metalhead.club music list</h2>
+<h2>{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list</h2>
 <div class="wrapper">
-  <div></div>
+  <div />
   <div class="posts">
     {#if data.posts.length === 0}
-    Sorry, no posts recommending music aave been found yet
+      Sorry, no posts recommending music have been found yet
     {/if}
-  {#each data.posts as post (post.id)}
+    {#each data.posts as post (post.url)}
-      <div class="post"><PostComponent {post} /></div>
+      <div
+        class="post"
+        transition:edgeFly={{
+          y: 10,
+          created_at: post.created_at,
+          duration: 300,
+          easing: cubicInOut
+        }}
+      >
+        <PostComponent {post} />
+      </div>
     {/each}
+    <LoadMoreComponent
+      on:loadOlderPosts={loadOlderPosts}
+      moreAvailable={moreOlderPostsAvailable}
+      isLoading={loadingOlderPosts}
+    />
   </div>
-  <div></div>
+  <div />
 </div>
+
 <style>
   .posts {
     display: flex;
     flex-direction: column;
+    align-items: center;
   }
   .post {
     width: 100%;
-    max-width: 600px;
+    max-width: min(800px, 80vw);
     margin-bottom: 1em;
     border-bottom: 1px solid var(--color-border);
     padding: 1em;
@@ -70,5 +199,13 @@ onMount(async () => {
 
   h2 {
     text-align: center;
+    z-index: 100;
+  }
+
+  @media only screen and (max-width: 650px) {
+    .post {
+      max-width: calc(100vw - 16px);
+      padding: 1em 0;
+    }
   }
 </style>

src/routes/+page.ts

@@ -4,6 +4,6 @@ import type { PageLoad } from './$types';
 export const load = (async ({ fetch }) => {
   const p = await fetch('/');
   return {
-        posts: await p.json() as Post[]
+    posts: (await p.json()) as Post[]
   };
 }) satisfies PageLoad;

src/routes/api/posts/+server.ts

@@ -5,11 +5,12 @@ import type { RequestHandler } from './$types';
 
 export const GET = (async ({ url }) => {
   const since = url.searchParams.get('since');
+  const before = url.searchParams.get('before');
   let count = Number.parseInt(url.searchParams.get('count') || '');
   if (isNaN(count)) {
     count = 20;
   }
   count = Math.min(count, 100);
-    const posts = await getPosts(since, count);
+  const posts = await getPosts(since, before, count);
   return json(posts);
 }) satisfies RequestHandler;

start.sh.EXAMPLE

@@ -1,3 +1,3 @@
 #!/bin/bash
-. /PATH_TO_YOUR_NVM/.nvm/nvm.sh
+. /home/moshing-mammut/.nvm/nvm.sh
 node -r dotenv/config build

static/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="/mstile-70x70.png"/>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <square310x310logo src="/mstile-310x310.png"/>
+            <wide310x150logo src="/mstile-310x150.png"/>
+            <TileColor>#2e0b78</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

static/safari-pinned-tab.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1945 6201 c-52 -13 -88 -37 -142 -94 -199 -211 -362 -703 -418
+-1267 -32 -318 -29 -1388 5 -1835 62 -826 246 -1369 576 -1708 181 -186 380
+-297 669 -372 707 -185 1455 -178 2006 18 l94 33 -4 120 c-1 65 -4 120 -6 122
+-1 1 -58 -9 -126 -22 -202 -41 -342 -57 -559 -63 -349 -10 -656 22 -857 89
+-239 79 -412 242 -492 462 -57 160 -79 360 -44 413 37 56 -35 53 1506 53
+l1424 0 26 24 c14 13 28 39 32 57 3 19 4 908 3 1977 l-3 1944 -33 29 -32 29
+-1798 -1 c-988 -1 -1810 -4 -1827 -8z m1994 -310 c125 -39 218 -120 274 -239
+30 -63 32 -74 32 -178 0 -107 -1 -112 -38 -186 -133 -269 -470 -329 -688 -122
+-176 169 -179 443 -6 616 50 50 140 102 205 117 64 15 157 12 221 -8z m99
+-1107 c397 -70 754 -371 891 -751 57 -157 74 -267 68 -453 -4 -120 -11 -186
+-25 -241 -78 -293 -249 -539 -489 -700 -482 -326 -1122 -256 -1524 168 -42 44
+-94 106 -116 139 -91 133 -166 319 -194 474 -17 96 -17 304 0 400 64 363 301
+685 628 852 239 123 489 160 761 112z"/>
+<path d="M3730 4143 c-165 -28 -327 -153 -395 -306 -162 -368 123 -774 523
+-744 323 24 551 332 477 646 -64 268 -335 449 -605 404z"/>
+</g>
+</svg>

static/site.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "Moshing Mammut",
+  "short_name": "Moshing Mammut",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#2e0b78",
+  "background_color": "#2e0b78",
+  "display": "standalone"
+}

static/style.css

@@ -1,30 +0,0 @@
-body {
-    --color-text: #2F0C7A;
-    --color-bg: white;
-    --color-border: #17063B;
-    --color-link: #563ACC;
-    --color-link-visited: #858AFA;
-
-    color: var(--color-text);
-    background-color: var(--color-bg);
-    font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, 
-    Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif, 
-    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-}
-
-a {
-    color: var(--color-link);
-}
-a:visited {
-    color: var(--color-link-visited);
-}
-
-@media (prefers-color-scheme: dark) {
-    body {
-        --color-text: white;
-        --color-bg: #17063B;
-        --color-border: white;
-        --color-link: #8A9BF0;
-        --color-link-visited: #C384FB;
-    }
-}

svelte.config.js

@@ -11,8 +11,17 @@ 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']
+    },
+    reportOnly: {
+      'script-src': ['self']
+    }
+  }
 };
 
 export default config;