From 78ab153734b9c4f0c45e6a0c4a9cf90acf37ff7a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 2 Jul 2019 12:00:52 +0200
Subject: [PATCH 1/5] Fixed flaky tests because of license cache

---
 api/tests/conftest.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/api/tests/conftest.py b/api/tests/conftest.py
index a1baedcc6..d87e39374 100644
--- a/api/tests/conftest.py
+++ b/api/tests/conftest.py
@@ -29,6 +29,7 @@ from rest_framework.test import APIClient, APIRequestFactory
 
 from funkwhale_api.activity import record
 from funkwhale_api.federation import actors
+from funkwhale_api.music import licenses
 
 
 pytest_plugins = "aiohttp.pytest_plugin"
@@ -422,3 +423,10 @@ def a_responses():
 @pytest.fixture
 def service_actor(db):
     return actors.get_service_actor()
+
+
+@pytest.fixture(autouse=True)
+def clear_license_cache(db):
+    licenses._cache = None
+    yield
+    licenses._cache = None

From b20b1accffe02b920fff77c6594aa28dbab85017 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 2 Jul 2019 13:37:10 +0200
Subject: [PATCH 2/5] Fixed front-error with undefined currentTrack

---
 front/src/components/audio/album/Card.vue | 2 +-
 front/src/components/audio/track/Row.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue
index db6e8de6b..1012cc578 100644
--- a/front/src/components/audio/album/Card.vue
+++ b/front/src/components/audio/album/Card.vue
@@ -20,7 +20,7 @@
             <tbody>
               <tr v-for="track in tracks">
                 <td class="play-cell">
-                  <play-button :class="['basic', {orange: isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :track="track"></play-button>
+                  <play-button :class="['basic', {orange: currentTrack && isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :track="track"></play-button>
                 </td>
                 <td class="content-cell" colspan="5">
                   <track-favorite-icon :track="track"></track-favorite-icon>
diff --git a/front/src/components/audio/track/Row.vue b/front/src/components/audio/track/Row.vue
index 90d057960..624467f21 100644
--- a/front/src/components/audio/track/Row.vue
+++ b/front/src/components/audio/track/Row.vue
@@ -1,7 +1,7 @@
 <template>
   <tr>
     <td>
-      <play-button :class="['basic', {orange: isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :is-playable="playable" :track="track"></play-button>
+      <play-button :class="['basic', {orange: currentTrack && isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :is-playable="playable" :track="track"></play-button>
     </td>
     <td>
       <img class="ui mini image" v-if="track.album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](track.album.cover.small_square_crop)">

From 7a6ba83d0347b38873c8ce1faa5288e3f53c2e14 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 2 Jul 2019 13:40:09 +0200
Subject: [PATCH 3/5] Handle Cross-Origin canvas error in player

---
 front/src/components/audio/Player.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 8faaf670c..f074c14e0 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -356,7 +356,11 @@ export default {
         return
       }
       let image = this.$refs.cover
-      this.ambiantColors = ColorThief.prototype.getPalette(image, 4).slice(0, 4)
+      try {
+        this.ambiantColors = ColorThief.prototype.getPalette(image, 4).slice(0, 4)
+      } catch (e) {
+        console.log('Cannot generate player background from cover image, likely a cross-origin tainted canvas issue')
+      }
     },
     handleError({ sound, error }) {
       this.$store.commit("player/isLoadingAudio", false)

From 7897c8ac7f933d887ada8a061f25dafc8bdb0e75 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 3 Jul 2019 11:06:13 +0200
Subject: [PATCH 4/5] Fix #879: Admins can now add custom CSS from their pod
 settings

---
 api/funkwhale_api/common/middleware.py        | 17 ++++++-
 .../instance/dynamic_preferences_registry.py  | 17 +++++++
 api/tests/common/test_middleware.py           | 44 +++++++++++++++++++
 changes/changelog.d/879.feature               |  1 +
 front/src/views/admin/Settings.vue            |  6 +++
 5 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/879.feature

diff --git a/api/funkwhale_api/common/middleware.py b/api/funkwhale_api/common/middleware.py
index 59d50b30e..c7bcf4b19 100644
--- a/api/funkwhale_api/common/middleware.py
+++ b/api/funkwhale_api/common/middleware.py
@@ -1,5 +1,6 @@
 import html
 import requests
+import xml.sax.saxutils
 
 from django import http
 from django.conf import settings
@@ -51,7 +52,13 @@ def serve_spa(request):
 
     # let's inject our meta tags in the HTML
     head += "\n" + "\n".join(render_tags(final_tags)) + "\n</head>"
-
+    css = get_custom_css() or ""
+    if css:
+        # We add the style add the end of the body to ensure it has the highest
+        # priority (since it will come after other stylesheets)
+        body, tail = tail.split("</body>", 1)
+        css = "<style>{}</style>".format(css)
+        tail = body + "\n" + css + "\n</body>" + tail
     return http.HttpResponse(head + tail)
 
 
@@ -128,6 +135,14 @@ def get_request_head_tags(request):
     return match.func(request, *match.args, **match.kwargs)
 
 
+def get_custom_css():
+    css = preferences.get("ui__custom_css").strip()
+    if not css:
+        return
+
+    return xml.sax.saxutils.escape(css)
+
+
 class SPAFallbackMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
diff --git a/api/funkwhale_api/instance/dynamic_preferences_registry.py b/api/funkwhale_api/instance/dynamic_preferences_registry.py
index 844fbb08b..9d1f1c8f7 100644
--- a/api/funkwhale_api/instance/dynamic_preferences_registry.py
+++ b/api/funkwhale_api/instance/dynamic_preferences_registry.py
@@ -4,6 +4,7 @@ from dynamic_preferences.registries import global_preferences_registry
 
 raven = types.Section("raven")
 instance = types.Section("instance")
+ui = types.Section("ui")
 
 
 @global_preferences_registry.register
@@ -98,3 +99,19 @@ class InstanceNodeinfoStatsEnabled(types.BooleanPreference):
         "Disable this if you don't want to share usage and library statistics "
         "in the nodeinfo endpoint but don't want to disable it completely."
     )
+
+
+@global_preferences_registry.register
+class CustomCSS(types.StringPreference):
+    show_in_api = True
+    section = ui
+    name = "custom_css"
+    verbose_name = "Custom CSS code"
+    default = ""
+    help_text = (
+        "Custom CSS code, to be included in a <style> tag on all pages. "
+        "Loading third-party resources such as fonts or images can affect the performance "
+        "of the app and the privacy of your users."
+    )
+    widget = widgets.Textarea
+    field_kwargs = {"required": False}
diff --git a/api/tests/common/test_middleware.py b/api/tests/common/test_middleware.py
index dd7cd7634..9361748f3 100644
--- a/api/tests/common/test_middleware.py
+++ b/api/tests/common/test_middleware.py
@@ -141,3 +141,47 @@ def test_get_route_head_tags(mocker, settings):
     assert tags == match.func.return_value
     match.func.assert_called_once_with(request, *[], **{"pk": 42})
     resolve.assert_called_once_with(request.path, urlconf=settings.SPA_URLCONF)
+
+
+def test_serve_spa_includes_custom_css(mocker, no_api_auth):
+    request = mocker.Mock(path="/")
+    mocker.patch.object(
+        middleware,
+        "get_spa_html",
+        return_value="<html><head></head><body></body></html>",
+    )
+    mocker.patch.object(middleware, "get_default_head_tags", return_value=[])
+    mocker.patch.object(middleware, "get_request_head_tags", return_value=[])
+    get_custom_css = mocker.patch.object(
+        middleware, "get_custom_css", return_value="body { background: black; }"
+    )
+    response = middleware.serve_spa(request)
+
+    assert response.status_code == 200
+    expected = [
+        "<html><head>\n\n</head><body>",
+        "<style>body { background: black; }</style>",
+        "</body></html>",
+    ]
+    get_custom_css.assert_called_once_with()
+    assert response.content == "\n".join(expected).encode()
+
+
+@pytest.mark.parametrize(
+    "custom_css, expected",
+    [
+        ("body { background: black; }", "body { background: black; }"),
+        (
+            "body { injection: </style> & Hello",
+            "body { injection: &lt;/style&gt; &amp; Hello",
+        ),
+        (
+            'body { background: url("image/url"); }',
+            'body { background: url("image/url"); }',
+        ),
+    ],
+)
+def test_get_custom_css(preferences, custom_css, expected):
+    preferences["ui__custom_css"] = custom_css
+
+    assert middleware.get_custom_css() == expected
diff --git a/changes/changelog.d/879.feature b/changes/changelog.d/879.feature
new file mode 100644
index 000000000..3763b1b58
--- /dev/null
+++ b/changes/changelog.d/879.feature
@@ -0,0 +1 @@
+Admins can now add custom CSS from their pod settings (#879)
diff --git a/front/src/views/admin/Settings.vue b/front/src/views/admin/Settings.vue
index 7102fb311..e7075bcc2 100644
--- a/front/src/views/admin/Settings.vue
+++ b/front/src/views/admin/Settings.vue
@@ -84,6 +84,7 @@ export default {
       let federationLabel = this.$pgettext('Content/Admin/Menu', 'Federation')
       let subsonicLabel = this.$pgettext('Content/Admin/Menu', 'Subsonic')
       let statisticsLabel = this.$pgettext('Content/Admin/Menu', 'Statistics')
+      let uiLabel = this.$pgettext('Content/Admin/Menu', 'User Interface')
       let errorLabel = this.$pgettext('Content/Admin/Menu', 'Error reporting')
       return [
         {
@@ -134,6 +135,11 @@ export default {
           id: "subsonic",
           settings: ["subsonic__enabled"]
         },
+        {
+          label: uiLabel,
+          id: "ui",
+          settings: ["ui__custom_css"]
+        },
         {
           label: statisticsLabel,
           id: "statistics",

From 38ab05195b7c6045e4a24d06f2fa84d14a156472 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 3 Jul 2019 11:35:34 +0200
Subject: [PATCH 5/5] Fix #867: Fixed remaining transcoding issue with Subsonic
 API

---
 api/funkwhale_api/subsonic/views.py | 2 +-
 api/tests/subsonic/test_views.py    | 9 +++++----
 changes/changelog.d/867.bugfix      | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 changes/changelog.d/867.bugfix

diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
index 52f37c870..909f7a6e4 100644
--- a/api/funkwhale_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -256,7 +256,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
         if max_bitrate:
             max_bitrate = max_bitrate * 1000
 
-        format = data.get("format", "raw") or None
+        format = data.get("format") or None
         if max_bitrate and not format:
             # specific bitrate requested, but no format specified
             # so we use a default one, cf #867. This helps with clients
diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py
index cde07ac53..e227f4d1d 100644
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
@@ -288,15 +288,16 @@ def test_stream_transcode(
     mocker,
     settings,
 ):
+    upload = factories["music.Upload"](playable=True)
+    params = {"id": upload.track.pk, "maxBitRate": max_bitrate}
+    if format:
+        params["format"] = format
     settings.SUBSONIC_DEFAULT_TRANSCODING_FORMAT = default_transcoding_format
     url = reverse("api:subsonic-stream")
     mocked_serve = mocker.patch.object(
         music_views, "handle_serve", return_value=Response()
     )
-    upload = factories["music.Upload"](playable=True)
-    response = logged_in_api_client.get(
-        url, {"id": upload.track.pk, "maxBitRate": max_bitrate, "format": format}
-    )
+    response = logged_in_api_client.get(url, params)
 
     mocked_serve.assert_called_once_with(
         upload=upload,
diff --git a/changes/changelog.d/867.bugfix b/changes/changelog.d/867.bugfix
new file mode 100644
index 000000000..ab690cc16
--- /dev/null
+++ b/changes/changelog.d/867.bugfix
@@ -0,0 +1 @@
+Fixed remaining transcoding issue with Subsonic API (#867)