Compare commits
No commits in common. "main" and "v1.1.0" have entirely different histories.
@ -1,12 +1,9 @@
|
||||
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'
|
||||
MASTODON_ACCESS_TOKEN = 'YOUR_ACCESS_TOKEN_HERE'
|
||||
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'
|
||||
@ -1,25 +1,16 @@
|
||||
module.exports = {
|
||||
root: true,
|
||||
parser: '@typescript-eslint/parser',
|
||||
extends: ['plugin:svelte/recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
|
||||
plugins: ['@typescript-eslint'],
|
||||
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
|
||||
plugins: ['svelte3', '@typescript-eslint'],
|
||||
ignorePatterns: ['*.cjs'],
|
||||
overrides: [
|
||||
{
|
||||
files: ['*.svelte'],
|
||||
parser: 'svelte-eslint-parser',
|
||||
parserOptions: {
|
||||
parser: '@typescript-eslint/parser'
|
||||
}
|
||||
}
|
||||
],
|
||||
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
|
||||
settings: {
|
||||
'svelte3/typescript': () => require('typescript')
|
||||
},
|
||||
parserOptions: {
|
||||
sourceType: 'module',
|
||||
ecmaVersion: 2020,
|
||||
extraFileExtensions: ['.svelte']
|
||||
ecmaVersion: 2020
|
||||
},
|
||||
env: {
|
||||
browser: true,
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,8 +4,6 @@ playbook.yml
|
||||
inventory.yml
|
||||
ansible.cfg
|
||||
|
||||
avatars/*
|
||||
thumbnails/*
|
||||
node_modules
|
||||
/build
|
||||
/.svelte-kit
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
{
|
||||
"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,
|
||||
"prettier.format-on-save" : "Global Default"
|
||||
"apexskier.typescript.config.formatDocumentOnSave": "true",
|
||||
"apexskier.typescript.config.isEnabledForJavascript": "Enable",
|
||||
"apexskier.typescript.config.organizeImportsOnSave": "true",
|
||||
"apexskier.typescript.config.userPreferences.quotePreference": "single",
|
||||
"apexskier.typescript.config.userPreferences.useLabelDetailsInCompletionEntries": true
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@ node_modules
|
||||
.env
|
||||
.env.*
|
||||
!.env.example
|
||||
/.nova
|
||||
|
||||
# Ignore files for PNPM, NPM and YARN
|
||||
pnpm-lock.yaml
|
||||
|
||||
28
README.md
28
README.md
@ -11,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 can be found in [the configuration](.env.EXAMPLE).
|
||||
Additionally, links are vetted if they are music by checking if https://song.link finds info on them.
|
||||
checking included hashtags and URLs. A list of tags and URLs 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.
|
||||
|
||||
If a post passes this check it is saved to a SQLite database.
|
||||
|
||||
@ -33,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`~~ (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
|
||||
`accounts.username` and `accounts.avatar_static`. 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!
|
||||
@ -51,6 +51,7 @@ By default, NVM is used to install NodeJS, but you can install it any way you wa
|
||||
|
||||
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 Apache2 if not already installed.
|
||||
@ -77,6 +78,7 @@ 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
|
||||
@ -88,27 +90,15 @@ 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.
|
||||
|
||||
|
||||
#### On your development machine
|
||||
|
||||
Copy `.env.EXAMPLE` to `.env` and add your `YOUTUBE_API_KEY` and `ODESLI_API_KEY`.
|
||||
Copy `.env.EXAMPLE` to `.env` and add your `YOUTUBE_API_KEY`.
|
||||
To obtain one follow [YouTube's guide](https://developers.google.com/youtube/registering_an_application) to create an
|
||||
_API key_.
|
||||
If `YOUTUBE_API_KEY` is unset, no playlist will be updated. Also, _all_ YouTube links will be treated as music videos,
|
||||
because the API is the only way to check if a YouTube link leads to music or something else.
|
||||
|
||||
If `ODESLI_API_KEY` is unset, your rate limit to the song.link API will be lower.
|
||||
|
||||
Add `MASTODON_ACCESS_TOKEN` as well, see [Creating our application
|
||||
|
||||
](https://docs.joinmastodon.org/client/token/#app) in the Mastodon documentation.
|
||||
`read:statuses` is the only required scope. An access token will be displayed in your settings. Use that!
|
||||
|
||||
There are currently no plans to implement an actual authentication flow.
|
||||
*API key*. As soon as #13 is implemented, this will be optional!
|
||||
|
||||
Run `npm run build` and copy the output folder, usually `build` to `$APP_DIR` on your server.
|
||||
|
||||
|
||||
@ -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/
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
|
||||
{
|
||||
"masterPicture": "./icon.svg",
|
||||
"iconsPath": "/static",
|
||||
@ -60,4 +61,4 @@
|
||||
"htmlCodeFile": false,
|
||||
"usePathAsIs": false
|
||||
}
|
||||
}
|
||||
}
|
||||
4923
package-lock.json
generated
4923
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
43
package.json
43
package.json
@ -1,11 +1,10 @@
|
||||
{
|
||||
"name": "moshing-mammut",
|
||||
"version": "1.3.2",
|
||||
"version": "1.1.0",
|
||||
"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,35 +13,29 @@
|
||||
"format": "prettier --plugin-search-dir . --write ."
|
||||
},
|
||||
"devDependencies": {
|
||||
"@sveltejs/adapter-node": "^5.0.0",
|
||||
"@sveltejs/kit": "^2.0.0",
|
||||
"@sveltejs/vite-plugin-svelte": "^3.0.0",
|
||||
"@types/node": "^22.6.1",
|
||||
"@types/sqlite3": "^3.0.0",
|
||||
"@types/ws": "^8.5.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.0.0",
|
||||
"@typescript-eslint/parser": "^8.0.0",
|
||||
"@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": "^9.11.1",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-plugin-svelte": "^2.0.0",
|
||||
"prettier": "^3.0.0",
|
||||
"prettier-plugin-svelte": "^3.0.0",
|
||||
"svelte": "^4.0.0",
|
||||
"svelte-check": "^4.0.0",
|
||||
"eslint": "^8.28.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-plugin-svelte3": "^4.0.0",
|
||||
"prettier": "^2.8.0",
|
||||
"prettier-plugin-svelte": "^2.8.1",
|
||||
"svelte": "^3.54.0",
|
||||
"svelte-check": "^3.0.1",
|
||||
"tslib": "^2.4.1",
|
||||
"typescript": "^5.0.0",
|
||||
"vite": "^5.0.0"
|
||||
"typescript": "^4.9.3",
|
||||
"vite": "^4.0.0"
|
||||
},
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"dotenv": "^16.0.3",
|
||||
"feed": "^4.2.2",
|
||||
"sharp": "^0.33.0",
|
||||
"sqlite3": "^5.0.0",
|
||||
"ws": "^8.18.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.0.0"
|
||||
"sqlite3": "^5.1.6",
|
||||
"ws": "^8.13.0"
|
||||
}
|
||||
}
|
||||
|
||||
148
src/app.html
148
src/app.html
@ -1,105 +1,53 @@
|
||||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="%sveltekit.assets%/apple-touch-icon.png" />
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="%sveltekit.assets%/favicon-32x32.png" />
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="%sveltekit.assets%/favicon-16x16.png" />
|
||||
<link rel="manifest" href="%sveltekit.assets%/site.webmanifest" />
|
||||
<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="description"
|
||||
content="A collection of music recommendations and now-listenings by the users of metalhead.club"
|
||||
/>
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="%sveltekit.assets%/apple-touch-icon.png" />
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="%sveltekit.assets%/favicon-32x32.png" />
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="%sveltekit.assets%/favicon-16x16.png" />
|
||||
<link rel="manifest" href="%sveltekit.assets%/site.webmanifest" />
|
||||
<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="theme-color" content="#2e0b78" />
|
||||
<link rel="stylesheet" href="%sveltekit.assets%/style.css" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<meta name="theme-color" content="#2E0B78" 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" />
|
||||
%sveltekit.head%
|
||||
<style>
|
||||
body {
|
||||
--color-text: #2F0C7A;
|
||||
--color-bg: white;
|
||||
--color-border: #17063B;
|
||||
--color-link: #563ACC;
|
||||
--color-link-visited: #858AFA;
|
||||
|
||||
<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-blue: hsl(259, 82%, 26%);
|
||||
--color-blue-dark: hsl(259, 82%, 13%);
|
||||
--color-lavender: hsl(253, 82%, 33%);
|
||||
--color-mauve: hsl(273, 82%, 38%);
|
||||
color: var(--color-text);
|
||||
background-color: var(--color-bg);
|
||||
}
|
||||
|
||||
--color-grey: hsl(44, 7%, 41%);
|
||||
--color-grey-translucent: hsla(44, 7%, 41%, 0.2);
|
||||
--color-grey-light: hsl(0, 0%, 98%);
|
||||
a {
|
||||
color: var(--color-link);
|
||||
}
|
||||
a:visited {
|
||||
color: var(--color-link-visited);
|
||||
}
|
||||
|
||||
--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 {
|
||||
color: var(--color-link);
|
||||
}
|
||||
a:visited {
|
||||
color: var(--color-link-visited);
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
--color-lavender: hsl(273, 43%, 65%);
|
||||
--color-mauve: hsl(286, 73%, 81%);
|
||||
|
||||
--color-text: var(--color-grey-light);
|
||||
--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>
|
||||
</head>
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
<div style="display: contents">%sveltekit.body%</div>
|
||||
</body>
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
--color-text: white;
|
||||
--color-bg: #17063B;
|
||||
--color-border: white;
|
||||
--color-link: #8A9BF0;
|
||||
--color-link-visited: #C384FB;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body data-sveltekit-preload-data="hover">
|
||||
<div style="display: contents">%sveltekit.body%</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
import { log } from '$lib/log';
|
||||
import { TimelineReader } from '$lib/server/timeline';
|
||||
import type { Handle, HandleServerError } from '@sveltejs/kit';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { HandleServerError } from '@sveltejs/kit';
|
||||
import fs from 'fs/promises';
|
||||
|
||||
log.log('App startup');
|
||||
TimelineReader.init();
|
||||
|
||||
export const handleError = (({ error }) => {
|
||||
if (error instanceof Error) {
|
||||
log.error('Something went wrong: ', error.name, error.message);
|
||||
console.error('Something went wrong: ', error.name, error.message);
|
||||
}
|
||||
|
||||
return {
|
||||
message: `Something went wrong! ${error}`
|
||||
message: 'Whoops!',
|
||||
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') {
|
||||
@ -24,38 +24,12 @@ export const handle = (async ({ event, resolve }) => {
|
||||
}
|
||||
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']] });
|
||||
}
|
||||
|
||||
// Ideally, this would be served by apache
|
||||
if (event.url.pathname.startsWith('/avatars/')) {
|
||||
const fileName = event.url.pathname.split('/').pop() ?? 'unknown.jpeg';
|
||||
const suffix = fileName.split('.').pop() ?? 'jpeg';
|
||||
try {
|
||||
//This should work, but doesn't yet. See: https://github.com/nodejs/node/issues/45853
|
||||
/*
|
||||
const stat = await fs.stat('avatars/' + fileName);
|
||||
const fd = await fs.open('avatars/' + fileName);
|
||||
const readStream = fd
|
||||
.readableWebStream()
|
||||
.getReader({ mode: 'byob' }) as ReadableStream<Uint8Array>;
|
||||
log.info('sending. size: ', stat.size);
|
||||
return new Response(readStream, {
|
||||
headers: [
|
||||
['Content-Type', 'image/' + suffix],
|
||||
['Content-Length', stat.size.toString()]
|
||||
]
|
||||
});
|
||||
*/
|
||||
|
||||
const f = await fs.readFile('avatars/' + fileName);
|
||||
return new Response(f, { headers: [['Content-Type', 'image/' + suffix]] });
|
||||
} catch (e) {
|
||||
log.error('no stream', e);
|
||||
error(404);
|
||||
}
|
||||
return new Response(
|
||||
f,
|
||||
{ headers: [['Content-Type', 'application/atom+xml']] }
|
||||
);
|
||||
}
|
||||
|
||||
const response = await resolve(event);
|
||||
return response;
|
||||
}) satisfies Handle;
|
||||
}) satisfies Handle;
|
||||
@ -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>
|
||||
@ -3,52 +3,18 @@
|
||||
|
||||
export let account: Account;
|
||||
let avatarDescription: string;
|
||||
let sourceSetHtml: string;
|
||||
$: avatarDescription = `Avatar for ${account.acct}`;
|
||||
$: {
|
||||
// Sort thumbnails by file type. This is important, because the order of the srcset entries matter.
|
||||
// We need the best format to be first
|
||||
const formatPriority = new Map<string, number>([
|
||||
['avif', 0],
|
||||
['webp', 1],
|
||||
['jpg', 99],
|
||||
['jpeg', 99]
|
||||
]);
|
||||
const resizedAvatars = (account.resizedAvatars ?? []).sort((a, b) => {
|
||||
const extensionA = a.file.split('.').pop() ?? '';
|
||||
const extensionB = b.file.split('.').pop() ?? '';
|
||||
const prioA = formatPriority.get(extensionA) ?? 3;
|
||||
const prioB = formatPriority.get(extensionB) ?? 3;
|
||||
return prioA - prioB;
|
||||
});
|
||||
const m = new Map<string, string[]>();
|
||||
for (const resizedAvatar of resizedAvatars) {
|
||||
const extension = resizedAvatar.file.split('.').pop();
|
||||
const mime = extension ? `image/${extension}` : 'application/octet-stream';
|
||||
const sourceSetEntry = `${resizedAvatar.file} ${resizedAvatar.sizeDescriptor}`;
|
||||
m.set(mime, [...(m.get(mime) || []), sourceSetEntry]);
|
||||
}
|
||||
let html = '';
|
||||
for (const entry of m.entries()) {
|
||||
const srcset = entry[1].join(', ');
|
||||
html += `<source srcset="${srcset}" type="${entry[0]}" />`;
|
||||
}
|
||||
sourceSetHtml = html;
|
||||
}
|
||||
$: avatarDescription = `Avatar for ${account.acct}`
|
||||
</script>
|
||||
|
||||
<picture>
|
||||
{@html sourceSetHtml}
|
||||
<img src={account.avatar} alt={avatarDescription} loading="lazy" width="50" height="50" />
|
||||
</picture>
|
||||
<img src="{account.avatar}" alt={avatarDescription}/>
|
||||
|
||||
<style>
|
||||
img {
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
object-fit: contain;
|
||||
border-radius: 3px;
|
||||
}
|
||||
</style>
|
||||
img {
|
||||
max-width: 50px;
|
||||
max-height: 50px;
|
||||
width: auto;
|
||||
height: auto;
|
||||
object-fit: contain;
|
||||
border-radius: 3px;;
|
||||
}
|
||||
</style>
|
||||
@ -4,28 +4,24 @@
|
||||
</script>
|
||||
|
||||
<div class="footer">
|
||||
<div>
|
||||
<span class="label"
|
||||
>Made<span class="secretIngredient"> with 🤘</span> by </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" />
|
||||
<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"> Feed</span></span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<span>Made with 🤘 by </span>
|
||||
<a href="https://metalhead.club/@aymm" rel="me">@aymm@metalhead.club</a>
|
||||
</div>
|
||||
|
|
||||
<div>
|
||||
<a href="https://phlaym.net/git/phlaym/moshing-mammut">
|
||||
<img alt="Git branch" src={git} class="icon" />
|
||||
Source Code
|
||||
</a>
|
||||
</div>
|
||||
|
|
||||
<div>
|
||||
<a href="/feed.xml">
|
||||
<img alt="RSS" src={rss} class="icon" />
|
||||
RSS Feed
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
@ -42,14 +38,12 @@
|
||||
padding: 0.3em 1em;
|
||||
margin: 0 -8px;
|
||||
border-radius: 3px;
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
}
|
||||
.icon {
|
||||
position: relative;
|
||||
top: 0.25em;
|
||||
color: white;
|
||||
height: 1em;
|
||||
width: 1em;
|
||||
}
|
||||
@media (prefers-color-scheme: dark) {
|
||||
.icon {
|
||||
@ -59,27 +53,4 @@
|
||||
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>
|
||||
</style>
|
||||
@ -2,25 +2,23 @@
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import LoadingSpinnerComponent from '$lib/components/LoadingSpinnerComponent.svelte';
|
||||
|
||||
export let moreAvailable = false;
|
||||
export let isLoading = false;
|
||||
export let moreAvailable: boolean = false;
|
||||
export let isLoading: boolean = false;
|
||||
let displayText = '';
|
||||
let title = '';
|
||||
let disabled: boolean;
|
||||
|
||||
$: if (isLoading) {
|
||||
displayText = 'Loading...';
|
||||
displayText = 'Loading...';
|
||||
} else if (!moreAvailable) {
|
||||
displayText = 'You reached the end';
|
||||
displayText = 'You reached the end';
|
||||
} else {
|
||||
displayText = 'Load More';
|
||||
}
|
||||
displayText = 'Load More';
|
||||
};
|
||||
$: disabled = !moreAvailable || isLoading;
|
||||
$: title = moreAvailable ? 'Load More' : 'There be dragons!';
|
||||
|
||||
const dispatch = createEventDispatcher<{
|
||||
loadOlderPosts: string;
|
||||
}>();
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
function loadOlderPosts() {
|
||||
dispatch('loadOlderPosts');
|
||||
@ -28,10 +26,10 @@
|
||||
</script>
|
||||
|
||||
<button on:click={loadOlderPosts} {disabled} {title}>
|
||||
<div class="loading" class:collapsed={!isLoading}>
|
||||
<LoadingSpinnerComponent size="0.5em" thickness="6px" />
|
||||
</div>
|
||||
<span>{displayText}</span>
|
||||
<div class="loading" class:collapsed={!isLoading}>
|
||||
<LoadingSpinnerComponent size='0.5em' thickness='6px' />
|
||||
</div>
|
||||
<span>{displayText}</span>
|
||||
</button>
|
||||
|
||||
<style>
|
||||
@ -80,4 +78,4 @@
|
||||
max-width: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -1,10 +1,9 @@
|
||||
<script lang="ts">
|
||||
export let size = '64px';
|
||||
export let thickness = '6px';
|
||||
export let size: string = '64px';
|
||||
export let thickness: string = '6px';
|
||||
</script>
|
||||
|
||||
<div class="lds-dual-ring" style="--size: {size}; --thickness: {thickness}" />
|
||||
|
||||
<div class="lds-dual-ring" style="--size: {size}; --thickness: {thickness}"></div>
|
||||
<style>
|
||||
.lds-dual-ring {
|
||||
display: inline-block;
|
||||
@ -12,7 +11,7 @@
|
||||
height: 100%;
|
||||
}
|
||||
.lds-dual-ring:after {
|
||||
content: ' ';
|
||||
content: " ";
|
||||
display: block;
|
||||
width: var(--size);
|
||||
height: var(--size);
|
||||
@ -35,4 +34,5 @@
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
</style>
|
||||
@ -1,256 +1,57 @@
|
||||
<script lang="ts">
|
||||
import { type Post, SongThumbnailImageKind } from '$lib/mastodon/response';
|
||||
import type { SongInfo } from '$lib/odesliResponse';
|
||||
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';
|
||||
import { onMount } from "svelte";
|
||||
|
||||
export let post: Post;
|
||||
let displayRelativeTime = false;
|
||||
const absoluteDate = new Date(post.created_at).toLocaleString();
|
||||
let dateCreated = absoluteDate;
|
||||
const timePassed = secondsSince(new Date(post.created_at));
|
||||
$: if (displayRelativeTime) {
|
||||
$: if(displayRelativeTime) {
|
||||
dateCreated = relativeTime($timePassed) ?? absoluteDate;
|
||||
}
|
||||
|
||||
const songs = filterDuplicates(post.songs ?? []);
|
||||
|
||||
function filterDuplicates(songs: SongInfo[]): SongInfo[] {
|
||||
return songs.filter((obj, index, arr) => {
|
||||
return arr.map((mapObj) => mapObj.pageUrl).indexOf(obj.pageUrl) === index;
|
||||
});
|
||||
}
|
||||
|
||||
function getThumbnailSize(song: SongInfo): {
|
||||
width?: number;
|
||||
height?: number;
|
||||
widthSmall?: number;
|
||||
heightSmall?: number;
|
||||
} {
|
||||
if (song.thumbnailWidth === undefined || song.thumbnailHeight === undefined) {
|
||||
return { width: undefined, height: undefined, widthSmall: undefined, heightSmall: undefined };
|
||||
}
|
||||
const factor = 200 / song.thumbnailWidth;
|
||||
const smallFactor = 60 / song.thumbnailHeight;
|
||||
const height = song.thumbnailHeight * factor;
|
||||
return {
|
||||
width: 200,
|
||||
height: height,
|
||||
widthSmall: smallFactor * song.thumbnailWidth,
|
||||
heightSmall: 60
|
||||
};
|
||||
}
|
||||
|
||||
// Blurred thumbs aren't generated (yet, unclear of they ever will)
|
||||
// So blurred forces using the small one, by skipping the others and removing its media query.
|
||||
// This is technically unnecessary - the blurred one will only show if it matches the small media query,
|
||||
// but this makes it more explicit
|
||||
function getSourceSetHtml(song: SongInfo, isBlurred = false): string {
|
||||
const small = new Map<string, string[]>();
|
||||
const large = new Map<string, string[]>();
|
||||
|
||||
// Sort thumbnails by file type. This is important, because the order of the srcset entries matter.
|
||||
// We need the best format to be first
|
||||
const formatPriority = new Map<string, number>([
|
||||
['avif', 0],
|
||||
['webp', 1],
|
||||
['jpg', 99],
|
||||
['jpeg', 99]
|
||||
]);
|
||||
const thumbs = (song.resizedThumbnails ?? []).sort((a, b) => {
|
||||
const extensionA = a.file.split('.').pop() ?? '';
|
||||
const extensionB = b.file.split('.').pop() ?? '';
|
||||
const prioA = formatPriority.get(extensionA) ?? 3;
|
||||
const prioB = formatPriority.get(extensionB) ?? 3;
|
||||
return prioA - prioB;
|
||||
});
|
||||
|
||||
for (const resizedThumb of thumbs) {
|
||||
if (isBlurred && resizedThumb.kind !== SongThumbnailImageKind.Small) {
|
||||
continue;
|
||||
}
|
||||
const extension = resizedThumb.file.split('.').pop();
|
||||
const mime = extension ? `image/${extension}` : 'application/octet-stream';
|
||||
const sourceSetEntry = `${resizedThumb.file} ${resizedThumb.sizeDescriptor}`;
|
||||
switch (resizedThumb.kind) {
|
||||
case SongThumbnailImageKind.Big:
|
||||
large.set(mime, [...(large.get(mime) || []), sourceSetEntry]);
|
||||
break;
|
||||
case SongThumbnailImageKind.Small:
|
||||
small.set(mime, [...(small.get(mime) || []), sourceSetEntry]);
|
||||
break;
|
||||
case SongThumbnailImageKind.Blurred: // currently not generated
|
||||
break;
|
||||
}
|
||||
}
|
||||
let html = '';
|
||||
const { width, height, widthSmall, heightSmall } = getThumbnailSize(song);
|
||||
const mediaAttribute = isBlurred ? '' : 'media="(max-width: 650px)"';
|
||||
for (const entry of small.entries()) {
|
||||
const srcset = entry[1].join(', ');
|
||||
html += `<source srcset="${srcset}" type="${entry[0]}" ${mediaAttribute} width="${widthSmall}" height="${heightSmall}" />`;
|
||||
}
|
||||
html += '\n';
|
||||
for (const entry of large.entries()) {
|
||||
const srcset = entry[1].join(', ');
|
||||
html += `<source srcset="${srcset}" type="${entry[0]}" width="${width}" height="${height}"/>`;
|
||||
}
|
||||
return html;
|
||||
}
|
||||
|
||||
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="account"><AccountComponent account={post.account} /></div>
|
||||
<div class="meta">
|
||||
<small><a href={post.url} target="_blank" title={absoluteDate}>{dateCreated}</a></small>
|
||||
</div>
|
||||
<div class="content">{@html post.content}</div>
|
||||
<div class="song">
|
||||
{#if post.songs}
|
||||
{#each songs as song (song.pageUrl)}
|
||||
<div class="info-wrapper">
|
||||
<picture>
|
||||
{@html getSourceSetHtml(song)}
|
||||
<img class="bgimage" src={song.thumbnailUrl} loading="lazy" alt="Blurred cover" />
|
||||
</picture>
|
||||
<a href={song.pageUrl ?? song.postedUrl} target="_blank">
|
||||
<div class="info">
|
||||
<picture>
|
||||
{@html getSourceSetHtml(song)}
|
||||
<img
|
||||
src={song.thumbnailUrl}
|
||||
class="cover"
|
||||
alt="Cover for {song.artistName} - {song.title}"
|
||||
loading="lazy"
|
||||
width={song.thumbnailWidth}
|
||||
height={song.thumbnailHeight}
|
||||
/>
|
||||
</picture>
|
||||
<span class="text">{song.artistName} - {song.title}</span>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
{/each}
|
||||
{/if}
|
||||
<div class="post">
|
||||
<div class="meta">
|
||||
<AccountComponent account={post.account} />
|
||||
<small><a href={post.url} target="_blank" title="{absoluteDate}">{dateCreated}</a></small>
|
||||
</div>
|
||||
<div class="content">{@html post.content}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.wrapper {
|
||||
display: grid;
|
||||
grid-template-columns: 50px 1fr auto auto;
|
||||
grid-template-rows: auto 1fr auto;
|
||||
grid-template-areas:
|
||||
'avatar account account meta'
|
||||
'avatar content content song'
|
||||
'. content content song';
|
||||
grid-column-gap: 6px;
|
||||
column-gap: 6px;
|
||||
grid-row-gap: 6px;
|
||||
row-gap: 6px;
|
||||
display: flex;
|
||||
}
|
||||
.avatar {
|
||||
grid-area: avatar;
|
||||
max-width: 50px;
|
||||
max-height: 50px;
|
||||
}
|
||||
.account {
|
||||
grid-area: account;
|
||||
}
|
||||
.meta {
|
||||
grid-area: meta;
|
||||
justify-self: end;
|
||||
}
|
||||
.content {
|
||||
grid-area: content;
|
||||
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 {
|
||||
.post {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 0.5em;
|
||||
z-index: 1;
|
||||
flex-grow: 2;
|
||||
}
|
||||
.info * {
|
||||
z-index: inherit;
|
||||
.meta {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
@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);
|
||||
}
|
||||
.avatar {
|
||||
margin-right: 1em;
|
||||
}
|
||||
</style>
|
||||
.content {
|
||||
max-width: calc(600px - 1em - 50px);
|
||||
overflow-x: auto;
|
||||
}
|
||||
</style>
|
||||
@ -5,4 +5,4 @@ export function errorToast(message: string): number {
|
||||
return toast.push(`<img src="${errorIcon}" />${message}`, {
|
||||
classes: ['error']
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
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);
|
||||
}
|
||||
};
|
||||
@ -1,60 +1,29 @@
|
||||
import type { SongInfo } from '$lib/odesliResponse';
|
||||
|
||||
export interface TimelineEvent {
|
||||
event: string;
|
||||
payload: string;
|
||||
event: string,
|
||||
payload: string
|
||||
}
|
||||
|
||||
export interface Post {
|
||||
id: string;
|
||||
created_at: string;
|
||||
tags: Tag[];
|
||||
url: string;
|
||||
content: string;
|
||||
account: Account;
|
||||
card?: PreviewCard;
|
||||
songs?: SongInfo[];
|
||||
}
|
||||
id: string,
|
||||
created_at: string,
|
||||
tags: Tag[],
|
||||
url: string,
|
||||
content: string,
|
||||
account: Account
|
||||
|
||||
export interface PreviewCard {
|
||||
url: string;
|
||||
title: string;
|
||||
image?: string;
|
||||
blurhash?: string;
|
||||
width: number;
|
||||
height: number;
|
||||
}
|
||||
|
||||
export interface Tag {
|
||||
name: string;
|
||||
url: string;
|
||||
name: string,
|
||||
url: string
|
||||
}
|
||||
|
||||
export interface Account {
|
||||
id: string;
|
||||
acct: string;
|
||||
username: string;
|
||||
display_name: string;
|
||||
url: string;
|
||||
avatar: string;
|
||||
resizedAvatars?: AccountAvatar[];
|
||||
}
|
||||
|
||||
export type AccountAvatar = {
|
||||
accountUrl: string;
|
||||
file: string;
|
||||
sizeDescriptor: string;
|
||||
};
|
||||
|
||||
export enum SongThumbnailImageKind {
|
||||
Big = 1,
|
||||
Small,
|
||||
Blurred
|
||||
}
|
||||
|
||||
export type SongThumbnailImage = {
|
||||
songThumbnailUrl: string;
|
||||
file: string;
|
||||
sizeDescriptor: string;
|
||||
kind: SongThumbnailImageKind;
|
||||
};
|
||||
id: string,
|
||||
acct: string,
|
||||
username: string,
|
||||
display_name: string,
|
||||
url: string,
|
||||
avatar: string,
|
||||
avatar_static: string
|
||||
}
|
||||
@ -1,149 +0,0 @@
|
||||
import type { SongThumbnailImage } from '$lib/mastodon/response';
|
||||
|
||||
export type SongInfo = {
|
||||
pageUrl: string;
|
||||
youtubeUrl?: string;
|
||||
type: 'song' | 'album';
|
||||
title?: string;
|
||||
artistName?: string;
|
||||
thumbnailUrl?: string;
|
||||
postedUrl: string;
|
||||
resizedThumbnails?: SongThumbnailImage[];
|
||||
thumbnailWidth?: number;
|
||||
thumbnailHeight?: number;
|
||||
};
|
||||
|
||||
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';
|
||||
@ -11,7 +11,10 @@ export const time = readable(new Date(), function start(set) {
|
||||
});
|
||||
|
||||
export function secondsSince(date: Date): Readable<number> {
|
||||
return derived(time, ($time) => Math.round(($time.getTime() - date.getTime()) / 1000));
|
||||
return derived(
|
||||
time,
|
||||
$time => Math.round(($time.getTime() - date.getTime()) / 1000)
|
||||
);
|
||||
}
|
||||
|
||||
export function relativeTime(seconds: number): string | null {
|
||||
@ -27,11 +30,11 @@ export function relativeTime(seconds: number): string | null {
|
||||
|
||||
const day = hour * 24;
|
||||
if (seconds < day) {
|
||||
return `${Math.floor(seconds / hour)}h`;
|
||||
return `${(Math.floor(seconds / hour))}h`;
|
||||
}
|
||||
const maxRelative = day * 31;
|
||||
if (seconds < maxRelative) {
|
||||
return `${Math.floor(seconds / day)}d`;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +1,11 @@
|
||||
import { BASE_URL, WEBSUB_HUB } from '$env/static/private';
|
||||
import { BASE_URL } 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}`,
|
||||
@ -21,45 +19,27 @@ export function createFeed(posts: Post[]): Feed {
|
||||
feedLinks: {
|
||||
atom: `${BASE_URL}/feed.xml`
|
||||
},
|
||||
hub: hub,
|
||||
author: {
|
||||
name: '@aymm',
|
||||
link: 'https://metalhead.club/@aymm'
|
||||
}
|
||||
},
|
||||
});
|
||||
posts.forEach((p) => {
|
||||
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
|
||||
}
|
||||
],
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,56 +1,19 @@
|
||||
import {
|
||||
HASHTAG_FILTER,
|
||||
MASTODON_ACCESS_TOKEN,
|
||||
MASTODON_INSTANCE,
|
||||
ODESLI_API_KEY,
|
||||
YOUTUBE_API_KEY
|
||||
} from '$env/static/private';
|
||||
import { log } from '$lib/log';
|
||||
import type {
|
||||
Account,
|
||||
AccountAvatar,
|
||||
Post,
|
||||
SongThumbnailImage,
|
||||
Tag,
|
||||
TimelineEvent
|
||||
} from '$lib/mastodon/response';
|
||||
import { SongThumbnailImageKind } from '$lib/mastodon/response';
|
||||
import type { OdesliResponse, Platform, SongInfo } from '$lib/odesliResponse';
|
||||
import {
|
||||
getAvatars,
|
||||
getPosts,
|
||||
getSongThumbnails,
|
||||
removeAvatars,
|
||||
saveAvatar,
|
||||
savePost,
|
||||
saveSongThumbnail
|
||||
} from '$lib/server/db';
|
||||
import { HASHTAG_FILTER, MASTODON_INSTANCE, URL_FILTER, YOUTUBE_API_KEY } from '$env/static/private';
|
||||
import type { Post, Tag, TimelineEvent } from '$lib/mastodon/response';
|
||||
import { getPosts, savePost } from '$lib/server/db';
|
||||
import { createFeed, saveAtomFeed } from '$lib/server/rss';
|
||||
import { sleep } from '$lib/sleep';
|
||||
import crypto from 'crypto';
|
||||
import fs from 'fs/promises';
|
||||
import sharp from 'sharp';
|
||||
import { WebSocket } from 'ws';
|
||||
import { WebSocket } from "ws";
|
||||
|
||||
const URL_REGEX = new RegExp(/href="(?<postUrl>[^>]+?)" target="_blank"/gm);
|
||||
const INVIDIOUS_REGEX = new RegExp(/invidious.*?watch.*?v=(?<videoId>[a-zA-Z_0-9-]+)/gm);
|
||||
const YOUTUBE_REGEX = new RegExp(
|
||||
/https?:\/\/(www\.)?youtu((be.com\/.*?v=)|(\.be\/))(?<videoId>[a-zA-Z_0-9-]+)/gm
|
||||
);
|
||||
const YOUTUBE_REGEX = new RegExp(/https?:\/\/(www\.)?youtu((be.com\/.*?v=)|(\.be\/))(?<videoId>[a-zA-Z_0-9-]+)/gm);
|
||||
|
||||
export class TimelineReader {
|
||||
private static _instance: TimelineReader;
|
||||
|
||||
private static async isMusicVideo(videoId: string) {
|
||||
if (!YOUTUBE_API_KEY || YOUTUBE_API_KEY === 'CHANGE_ME') {
|
||||
// Assume that it *is* a music link when no YT API key is provided
|
||||
return true;
|
||||
}
|
||||
const searchParams = new URLSearchParams([
|
||||
['part', 'snippet'],
|
||||
['id', videoId],
|
||||
['key', YOUTUBE_API_KEY]
|
||||
]);
|
||||
['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();
|
||||
@ -60,363 +23,82 @@ export class TimelineReader {
|
||||
}
|
||||
|
||||
const item = respObj.items[0];
|
||||
if (!item.snippet) {
|
||||
console.warn('Could not load snippet for video', videoId, item);
|
||||
return false;
|
||||
}
|
||||
if (item.snippet.tags?.includes('music')) {
|
||||
if (item.tags?.includes('music')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const categorySearchParams = new URLSearchParams([
|
||||
['part', 'snippet'],
|
||||
['id', item.snippet.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]?.snippet?.title);
|
||||
['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';
|
||||
}
|
||||
|
||||
public static async getSongInfoInPost(post: Post): Promise<SongInfo[]> {
|
||||
const urlMatches = post.content.matchAll(URL_REGEX);
|
||||
const songs: SongInfo[] = [];
|
||||
for (const match of urlMatches) {
|
||||
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 urlMatch = match.groups.postUrl.toString();
|
||||
let url: URL;
|
||||
const videoId = match.groups.videoId.toString();
|
||||
try {
|
||||
url = new URL(urlMatch);
|
||||
const isMusic = await TimelineReader.isMusicVideo(videoId);
|
||||
if (isMusic) {
|
||||
return true;
|
||||
}
|
||||
} catch (e) {
|
||||
log.error('URL found via Regex does not seem to be a valud url', urlMatch, e);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check *all* found url and let odesli determine if it is music or not
|
||||
log.debug(`Checking ${url} if it contains song data`);
|
||||
const info = await TimelineReader.getSongInfo(url);
|
||||
log.debug(`Found song info for ${url}?`, info);
|
||||
if (info) {
|
||||
songs.push(info);
|
||||
console.error('Could not check if', videoId, 'is a music video', e);
|
||||
}
|
||||
}
|
||||
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 videoId = INVIDIOUS_REGEX.exec(url.href)?.groups?.videoId;
|
||||
const urlString =
|
||||
videoId !== undefined ? `https://youtube.com/watch?v=${videoId}` : url.toString();
|
||||
|
||||
const odesliParams = new URLSearchParams();
|
||||
odesliParams.append('url', urlString);
|
||||
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 {
|
||||
const response = await fetch(odesliApiUrl);
|
||||
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';
|
||||
if (info.platforms.includes(platform)) {
|
||||
const youtubeId =
|
||||
videoId ??
|
||||
YOUTUBE_REGEX.exec(url.href)?.groups?.videoId ??
|
||||
new URL(odesliInfo.pageUrl).pathname.split('/y/').pop();
|
||||
if (youtubeId === undefined) {
|
||||
log.warn('Looks like a youtube video, but could not extract a video id', url, odesliInfo);
|
||||
return null;
|
||||
}
|
||||
const isMusic = await TimelineReader.isMusicVideo(youtubeId);
|
||||
if (!isMusic) {
|
||||
log.debug('Probably not a music video', url);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
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 static async resizeAvatar(
|
||||
baseName: string,
|
||||
size: number,
|
||||
suffix: string,
|
||||
folder: string,
|
||||
sharpAvatar: sharp.Sharp
|
||||
): Promise<string | null> {
|
||||
const fileName = `${folder}/${baseName}_${suffix}`;
|
||||
const exists = await fs
|
||||
.access(fileName, fs.constants.F_OK)
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (exists) {
|
||||
log.debug('File already exists', fileName);
|
||||
return null;
|
||||
}
|
||||
log.debug('Saving avatar', fileName);
|
||||
await sharpAvatar.resize(size).toFile(fileName);
|
||||
return fileName;
|
||||
}
|
||||
|
||||
private static resizeAvatarPromiseMaker(
|
||||
avatarFilenameBase: string,
|
||||
baseSize: number,
|
||||
maxPixelDensity: number,
|
||||
accountUrl: string,
|
||||
formats: string[],
|
||||
avatar: ArrayBuffer
|
||||
): Promise<void>[] {
|
||||
const sharpAvatar = sharp(avatar);
|
||||
const promises: Promise<void>[] = [];
|
||||
for (let i = 1; i <= maxPixelDensity; i++) {
|
||||
promises.push(
|
||||
...formats.map((f) =>
|
||||
TimelineReader.resizeAvatar(
|
||||
avatarFilenameBase,
|
||||
baseSize * i,
|
||||
`${i}x.${f}`,
|
||||
'avatars',
|
||||
sharpAvatar
|
||||
)
|
||||
.then(
|
||||
(fn) =>
|
||||
({
|
||||
accountUrl: accountUrl,
|
||||
file: fn,
|
||||
sizeDescriptor: `${i}x`
|
||||
}) as AccountAvatar
|
||||
)
|
||||
.then(saveAvatar)
|
||||
)
|
||||
);
|
||||
}
|
||||
return promises;
|
||||
}
|
||||
|
||||
private static resizeThumbnailPromiseMaker(
|
||||
filenameBase: string,
|
||||
baseSize: number,
|
||||
maxPixelDensity: number,
|
||||
songThumbnailUrl: string,
|
||||
formats: string[],
|
||||
image: ArrayBuffer,
|
||||
kind: SongThumbnailImageKind
|
||||
): Promise<void>[] {
|
||||
const sharpAvatar = sharp(image);
|
||||
const promises: Promise<void>[] = [];
|
||||
for (let i = 1; i <= maxPixelDensity; i++) {
|
||||
promises.push(
|
||||
...formats.map((f) =>
|
||||
TimelineReader.resizeAvatar(
|
||||
filenameBase,
|
||||
baseSize * i,
|
||||
`${i}x.${f}`,
|
||||
'thumbnails',
|
||||
sharpAvatar
|
||||
)
|
||||
.then(
|
||||
(fn) =>
|
||||
({
|
||||
songThumbnailUrl: songThumbnailUrl,
|
||||
file: fn,
|
||||
sizeDescriptor: `${i}x`,
|
||||
kind: kind
|
||||
}) as SongThumbnailImage
|
||||
)
|
||||
.then(saveSongThumbnail)
|
||||
)
|
||||
);
|
||||
}
|
||||
return promises;
|
||||
}
|
||||
|
||||
private static async saveAvatar(account: Account) {
|
||||
try {
|
||||
const existingAvatars = await getAvatars(account.url, 1);
|
||||
const existingAvatarBase = existingAvatars.shift()?.file.split('/').pop()?.split('_').shift();
|
||||
const avatarFilenameBase =
|
||||
new URL(account.avatar).pathname.split('/').pop()?.split('.').shift() ?? account.acct;
|
||||
|
||||
// User's avatar changed. Remove the old one!
|
||||
if (existingAvatarBase && existingAvatarBase !== avatarFilenameBase) {
|
||||
await removeAvatars(account.url);
|
||||
const avatarsToDelete = (await fs.readdir('avatars'))
|
||||
.filter((x) => x.startsWith(existingAvatarBase + '_'))
|
||||
.map((x) => {
|
||||
log.debug('Removing existing avatar file', x);
|
||||
return x;
|
||||
})
|
||||
.map((x) => fs.unlink('avatars/' + x));
|
||||
await Promise.allSettled(avatarsToDelete);
|
||||
}
|
||||
const avatarResponse = await fetch(account.avatar);
|
||||
const avatar = await avatarResponse.arrayBuffer();
|
||||
await Promise.all(
|
||||
TimelineReader.resizeAvatarPromiseMaker(
|
||||
avatarFilenameBase,
|
||||
50,
|
||||
3,
|
||||
account.url,
|
||||
['webp', 'avif', 'jpeg'],
|
||||
avatar
|
||||
)
|
||||
);
|
||||
} catch (e) {
|
||||
console.error('Could not resize and save avatar for', account.acct, account.avatar, e);
|
||||
}
|
||||
}
|
||||
|
||||
private static async saveSongThumbnails(songs: SongInfo[]) {
|
||||
for (const song of songs) {
|
||||
if (!song.thumbnailUrl) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
const existingThumbs = await getSongThumbnails(song);
|
||||
if (existingThumbs.length) {
|
||||
continue;
|
||||
}
|
||||
const fileBaseName = crypto.createHash('sha256').update(song.thumbnailUrl).digest('hex');
|
||||
const imageResponse = await fetch(song.thumbnailUrl);
|
||||
const avatar = await imageResponse.arrayBuffer();
|
||||
await Promise.all(
|
||||
TimelineReader.resizeThumbnailPromiseMaker(
|
||||
fileBaseName + '_large',
|
||||
200,
|
||||
3,
|
||||
song.thumbnailUrl,
|
||||
['webp', 'avif', 'jpeg'],
|
||||
avatar,
|
||||
SongThumbnailImageKind.Big
|
||||
)
|
||||
);
|
||||
await Promise.all(
|
||||
TimelineReader.resizeThumbnailPromiseMaker(
|
||||
fileBaseName + '_small',
|
||||
60,
|
||||
3,
|
||||
song.thumbnailUrl,
|
||||
['webp', 'avif', 'jpeg'],
|
||||
avatar,
|
||||
SongThumbnailImageKind.Small
|
||||
)
|
||||
);
|
||||
} catch (e) {
|
||||
console.error(
|
||||
'Could not resize and save song thumbnail for',
|
||||
song.pageUrl,
|
||||
song.thumbnailUrl,
|
||||
e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private startWebsocket() {
|
||||
const socket = new WebSocket(
|
||||
`wss://${MASTODON_INSTANCE}/api/v1/streaming?type=subscribe&stream=public:local&access_token=${MASTODON_ACCESS_TOKEN}`
|
||||
);
|
||||
socket.onopen = () => {
|
||||
log.log('Connected to WS');
|
||||
};
|
||||
socket.onmessage = async (event) => {
|
||||
try {
|
||||
const data: TimelineEvent = JSON.parse(event.data.toString());
|
||||
if (data.event !== 'update') {
|
||||
log.log('Ignoring ES event', data.event);
|
||||
return;
|
||||
}
|
||||
const post: Post = JSON.parse(data.payload);
|
||||
|
||||
const hashttags: string[] = HASHTAG_FILTER.split(',');
|
||||
const found_tags: Tag[] = post.tags.filter((t: Tag) => hashttags.includes(t.name));
|
||||
|
||||
const songs = await TimelineReader.getSongInfoInPost(post);
|
||||
|
||||
// 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 (songs.length === 0 && found_tags.length === 0) {
|
||||
log.log('Ignoring post', post.url);
|
||||
return;
|
||||
}
|
||||
|
||||
await savePost(post, songs);
|
||||
|
||||
await TimelineReader.saveAvatar(post.account);
|
||||
await TimelineReader.saveSongThumbnails(songs);
|
||||
|
||||
log.debug('Saved post', post.url);
|
||||
|
||||
const posts = await getPosts(null, null, 100);
|
||||
await saveAtomFeed(createFeed(posts));
|
||||
} catch (e) {
|
||||
log.error('error message', event, event.data, e);
|
||||
}
|
||||
};
|
||||
socket.onclose = (event) => {
|
||||
log.warn(
|
||||
`Websocket connection to ${MASTODON_INSTANCE} closed. Code: ${event.code}, reason: '${event.reason}'`,
|
||||
event
|
||||
);
|
||||
setTimeout(() => {
|
||||
log.info(`Attempting to reconenct to WS`);
|
||||
this.startWebsocket();
|
||||
}, 10000);
|
||||
};
|
||||
socket.onerror = (event) => {
|
||||
log.error(
|
||||
`Websocket connection to ${MASTODON_INSTANCE} failed. ${event.type}: ${event.error}, message: '${event.message}'`
|
||||
);
|
||||
};
|
||||
return false;
|
||||
}
|
||||
|
||||
private constructor() {
|
||||
log.log('Constructing timeline object');
|
||||
this.startWebsocket();
|
||||
const socket = new WebSocket(`wss://${MASTODON_INSTANCE}/api/v1/streaming`);
|
||||
socket.onopen = (_event) => {
|
||||
socket.send('{ "type": "subscribe", "stream": "public:local"}');
|
||||
};
|
||||
socket.onmessage = (async (event) => {
|
||||
try {
|
||||
const data: TimelineEvent = JSON.parse(event.data.toString());
|
||||
if (data.event !== 'update') {
|
||||
return;
|
||||
}
|
||||
const post: Post = JSON.parse(data.payload);
|
||||
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 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 &&
|
||||
found_tags.length === 0 &&
|
||||
!await TimelineReader.checkYoutubeMatches(post.content)) {
|
||||
return;
|
||||
}
|
||||
await savePost(post);
|
||||
const posts = await getPosts(null, null, 100);
|
||||
await saveAtomFeed(createFeed(posts));
|
||||
|
||||
} catch (e) {
|
||||
console.error("error message", event, event.data, e)
|
||||
}
|
||||
|
||||
});
|
||||
socket.onclose = (event) => {
|
||||
console.log("Closed", event, event.code, event.reason)
|
||||
};
|
||||
socket.onerror = (event) => {
|
||||
console.log("error", event, event.message, event.error)
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
public static init() {
|
||||
log.log('Timeline object init');
|
||||
if (this._instance === undefined) {
|
||||
this._instance = new TimelineReader();
|
||||
}
|
||||
@ -426,4 +108,4 @@ export class TimelineReader {
|
||||
TimelineReader.init();
|
||||
return this._instance;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
export function sleep(timeInMs: number): Promise<void> {
|
||||
return new Promise((resolve) => {
|
||||
setTimeout(resolve, timeInMs);
|
||||
});
|
||||
}
|
||||
@ -1,7 +0,0 @@
|
||||
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;
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
<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 = {
|
||||
@ -7,7 +7,6 @@
|
||||
classes: ['toast']
|
||||
};
|
||||
</script>
|
||||
|
||||
<slot />
|
||||
<SvelteToast {options} />
|
||||
<div class="footer">
|
||||
@ -34,9 +33,4 @@
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
}
|
||||
@media only screen and (max-width: 620px) {
|
||||
.footer {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -1,184 +1,174 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import type { PageData } from './$types';
|
||||
import type { Post } from '$lib/mastodon/response';
|
||||
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';
|
||||
import { onMount } from "svelte";
|
||||
import type { PageData } from './$types';
|
||||
import type { Post } from '$lib/mastodon/response';
|
||||
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;
|
||||
|
||||
interface FetchOptions {
|
||||
since?: string;
|
||||
before?: string;
|
||||
count?: number;
|
||||
export let data: PageData;
|
||||
|
||||
interface FetchOptions {
|
||||
since?: string,
|
||||
before?: string,
|
||||
count?: number
|
||||
}
|
||||
|
||||
interface EdgeFlyParams extends FlyParams {
|
||||
created_at: string
|
||||
}
|
||||
|
||||
const refreshInterval = parseInt(PUBLIC_REFRESH_INTERVAL);
|
||||
let interval: NodeJS.Timer | 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));
|
||||
}
|
||||
|
||||
interface EdgeFlyParams extends FlyParams {
|
||||
created_at: string;
|
||||
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 };
|
||||
}
|
||||
|
||||
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));
|
||||
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);
|
||||
});
|
||||
}
|
||||
|
||||
const response = await fetch(`/api/posts?${params}`);
|
||||
return await response.json();
|
||||
onMount(async () => {
|
||||
if (data.posts.length > 0) {
|
||||
oldestBeforeLastFetch = new Date(data.posts[data.posts.length - 1].created_at).getTime();
|
||||
}
|
||||
interval = setInterval(refresh, refreshInterval);
|
||||
|
||||
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 };
|
||||
// - If the page is hidden, slow down refresh rate
|
||||
// - If the page is shown, bump up refresh rate
|
||||
document.addEventListener('visibilitychange', () => {
|
||||
const delay = document.hidden ? refreshInterval * 10 : refreshInterval;
|
||||
if (interval) {
|
||||
clearInterval(interval);
|
||||
}
|
||||
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 () => {
|
||||
if (data.posts.length > 0) {
|
||||
oldestBeforeLastFetch = new Date(data.posts[data.posts.length - 1].created_at).getTime();
|
||||
}
|
||||
interval = setInterval(refresh, refreshInterval);
|
||||
|
||||
// - If the page is hidden, slow down refresh rate
|
||||
// - If the page is shown, bump up refresh rate
|
||||
document.addEventListener('visibilitychange', () => {
|
||||
const delay = document.hidden ? refreshInterval * 10 : refreshInterval;
|
||||
if (interval) {
|
||||
clearInterval(interval);
|
||||
}
|
||||
interval = setInterval(refresh, delay);
|
||||
});
|
||||
|
||||
return () => {
|
||||
if (interval !== null) {
|
||||
clearInterval(interval);
|
||||
}
|
||||
};
|
||||
interval = setInterval(refresh, delay);
|
||||
});
|
||||
|
||||
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();
|
||||
return () => {
|
||||
if (interval !== null) {
|
||||
clearInterval(interval)
|
||||
}
|
||||
|
||||
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>
|
||||
});
|
||||
|
||||
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>{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list</title>
|
||||
</svelte:head>
|
||||
<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 have been found yet
|
||||
{/if}
|
||||
{#each data.posts as post (post.url)}
|
||||
{#if data.posts.length === 0}
|
||||
Sorry, no posts recommending music aave been found yet
|
||||
{/if}
|
||||
{#each data.posts as post (post.url)}
|
||||
<div
|
||||
class="post"
|
||||
transition:edgeFly|global={{
|
||||
y: 10,
|
||||
created_at: post.created_at,
|
||||
duration: 300,
|
||||
easing: cubicInOut
|
||||
}}
|
||||
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}
|
||||
/>
|
||||
{/each}
|
||||
<LoadMoreComponent
|
||||
on:loadOlderPosts={loadOlderPosts}
|
||||
moreAvailable={moreOlderPostsAvailable}
|
||||
isLoading={loadingOlderPosts}/>
|
||||
</div>
|
||||
<div></div>
|
||||
</div>
|
||||
<div />
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.posts {
|
||||
display: flex;
|
||||
@ -187,7 +177,7 @@
|
||||
}
|
||||
.post {
|
||||
width: 100%;
|
||||
max-width: min(800px, 80vw);
|
||||
max-width: 600px;
|
||||
margin-bottom: 1em;
|
||||
border-bottom: 1px solid var(--color-border);
|
||||
padding: 1em;
|
||||
@ -201,11 +191,4 @@
|
||||
text-align: center;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 650px) {
|
||||
.post {
|
||||
max-width: calc(100vw - 16px);
|
||||
padding: 1em 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -2,8 +2,8 @@ import type { Post } from '$lib/mastodon/response';
|
||||
import type { PageLoad } from './$types';
|
||||
|
||||
export const load = (async ({ fetch }) => {
|
||||
const p = await fetch('/');
|
||||
return {
|
||||
posts: (await p.json()) as Post[]
|
||||
};
|
||||
}) satisfies PageLoad;
|
||||
const p = await fetch('/');
|
||||
return {
|
||||
posts: await p.json() as Post[]
|
||||
};
|
||||
}) satisfies PageLoad;
|
||||
@ -2,4 +2,4 @@ import type { RequestHandler } from './$types';
|
||||
|
||||
export const GET = (async ({ fetch }) => {
|
||||
return await fetch('api/posts');
|
||||
}) satisfies RequestHandler;
|
||||
}) satisfies RequestHandler;
|
||||
@ -13,4 +13,4 @@ export const GET = (async ({ url }) => {
|
||||
count = Math.min(count, 100);
|
||||
const posts = await getPosts(since, before, count);
|
||||
return json(posts);
|
||||
}) satisfies RequestHandler;
|
||||
}) satisfies RequestHandler;
|
||||
@ -1,19 +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"
|
||||
"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"
|
||||
}
|
||||
|
||||
58
static/style.css
Normal file
58
static/style.css
Normal file
@ -0,0 +1,58 @@
|
||||
body {
|
||||
--color-blue: hsl(259, 82%, 26%);
|
||||
--color-blue-dark: hsl(259, 82%, 10%);
|
||||
--color-lavender: hsl(273, 43%, 65%);
|
||||
--color-mauve: hsl(286, 73%, 81%);
|
||||
|
||||
--color-grey: hsl(44, 7%, 41%);
|
||||
--color-grey-translucent: hsla(44, 7%, 41%, 0.2);
|
||||
--color-grey-light: hsl(42, 7%, 72%);
|
||||
|
||||
--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);
|
||||
--color-border: var(--color-grey);
|
||||
--color-link: var(--color-mauve);
|
||||
--color-link-visited: var(--color-lavender);
|
||||
--color-bg: var(--color-grey-light);
|
||||
--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 {
|
||||
color: var(--color-link);
|
||||
}
|
||||
a:visited {
|
||||
color: var(--color-link-visited);
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
body {
|
||||
--color-text: var(--color-grey-light);
|
||||
--color-border: var(--color-grey-light);
|
||||
--color-link: var(--color-mauve);
|
||||
--color-link-visited: var(--color-lavender);
|
||||
--color-bg: var(--color-blue);
|
||||
--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);
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
import adapter from '@sveltejs/adapter-node';
|
||||
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
||||
import { vitePreprocess } from '@sveltejs/kit/vite';
|
||||
|
||||
/** @type {import('@sveltejs/kit').Config} */
|
||||
const config = {
|
||||
@ -12,15 +12,7 @@ const config = {
|
||||
// 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(),
|
||||
|
||||
csp: {
|
||||
directives: {
|
||||
'script-src': ['self', 'unsafe-inline'],
|
||||
'base-uri': ['self'],
|
||||
'object-src': ['none']
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
export default config;
|
||||
|
||||
@ -1,16 +1,6 @@
|
||||
import { sveltekit } from '@sveltejs/kit/vite';
|
||||
import { defineConfig, searchForWorkspaceRoot } from 'vite';
|
||||
import { defineConfig } from 'vite';
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [sveltekit()],
|
||||
server: {
|
||||
fs: {
|
||||
allow: [
|
||||
// search up for workspace root
|
||||
searchForWorkspaceRoot(process.cwd()),
|
||||
// your custom rules
|
||||
'avatars'
|
||||
]
|
||||
}
|
||||
}
|
||||
plugins: [sveltekit()]
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user