Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
petitminion
funkwhale
Commits
7e994e64
Commit
7e994e64
authored
Jan 03, 2022
by
petitminion
Browse files
Merge branch 'develop' of
https://dev.funkwhale.audio/funkwhale/funkwhale
into develop
parents
7864496d
742f843c
Pipeline
#17883
failed with stages
in 3 minutes and 19 seconds
Changes
58
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
7e994e64
...
...
@@ -10,6 +10,77 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
1.2.0 (2021-12-27)
------------------
Upgrade instructions are available at
https://docs.funkwhale.audio/admin/upgrading.html
Features:
- Implemented awesome recently added radio (part of #1390)
- Rework the instance about page (#1376)
- Made changes to the track table to make it more visibly pleasing
Enhancements:
- Add linting for Frontend code (#1602)
- Add xmlns:content to feed schemas fixes #1535
- Add a Maloja plugin to submit listenings
- Add artist cover art in subsonic API response (#1528)
- Allow listen activities privacy level to be set public
- Allow running multi-container setup on non-root user inside docker (!1375) (fixes #1334)
- Change volume dynamic range from 60dB to 40dB (fixes #1544)
- Change Start Radio to Play Radio (#1400)
- Display toast when subsonic password is copied (#1496)
- Expose more metadata in Subsonic's getAlbumList endpoint (#623)
- ListenBrainz: Submit media player and submission client information
- Make "play in list" the default when interacting with individual tracks (#1274)
- Prevent an uncontrolled exception when uploading a file without tags, and prints user friendly message (1275)
- Remove deprecated JWT Authentication (#1108) (1108)
- Remove Raven SDK to report errors to Sentry (#1425) (1425)
- Replace psycopg2-binary with psycopg2 (#1513)
Bugfixes:
- Add worker-src to nginx header to prevent issues (#1489)
- Enable stepless adjustment of the volume slider (!1294)
- Fix an error in a Subsonic methods that return lists of numbers/strings like getUser
- Fix showing too long radio descriptions (#1556)
- Fix X-Frame-Options HTTP header for embed and force it to SAMEORIGIN value for other pages (fix #1022)
- Fix before last track starts playing when last track removed (#1485)
- Fix delete account button is not disalbed when missing password (#1591)
- Fix omputed properties already defined in components data (#1649)
- Fix the all in one docker image building process, related to #1503
- Fix crash in album moderation interface when missing cover (#1474)
- Fix subsonic scrobble not triggering plugin hook (#1416)
- Improve formatting of RSS episode descriptions (#1405)
- Only suggest typed tag once if it already exists
- Partially fixed playing two tracks at same time (#1213)
- Revert changes that break mobile browser playback (#1509)
- Sanitize remote tracks' saving locations with slashes on their names (#1435)
- Show embed option for channel tracks (#1278)
- Store volume in logarithmic scale and convert when setting it to audio (fixes #1543)
- Use global Howler volume instead of setting it separatly for each track (fixes #1542)
Documentation:
- Add email configuration to the documentation (#1481)
- Add server uninstallation documentation (\!1314)
- Document location of cli env file on macOS (\!1354)
- Fix broken backup documentation (#1345)
- Refactore installation documentation and other small documentation adjustments (\!1314)
- Add User documentation for built-in plugins
Other:
- Create stable branch, master is now deprecated and will be removed in 1.3 (#1476)
1.1.4 (2021-08-02)
------------------
...
...
CONTRIBUTING.rst
View file @
7e994e64
...
...
@@ -76,6 +76,11 @@ This is already cover in the relevant documentations:
- https://docs.docker.com/install/
- https://docs.docker.com/compose/install/
.. note::
If you are on Fedora, know that you can't use `podman` or `moby-engine` to set up the development environment.
Stick to `docker-ce` and you'll be fine.
Cloning the project
^^^^^^^^^^^^^^^^^^^
...
...
api/funkwhale_api/__init__.py
View file @
7e994e64
# -*- coding: utf-8 -*-
__version__
=
"1.2.0
-rc1
"
__version__
=
"1.2.0"
__version_info__
=
tuple
(
[
int
(
num
)
if
num
.
isdigit
()
else
num
...
...
api/funkwhale_api/music/serializers.py
View file @
7e994e64
...
...
@@ -214,7 +214,10 @@ class AlbumSerializer(OptionalDescriptionMixin, serializers.Serializer):
def
get_is_playable
(
self
,
obj
):
try
:
return
any
(
[
bool
(
getattr
(
t
,
"playable_uploads"
,
[]))
for
t
in
obj
.
tracks
.
all
()]
[
bool
(
getattr
(
t
,
"is_playable_by_actor"
,
None
))
for
t
in
obj
.
tracks
.
all
()
]
)
except
AttributeError
:
return
None
...
...
api/funkwhale_api/music/views.py
View file @
7e994e64
...
...
@@ -185,9 +185,7 @@ class AlbumViewSet(
queryset
=
(
models
.
Album
.
objects
.
all
()
.
order_by
(
"-creation_date"
)
.
prefetch_related
(
"artist__channel"
,
"attributed_to"
,
"attachment_cover"
,
"tracks"
)
.
prefetch_related
(
"artist__channel"
,
"attributed_to"
,
"attachment_cover"
)
)
serializer_class
=
serializers
.
AlbumSerializer
permission_classes
=
[
oauth_permissions
.
ScopePermission
]
...
...
@@ -223,8 +221,14 @@ class AlbumViewSet(
queryset
=
queryset
.
exclude
(
artist__channel
=
None
).
filter
(
artist__attributed_to
=
self
.
request
.
user
.
actor
)
qs
=
queryset
.
prefetch_related
(
TAG_PREFETCH
)
return
qs
tracks
=
models
.
Track
.
objects
.
all
().
prefetch_related
(
"album"
)
tracks
=
tracks
.
annotate_playable_by_actor
(
utils
.
get_actor_from_request
(
self
.
request
)
)
return
queryset
.
prefetch_related
(
Prefetch
(
"tracks"
,
queryset
=
tracks
),
TAG_PREFETCH
)
libraries
=
action
(
methods
=
[
"get"
],
detail
=
True
)(
get_libraries
(
filter_uploads
=
lambda
o
,
uploads
:
uploads
.
filter
(
track__album
=
o
))
...
...
api/tests/music/test_views.py
View file @
7e994e64
...
...
@@ -58,7 +58,12 @@ def test_album_list_serializer(api_request, factories, logged_in_api_client):
).
track
album
=
track
.
album
request
=
api_request
.
get
(
"/"
)
qs
=
album
.
__class__
.
objects
.
with_tracks_count
()
tracks
=
models
.
Track
.
objects
.
all
().
prefetch_related
(
"album"
)
tracks
=
tracks
.
annotate_playable_by_actor
(
None
)
qs
=
album
.
__class__
.
objects
.
with_tracks_count
().
annotate_playable_by_actor
(
None
)
qs
=
qs
.
prefetch_related
(
Prefetch
(
"tracks"
,
queryset
=
tracks
))
serializer
=
serializers
.
AlbumSerializer
(
qs
,
many
=
True
,
context
=
{
"request"
:
request
}
)
...
...
changes/changelog.d/1022.bugfix
deleted
100644 → 0
View file @
7864496d
Fix X-Frame-Options HTTP header for embed and force it to SAMEORIGIN value for other pages (fix #1022)
changes/changelog.d/1108.enhancement
deleted
100644 → 0
View file @
7864496d
Remove deprecated JWT Authentication (#1108) (1108)
changes/changelog.d/1213.bugfix
deleted
100644 → 0
View file @
7864496d
Partially fixed playing two tracks at same time (#1213)
changes/changelog.d/1274.enhancement
deleted
100644 → 0
View file @
7864496d
Make "play in list" the default when interacting with individual tracks (#1274)
changes/changelog.d/1275.enhancement
deleted
100644 → 0
View file @
7864496d
Prevents an uncontrolled exception when uploading a file without tags, and prints user friendly message (1275)
changes/changelog.d/1278.bugfix
deleted
100644 → 0
View file @
7864496d
Show embed option for channel tracks (#1278)
changes/changelog.d/1294.bugfix
deleted
100644 → 0
View file @
7864496d
Enable stepless adjustment of the volume slider (!1294)
changes/changelog.d/1314.doc
deleted
100644 → 0
View file @
7864496d
Added server uninstallation documentation (\!1314)
changes/changelog.d/1334.enhancement
deleted
100644 → 0
View file @
7864496d
Allow running multi-container setup on non-root user inside docker (!1375) (fixes #1334)
changes/changelog.d/1345.doc
deleted
100644 → 0
View file @
7864496d
Fixed broken backup documentation (#1345)
changes/changelog.d/1376.feature
deleted
100644 → 0
View file @
7864496d
Rework
the
instance
about
page
(
#1376)
changes/changelog.d/1390.feature
deleted
100644 → 0
View file @
7864496d
Implemented
awesome
recently
added
radio
(part
of
#1390)
changes/changelog.d/1400.enhancement
deleted
100644 → 0
View file @
7864496d
Changin Start Radio to Play Radio (#1400)
changes/changelog.d/1405.bugfix
deleted
100644 → 0
View file @
7864496d
Improve formatting of RSS episode descriptions (#1405)
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment