Add flairs CSS animations

.well-known/funding-manifest-urls

@@ -0,0 +1 @@
+https://metabrainz.org/funding.json

Dockerfile

@@ -153,6 +153,12 @@ COPY ./docker/services/spotify_reader/spotify_reader.service /etc/service/spotif
 COPY ./docker/services/spotify_reader/spotify_reader.finish /etc/service/spotify_reader/finish
 RUN touch /etc/service/spotify_reader/down
 
+# Last.fm importer
+COPY ./docker/services/lastfm_importer/consul-template-lastfm-importer.conf /etc/consul-template-lastfm-importer.conf
+COPY ./docker/services/lastfm_importer/lastfm_importer.service /etc/service/lastfm_importer/run
+COPY ./docker/services/lastfm_importer/lastfm_importer.finish /etc/service/lastfm_importer/finish
+RUN touch /etc/service/lastfm_importer/down
+
 # Timescale writer
 COPY ./docker/services/timescale_writer/consul-template-timescale-writer.conf /etc/consul-template-timescale-writer.conf
 COPY ./docker/services/timescale_writer/timescale_writer.service /etc/service/timescale_writer/run

admin/sql/create_tables.sql

@@ -126,7 +126,7 @@ CREATE TABLE external_service_oauth (
     user_id                 INTEGER NOT NULL,  -- FK to "user".id
     external_user_id        TEXT,
     service                 external_service_oauth_type NOT NULL,
-    access_token            TEXT NOT NULL,
+    access_token            TEXT,
     refresh_token           TEXT,
     token_expires           TIMESTAMP WITH TIME ZONE,
     last_updated            TIMESTAMP WITH TIME ZONE DEFAULT NOW(),

admin/sql/updates/2024-08-02-make-external-service-access-token-nullable.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE external_service_oauth ALTER COLUMN access_token DROP NOT NULL;
+
+COMMIT;

docker/docker-compose.yml

@@ -106,13 +106,24 @@ services:
     image: web
     volumes:
       - ..:/code/listenbrainz:z
-    command: python3 -m "listenbrainz.spotify_updater.spotify_read_listens"
+    command: python3 -m "listenbrainz.listens_importer.spotify"
     user: "${LB_DOCKER_USER:-root}:${LB_DOCKER_GROUP:-root}"
     depends_on:
       - redis
       - lb_db
       - rabbitmq
 
+  lastfm_importer:
+    image: web
+    volumes:
+      - ..:/code/listenbrainz:z
+    command: python3 -m "listenbrainz.listens_importer.lastfm"
+    user: "${LB_DOCKER_USER:-root}:${LB_DOCKER_GROUP:-root}"
+    depends_on:
+      - redis
+      - rabbitmq
+      - lb_db
+
   websockets:
     image: web
     volumes:

docker/rc.local

@@ -43,6 +43,13 @@ then
     rm -f /etc/service/spotify_reader/down
 fi
 
+if [ "${CONTAINER_NAME}" = "listenbrainz-lastfm-reader-${DEPLOY_ENV}" ]
+then
+    log Enabling last.fm importer
+    rm -f /etc/service/lastfm_importer/down
+fi
+
+
 if [ "${CONTAINER_NAME}" = "listenbrainz-spark-reader-${DEPLOY_ENV}" ]
 then
     log Enabling spark reader

docker/services/lastfm_importer/consul-template-lastfm-importer.conf

@@ -0,0 +1,12 @@
+template {
+    source = "/code/listenbrainz/consul_config.py.ctmpl"
+    destination = "/code/listenbrainz/listenbrainz/config.py"
+}
+
+exec {
+    command = ["run-lb-command", "python3", "-m", "listenbrainz.listens_importer.lastfm"]
+    splay = "5s"
+    reload_signal = "SIGHUP"
+    kill_signal = "SIGTERM"
+    kill_timeout = "30s"
+}

docker/services/lastfm_importer/lastfm_importer.finish

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+export service="lastfm-importer"
+
+. /etc/lb-startup-common.sh
+
+
+generate_message "$service" "$@"
+
+log "$message"
+
+send_sentry_message "$message"
+
+if [ "$1" != "0" ]; then
+  log "Exited with non-0 status, sleeping 10 seconds"
+  sleep 10
+fi

docker/services/lastfm_importer/lastfm_importer.service

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sleep 1
+exec run-consul-template -config /etc/consul-template-lastfm-importer.conf

docker/services/spotify_reader/consul-template-spotify-reader.conf

@@ -4,7 +4,7 @@ template {
 }
 
 exec {
-    command = ["run-lb-command", "python3", "-m", "listenbrainz.spotify_updater.spotify_read_listens"]
+    command = ["run-lb-command", "python3", "-m", "listenbrainz.listens_importer.spotify"]
     splay = "5s"
     reload_signal = "SIGHUP"
     kill_signal = "SIGTERM"

docs/users/api_usage_examples/set_latest_import.py

@@ -6,7 +6,8 @@
 DEBUG = True
 ROOT = 'http://localhost:8100' if DEBUG else 'https://api.listenbrainz.org'
 
-def set_latest_import(timestamp, token, service="lastfm"):
+
+def set_latest_import(timestamp, token, service="librefm"):
     """Sets the time of the latest import.
 
     Args:

frontend/css/brainzplayer.less

@@ -213,6 +213,16 @@
         stroke: #dedede !important;
         color: #dedede !important;
       }
+      &.music-service-icon {
+        max-width: 1.5em;
+        > svg {
+          // Youtube forces us to follow their branding guidelines to the letter,
+          // so we need to force a minimum height of 20px for the icon path inside the svg
+          // [poo emoji]
+          min-height: 26.7px;
+          vertical-align: middle;
+        }
+      }
     }
 
     .love,
@@ -348,7 +358,7 @@
   transition: bottom 1s ease-in-out;
   width: 100%;
   max-width: 550px;
-  height: 500px;
+  height: min(500px, 100vh ~"-" @brainzplayer-height);
   background-color: #f8f8f8;
   border-top: 1px solid #ccc;
   box-shadow: -6px -1px 10px rgba(0, 0, 0, 0.2);