From e1d7a31045f84d98453c2d2186e1c8f28d8d0b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <cda@rootkey.co.uk>
Date: Wed, 22 Jul 2020 11:38:41 +0100
Subject: [PATCH 1/3] Add support for Licence Art Libre

---
 api/funkwhale_api/music/licenses.py  | 13 +++++++++++++
 api/tests/music/licenses.json        | 13 +++++++++++++
 changes/changelog.d/1088.enhancement |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 changes/changelog.d/1088.enhancement

diff --git a/api/funkwhale_api/music/licenses.py b/api/funkwhale_api/music/licenses.py
index 599d6a7da..55ada319a 100644
--- a/api/funkwhale_api/music/licenses.py
+++ b/api/funkwhale_api/music/licenses.py
@@ -277,6 +277,19 @@ LICENSES = [
             "http://creativecommons.org/publicdomain/zero/1.0/"
         ],
     },
+    {
+        "code": "LAL-1.3",
+        "name": "Licence Art Libre 1.3",
+        "redistribute": True,
+        "derivative": True,
+        "commercial": True,
+        "attribution": True,
+        "copyleft": True,
+        "url": "https://artlibre.org/licence/lal",
+        "identifiers": [
+            "http://artlibre.org/licence/lal"
+        ]
+    },
     # Creative commons version 4.0
     get_cc_license(version="4.0", perks=["by"]),
     get_cc_license(version="4.0", perks=["by", "sa"]),
diff --git a/api/tests/music/licenses.json b/api/tests/music/licenses.json
index 5a2ecd132..689f2e919 100644
--- a/api/tests/music/licenses.json
+++ b/api/tests/music/licenses.json
@@ -4535,5 +4535,18 @@
         "identifiers": [
             "http://creativecommons.org/publicdomain/zero/1.0/"
         ]
+    },
+    {
+        "code": "LAL-1.3",
+        "name": "Licence Art Libre 1.3",
+        "redistribute": true,
+        "derivative": true,
+        "commercial": true,
+        "attribution": true,
+        "copyleft": true,
+        "url": "https://artlibre.org/licence/lal",
+        "identifiers": [
+            "http://artlibre.org/licence/lal"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/changes/changelog.d/1088.enhancement b/changes/changelog.d/1088.enhancement
new file mode 100644
index 000000000..150a7e2cd
--- /dev/null
+++ b/changes/changelog.d/1088.enhancement
@@ -0,0 +1 @@
+Added support for Licence Art Libre (#1088)
\ No newline at end of file
-- 
GitLab


From a5fdc230ffaf34344e534c606798b4b4b8e4df22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <cda@rootkey.co.uk>
Date: Wed, 22 Jul 2020 11:46:06 +0100
Subject: [PATCH 2/3] Fix linting issue

---
 api/funkwhale_api/music/licenses.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/funkwhale_api/music/licenses.py b/api/funkwhale_api/music/licenses.py
index 55ada319a..dc0494100 100644
--- a/api/funkwhale_api/music/licenses.py
+++ b/api/funkwhale_api/music/licenses.py
@@ -286,9 +286,7 @@ LICENSES = [
         "attribution": True,
         "copyleft": True,
         "url": "https://artlibre.org/licence/lal",
-        "identifiers": [
-            "http://artlibre.org/licence/lal"
-        ]
+        "identifiers": ["http://artlibre.org/licence/lal"],
     },
     # Creative commons version 4.0
     get_cc_license(version="4.0", perks=["by"]),
-- 
GitLab


From b0f77336a493a6d8b158770d36c456ec2132cca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20Ainsworth?= <cda@rootkey.co.uk>
Date: Thu, 23 Jul 2020 00:02:15 +0100
Subject: [PATCH 3/3] Fix position of license to pass api test

---
 api/tests/music/licenses.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/tests/music/licenses.json b/api/tests/music/licenses.json
index 689f2e919..4b6251c07 100644
--- a/api/tests/music/licenses.json
+++ b/api/tests/music/licenses.json
@@ -1,4 +1,17 @@
 [
+    {
+        "code": "LAL-1.3",
+        "name": "Licence Art Libre 1.3",
+        "redistribute": true,
+        "derivative": true,
+        "commercial": true,
+        "attribution": true,
+        "copyleft": true,
+        "url": "https://artlibre.org/licence/lal",
+        "identifiers": [
+            "http://artlibre.org/licence/lal"
+        ]
+    },
     {
         "name": "Creative commons - Attribution 1.0",
         "code": "cc-by-1.0",
@@ -4535,18 +4548,5 @@
         "identifiers": [
             "http://creativecommons.org/publicdomain/zero/1.0/"
         ]
-    },
-    {
-        "code": "LAL-1.3",
-        "name": "Licence Art Libre 1.3",
-        "redistribute": true,
-        "derivative": true,
-        "commercial": true,
-        "attribution": true,
-        "copyleft": true,
-        "url": "https://artlibre.org/licence/lal",
-        "identifiers": [
-            "http://artlibre.org/licence/lal"
-        ]
     }
 ]
\ No newline at end of file
-- 
GitLab