diff --git a/.editorconfig b/.editorconfig index 0d7fefe..db0dfb7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,4 +2,4 @@ root = true [*.{svelte, ts, cjs, json}] indent_style = space -indent_size = 4 \ No newline at end of file +indent_size = 2 \ No newline at end of file diff --git a/.env.EXAMPLE b/.env.EXAMPLE index 729f514..d9d5761 100644 --- a/.env.EXAMPLE +++ b/.env.EXAMPLE @@ -1,6 +1,9 @@ -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 +MASTODON_INSTANCE = 'metalhead.club' +BASE_URL = 'https://moshingmammut.phlaym.net' VERBOSE = false -PUBLIC_REFRESH_INTERVAL = 10000 \ No newline at end of file +PUBLIC_REFRESH_INTERVAL = 10000 +PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME = 'Metalhead.club' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2d5c3a5..f6342e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ *.db +feed.xml +playbook.yml +inventory.yml +ansible.cfg node_modules /build diff --git a/README.md b/README.md index de59b56..3a41123 100644 --- a/README.md +++ b/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 @@ -46,32 +49,50 @@ 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 `` 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 -to run the app as. +and set your `User`, `Group`, `ExecStart` and `WorkingDirectory` accordingly. -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 @@ -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) diff --git a/faviconDescription.json b/faviconDescription.json new file mode 100644 index 0000000..edc8e91 --- /dev/null +++ b/faviconDescription.json @@ -0,0 +1,64 @@ + +{ + "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 + } +} \ No newline at end of file diff --git a/icon.svg b/icon.svg new file mode 100644 index 0000000..c609fc8 --- /dev/null +++ b/icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/moshing-mammut.service.EXAMPLE b/moshing-mammut.service.EXAMPLE index 1073980..cc0cbba 100644 --- a/moshing-mammut.service.EXAMPLE +++ b/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 -Group=nogroup +User=moshing-mammut +Group=moshing-mammut Environment=PATH=/usr/bin:/usr/local/bin Environment=NODE_ENV=production -WorkingDirectory=/PATH_TO_MOSHING_MAMMUT/ -KillMode=process +WorkingDirectory=/home/moshing-mammut/app [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4797168..930c85e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,24 +1,27 @@ { "name": "moshing-mammut", - "version": "0.0.1", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "moshing-mammut", - "version": "0.0.1", + "version": "1.1.0", + "license": "LGPL-3.0-or-later", "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" }, "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", @@ -31,54 +34,6 @@ "vite": "^4.0.0" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.14.tgz", - "integrity": "sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz", - "integrity": "sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.14.tgz", - "integrity": "sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@esbuild/darwin-arm64": { "version": "0.17.14", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz", @@ -95,294 +50,6 @@ "node": ">=12" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz", - "integrity": "sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz", - "integrity": "sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz", - "integrity": "sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz", - "integrity": "sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz", - "integrity": "sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz", - "integrity": "sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz", - "integrity": "sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz", - "integrity": "sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz", - "integrity": "sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz", - "integrity": "sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz", - "integrity": "sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz", - "integrity": "sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz", - "integrity": "sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz", - "integrity": "sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz", - "integrity": "sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz", - "integrity": "sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz", - "integrity": "sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.17.14", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz", - "integrity": "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -759,9 +426,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.15.0.tgz", - "integrity": "sha512-fvDsW9msxWjDU/j9wwLlxEZ6cpXQYcmcQHq7neJMqibMEl39gI1ztVymGnYqM8KLqZXwNmhKtLu8EPheukKtXQ==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.15.2.tgz", + "integrity": "sha512-rLNxZrjbrlPf8AWW8GAU4L/Vvu17e9v8EYl7pUip7x72lTft7RcxeP3z7tsrHpMSBBxC9o4XdKzFvz1vMZyXZw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -777,7 +444,7 @@ "set-cookie-parser": "^2.5.1", "sirv": "^2.0.2", "tiny-glob": "^0.2.9", - "undici": "5.21.0" + "undici": "5.20.0" }, "bin": { "svelte-kit": "svelte-kit.js" @@ -841,7 +508,8 @@ "node_modules/@types/node": { "version": "18.15.11", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz", - "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==" + "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==", + "dev": true }, "node_modules/@types/pug": { "version": "2.0.6", @@ -865,6 +533,7 @@ "version": "3.1.8", "resolved": "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.8.tgz", "integrity": "sha512-sQMt/qnyUWnqiTcJXm5ZfNPIBeJ/DVvJDwxw+0tAxPJvadzfiP1QhryO1JOR6t1yfb8NpzQb/Rud06mob5laIA==", + "dev": true, "dependencies": { "@types/node": "*" } @@ -873,6 +542,7 @@ "version": "8.5.4", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "dev": true, "dependencies": { "@types/node": "*" } @@ -1065,6 +735,15 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@zerodevx/svelte-toast": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/@zerodevx/svelte-toast/-/svelte-toast-0.9.3.tgz", + "integrity": "sha512-VPKWR4A9y01fyXRscu9HiTj7tV2hFrpRKZvGwMmaPXfHIXR1D9+NNsz0HXcQ7qZ0C5UaHS3n9uNtPtIcAXT7RQ==", + "dev": true, + "peerDependencies": { + "svelte": "^3.57.0" + } + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1922,6 +1601,17 @@ "reusify": "^1.0.4" } }, + "node_modules/feed": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz", + "integrity": "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==", + "dependencies": { + "xml-js": "^1.6.11" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -3329,6 +3019,11 @@ "rimraf": "bin.js" } }, + "node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -3847,9 +3542,9 @@ } }, "node_modules/undici": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz", - "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==", + "version": "5.20.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz", + "integrity": "sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==", "dev": true, "dependencies": { "busboy": "^1.6.0" @@ -4024,6 +3719,17 @@ } } }, + "node_modules/xml-js": { + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", + "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==", + "dependencies": { + "sax": "^1.2.4" + }, + "bin": { + "xml-js": "bin/cli.js" + } + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", diff --git a/package.json b/package.json index 15b2a0a..21e6a34 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "name": "moshing-mammut", - "version": "0.0.1", + "version": "1.1.0", "private": true, + "license": "LGPL-3.0-or-later", "scripts": { "dev": "vite dev", "build": "vite build", @@ -14,8 +15,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 +33,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" } diff --git a/src/LICENSE b/src/LICENSE new file mode 100644 index 0000000..153d416 --- /dev/null +++ b/src/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. \ No newline at end of file diff --git a/src/app.html b/src/app.html index 37e46d3..52aae12 100644 --- a/src/app.html +++ b/src/app.html @@ -2,11 +2,20 @@ - + + + + + + + + + - - + + + %sveltekit.head% \ No newline at end of file diff --git a/src/lib/components/LoadMoreComponent.svelte b/src/lib/components/LoadMoreComponent.svelte new file mode 100644 index 0000000..ce461db --- /dev/null +++ b/src/lib/components/LoadMoreComponent.svelte @@ -0,0 +1,81 @@ + + + + + \ No newline at end of file diff --git a/src/lib/components/LoadingSpinnerComponent.svelte b/src/lib/components/LoadingSpinnerComponent.svelte new file mode 100644 index 0000000..e41ec9f --- /dev/null +++ b/src/lib/components/LoadingSpinnerComponent.svelte @@ -0,0 +1,38 @@ + + +
+ \ No newline at end of file diff --git a/src/lib/components/PostComponent.svelte b/src/lib/components/PostComponent.svelte index 5bc09d2..f15245a 100644 --- a/src/lib/components/PostComponent.svelte +++ b/src/lib/components/PostComponent.svelte @@ -2,10 +2,24 @@ 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; - $: dateCreated = new Date(post.created_at).toLocaleString(); + let displayRelativeTime = false; + const absoluteDate = new Date(post.created_at).toLocaleString(); + 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; + }) @@ -14,7 +28,7 @@
- {dateCreated} + {dateCreated}
{@html post.content}
diff --git a/src/lib/errorToast.ts b/src/lib/errorToast.ts new file mode 100644 index 0000000..1d85264 --- /dev/null +++ b/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(`${message}`, { + classes: ['error'] + }); +} \ No newline at end of file diff --git a/src/lib/relativeTime.ts b/src/lib/relativeTime.ts new file mode 100644 index 0000000..2128a96 --- /dev/null +++ b/src/lib/relativeTime.ts @@ -0,0 +1,40 @@ +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 { + 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; +} \ No newline at end of file diff --git a/src/lib/server/db.ts b/src/lib/server/db.ts index 7f8ba92..02bd876 100644 --- a/src/lib/server/db.ts +++ b/src/lib/server/db.ts @@ -92,95 +92,112 @@ function getMigrations(): Migration[] { }]; } -export function savePost(post: Post): void { - console.debug(`Saving post ${post.url}`); - const account = post.account; - db.run(` - INSERT INTO accounts (id, acct, username, display_name, url, avatar, avatar_static) - VALUES(?, ?, ?, ?, ?, ?, ?) - ON CONFLICT(id) - DO UPDATE SET - acct=excluded.acct, - username=excluded.username, - display_name=excluded.display_name, - url=excluded.url, - avatar=excluded.avatar, - avatar_static=excluded.avatar_static;`, - [ - account.id, - account.acct, - account.username, - account.display_name, - account.url, - account.avatar, - account.avatar_static - ], - (err) => { - if (err !== null) { - console.error(`Could not insert/update account ${account.id}`, err); - return; - } - db.run(` - INSERT INTO posts (id, content, created_at, url, account_id) - VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET - content=excluded.content, - created_at=excluded.created_at, - url=excluded.url, - account_id=excluded.account_id;`, - [ - 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); - return; - } - - db.parallelize(() => { - for (let 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 - ], - (tagErr) => { - if (tagErr !== null) { - console.error(`Could not insert/update tag ${tag.url}`, tagErr); - return; - } - db.run('INSERT INTO poststags (post_id, tag_url) VALUES (?, ?)', - [post.id, tag.url], - (posttagserr) => { - if (posttagserr !== null) { - console.error(`Could not insert poststags ${tag.url}, ${post.url}`, posttagserr); - return; - } - } - ); - } - ); +export async function savePost(post: Post): Promise { + return new Promise((resolve, reject) => { + console.debug(`Saving post ${post.url}`); + const account = post.account; + db.run(` + INSERT INTO accounts (id, acct, username, display_name, url, avatar, avatar_static) + VALUES(?, ?, ?, ?, ?, ?, ?) + ON CONFLICT(id) + DO UPDATE SET + acct=excluded.acct, + username=excluded.username, + display_name=excluded.display_name, + url=excluded.url, + avatar=excluded.avatar, + avatar_static=excluded.avatar_static;`, + [ + account.id, + account.acct, + account.username, + account.display_name, + account.url, + account.avatar, + account.avatar_static + ], + (err) => { + if (err !== null) { + console.error(`Could not insert/update account ${account.id}`, err); + reject(err); + return; + } + db.run(` + INSERT INTO posts (id, content, created_at, url, account_id) + VALUES (?, ?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET + content=excluded.content, + created_at=excluded.created_at, + url=excluded.url, + account_id=excluded.account_id;`, + [ + 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); + reject(postErr); + return; } + + db.parallelize(() => { + let remaining = post.tags.length; + for (let 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 + ], + (tagErr) => { + if (tagErr !== null) { + console.error(`Could not insert/update tag ${tag.url}`, tagErr); + reject(tagErr); + return; + } + db.run('INSERT INTO poststags (post_id, tag_url) VALUES (?, ?)', + [post.id, tag.url], + (posttagserr) => { + if (posttagserr !== null) { + console.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(undefined); + } + } + ); + } + ); + } + }); }); - }); - }); + }); + }); } -export async function getPosts(since: string | null, limit: number) { +export async function getPosts(since: string | null, before: string | null, limit: number) { let promise = await new Promise((resolve, reject) => { let filter_query; let params: any = { $limit: limit }; - if (since === null) { + if (since === null && before === null) { filter_query = ''; - } else { + } else if (since !== null) { filter_query = '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 + filter_query = 'WHERE posts.created_at < $before'; + params.$before = before; } const sql = `SELECT posts.id, posts.content, posts.created_at, posts.url, accounts.id AS account_id, accounts.acct, accounts.username, accounts.display_name, diff --git a/src/lib/server/rss.ts b/src/lib/server/rss.ts new file mode 100644 index 0000000..cfe792a --- /dev/null +++ b/src/lib/server/rss.ts @@ -0,0 +1,45 @@ +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 { Feed } from 'feed'; +import fs from 'fs/promises'; + +export function createFeed(posts: Post[]): Feed { + const baseUrl = BASE_URL.endsWith('/') ? BASE_URL : BASE_URL + '/'; + 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` + }, + 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' }); +} \ No newline at end of file diff --git a/src/lib/server/timeline.ts b/src/lib/server/timeline.ts index 7d6af5f..9c03a66 100644 --- a/src/lib/server/timeline.ts +++ b/src/lib/server/timeline.ts @@ -1,9 +1,10 @@ -import { HASHTAG_FILTER, URL_FILTER, YOUTUBE_API_KEY } from '$env/static/private'; +import { HASHTAG_FILTER, MASTODON_INSTANCE, URL_FILTER, YOUTUBE_API_KEY } from '$env/static/private'; import type { Post, Tag, TimelineEvent } from '$lib/mastodon/response'; -import { savePost } from '$lib/server/db'; +import { getPosts, savePost } from '$lib/server/db'; +import { createFeed, saveAtomFeed } from '$lib/server/rss'; import { WebSocket } from "ws"; -const YOUTUBE_REGEX = new RegExp(/https?:\/\/(www\.)?youtu((be.com\/.*v=)|(\.be\/))(?[a-zA-Z_0-9-]+)/gm); +const YOUTUBE_REGEX = new RegExp(/https?:\/\/(www\.)?youtu((be.com\/.*?v=)|(\.be\/))(?[a-zA-Z_0-9-]+)/gm); export class TimelineReader { private static _instance: TimelineReader; @@ -55,7 +56,7 @@ export class TimelineReader { } private constructor() { - const socket = new WebSocket("wss://metalhead.club/api/v1/streaming") + const socket = new WebSocket(`wss://${MASTODON_INSTANCE}/api/v1/streaming`); socket.onopen = (_event) => { socket.send('{ "type": "subscribe", "stream": "public:local"}'); }; @@ -79,7 +80,9 @@ export class TimelineReader { !await TimelineReader.checkYoutubeMatches(post.content)) { return; } - savePost(post); + await savePost(post); + const posts = await getPosts(null, null, 100); + await saveAtomFeed(createFeed(posts)); } catch (e) { console.error("error message", event, event.data, e) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 223e975..af1013c 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,7 +1,14 @@ +
@@ -12,4 +19,18 @@ 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; + } \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 03da0ec..bd4e83e 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -2,52 +2,170 @@ 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; +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 { + 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); + 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); } - await fetch(`/api/posts?${params}`) - .then(r => r.json()) - .then((resp: Post[]) => { - if (resp.length > 0) { - data.posts = resp.concat(data.posts); - console.log('updated data', resp, data.posts); - } - }) - .catch(e => { - // TODO: Show error in UI - console.error('Error loading newest posts', e); - }); - }, parseInt(PUBLIC_REFRESH_INTERVAL)); + interval = setInterval(refresh, delay); + }); + return () => { if (interval !== null) { 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); + }); + +} + - Metalhead.club music list + {PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list -

Metalhead.club music list

+

{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list

{#if data.posts.length === 0} Sorry, no posts recommending music aave been found yet {/if} - {#each data.posts as post (post.id)} -
+ {#each data.posts as post (post.url)} +
+ +
{/each} +
@@ -55,6 +173,7 @@ onMount(async () => { .posts { display: flex; flex-direction: column; + align-items: center; } .post { width: 100%; @@ -70,5 +189,6 @@ onMount(async () => { h2 { text-align: center; + z-index: 100; } \ No newline at end of file diff --git a/src/routes/api/posts/+server.ts b/src/routes/api/posts/+server.ts index 24c4fcd..4b67da2 100644 --- a/src/routes/api/posts/+server.ts +++ b/src/routes/api/posts/+server.ts @@ -4,12 +4,13 @@ import { json } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; export const GET = (async ({ url }) => { - const since = url.searchParams.get('since'); - let count = Number.parseInt(url.searchParams.get('count') || ''); - if (isNaN(count)) { - count = 20; - } - count = Math.min(count, 100); - const posts = await getPosts(since, count); - return json(posts); + 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, before, count); + return json(posts); }) satisfies RequestHandler; \ No newline at end of file diff --git a/start.sh.EXAMPLE b/start.sh.EXAMPLE index 7ea8309..a620e80 100644 --- a/start.sh.EXAMPLE +++ b/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 \ No newline at end of file diff --git a/static/android-chrome-192x192.png b/static/android-chrome-192x192.png new file mode 100644 index 0000000..a101672 Binary files /dev/null and b/static/android-chrome-192x192.png differ diff --git a/static/android-chrome-512x512.png b/static/android-chrome-512x512.png new file mode 100644 index 0000000..7909c70 Binary files /dev/null and b/static/android-chrome-512x512.png differ diff --git a/static/apple-touch-icon-120x120-precomposed.png b/static/apple-touch-icon-120x120-precomposed.png new file mode 100644 index 0000000..1aed677 Binary files /dev/null and b/static/apple-touch-icon-120x120-precomposed.png differ diff --git a/static/apple-touch-icon-120x120.png b/static/apple-touch-icon-120x120.png new file mode 100644 index 0000000..03367b2 Binary files /dev/null and b/static/apple-touch-icon-120x120.png differ diff --git a/static/apple-touch-icon-152x152-precomposed.png b/static/apple-touch-icon-152x152-precomposed.png new file mode 100644 index 0000000..a1b7f7b Binary files /dev/null and b/static/apple-touch-icon-152x152-precomposed.png differ diff --git a/static/apple-touch-icon-152x152.png b/static/apple-touch-icon-152x152.png new file mode 100644 index 0000000..a09eb73 Binary files /dev/null and b/static/apple-touch-icon-152x152.png differ diff --git a/static/apple-touch-icon-180x180-precomposed.png b/static/apple-touch-icon-180x180-precomposed.png new file mode 100644 index 0000000..a66ae5a Binary files /dev/null and b/static/apple-touch-icon-180x180-precomposed.png differ diff --git a/static/apple-touch-icon-180x180.png b/static/apple-touch-icon-180x180.png new file mode 100644 index 0000000..f9cc77c Binary files /dev/null and b/static/apple-touch-icon-180x180.png differ diff --git a/static/apple-touch-icon-60x60-precomposed.png b/static/apple-touch-icon-60x60-precomposed.png new file mode 100644 index 0000000..d72cc0c Binary files /dev/null and b/static/apple-touch-icon-60x60-precomposed.png differ diff --git a/static/apple-touch-icon-60x60.png b/static/apple-touch-icon-60x60.png new file mode 100644 index 0000000..49734f9 Binary files /dev/null and b/static/apple-touch-icon-60x60.png differ diff --git a/static/apple-touch-icon-76x76-precomposed.png b/static/apple-touch-icon-76x76-precomposed.png new file mode 100644 index 0000000..39b4394 Binary files /dev/null and b/static/apple-touch-icon-76x76-precomposed.png differ diff --git a/static/apple-touch-icon-76x76.png b/static/apple-touch-icon-76x76.png new file mode 100644 index 0000000..144c384 Binary files /dev/null and b/static/apple-touch-icon-76x76.png differ diff --git a/static/apple-touch-icon-precomposed.png b/static/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..a66ae5a Binary files /dev/null and b/static/apple-touch-icon-precomposed.png differ diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png new file mode 100644 index 0000000..f9cc77c Binary files /dev/null and b/static/apple-touch-icon.png differ diff --git a/static/browserconfig.xml b/static/browserconfig.xml new file mode 100644 index 0000000..8440685 --- /dev/null +++ b/static/browserconfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + #2e0b78 + + + diff --git a/static/favicon-16x16.png b/static/favicon-16x16.png new file mode 100644 index 0000000..6a7cc12 Binary files /dev/null and b/static/favicon-16x16.png differ diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png new file mode 100644 index 0000000..2b565bc Binary files /dev/null and b/static/favicon-32x32.png differ diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..1b45edc Binary files /dev/null and b/static/favicon.ico differ diff --git a/static/favicon.png b/static/favicon.png deleted file mode 100644 index 825b9e6..0000000 Binary files a/static/favicon.png and /dev/null differ diff --git a/static/mstile-144x144.png b/static/mstile-144x144.png new file mode 100644 index 0000000..5e330de Binary files /dev/null and b/static/mstile-144x144.png differ diff --git a/static/mstile-150x150.png b/static/mstile-150x150.png new file mode 100644 index 0000000..2c0817a Binary files /dev/null and b/static/mstile-150x150.png differ diff --git a/static/mstile-310x150.png b/static/mstile-310x150.png new file mode 100644 index 0000000..8f709be Binary files /dev/null and b/static/mstile-310x150.png differ diff --git a/static/mstile-310x310.png b/static/mstile-310x310.png new file mode 100644 index 0000000..9d7c549 Binary files /dev/null and b/static/mstile-310x310.png differ diff --git a/static/mstile-70x70.png b/static/mstile-70x70.png new file mode 100644 index 0000000..58a9800 Binary files /dev/null and b/static/mstile-70x70.png differ diff --git a/static/safari-pinned-tab.svg b/static/safari-pinned-tab.svg new file mode 100644 index 0000000..4b38894 --- /dev/null +++ b/static/safari-pinned-tab.svg @@ -0,0 +1,28 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + + diff --git a/static/site.webmanifest b/static/site.webmanifest new file mode 100644 index 0000000..af209e2 --- /dev/null +++ b/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" +} diff --git a/static/style.css b/static/style.css index 6e84b17..244d6a4 100644 --- a/static/style.css +++ b/static/style.css @@ -1,30 +1,58 @@ body { - --color-text: #2F0C7A; - --color-bg: white; - --color-border: #17063B; - --color-link: #563ACC; - --color-link-visited: #858AFA; + --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: 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"; + --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); + color: var(--color-link); } a:visited { - color: var(--color-link-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; - } + 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); + } } \ No newline at end of file