Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Auri
funkwhale
Commits
942e9a15
Verified
Commit
942e9a15
authored
Dec 27, 2018
by
Eliot Berriot
Browse files
Linting
parent
91d99a03
Changes
4
Hide whitespace changes
Inline
Side-by-side
api/funkwhale_api/federation/serializers.py
View file @
942e9a15
...
...
@@ -114,8 +114,7 @@ class ActorSerializer(serializers.Serializer):
if
maf
is
not
None
:
kwargs
[
"manually_approves_followers"
]
=
maf
domain
=
urllib
.
parse
.
urlparse
(
kwargs
[
"fid"
]).
netloc
kwargs
[
"domain"
]
=
models
.
Domain
.
objects
.
get_or_create
(
pk
=
domain
)[
0
]
kwargs
[
"domain"
]
=
models
.
Domain
.
objects
.
get_or_create
(
pk
=
domain
)[
0
]
for
endpoint
,
url
in
self
.
initial_data
.
get
(
"endpoints"
,
{}).
items
():
if
endpoint
==
"sharedInbox"
:
kwargs
[
"shared_inbox_url"
]
=
url
...
...
@@ -897,7 +896,4 @@ class NodeInfoLinkSerializer(serializers.Serializer):
class
NodeInfoSerializer
(
serializers
.
Serializer
):
links
=
serializers
.
ListField
(
child
=
NodeInfoLinkSerializer
(),
min_length
=
1
)
\ No newline at end of file
links
=
serializers
.
ListField
(
child
=
NodeInfoLinkSerializer
(),
min_length
=
1
)
api/funkwhale_api/manage/views.py
View file @
942e9a15
...
...
@@ -99,7 +99,7 @@ class ManageInvitationViewSet(
class
ManageDomainViewSet
(
mixins
.
ListModelMixin
,
mixins
.
RetrieveModelMixin
,
viewsets
.
GenericViewSet
):
lookup_value_regex
=
"[a-zA-Z0-9\-\.]+"
lookup_value_regex
=
r
"[a-zA-Z0-9\-\.]+"
queryset
=
(
federation_models
.
Domain
.
objects
.
external
()
.
with_last_activity_date
()
...
...
api/funkwhale_api/music/models.py
View file @
942e9a15
...
...
@@ -618,7 +618,8 @@ class UploadQuerySet(models.QuerySet):
return
self
.
filter
(
import_status
=
"finished"
,
mimetype__startswith
=
"audio/"
)
def
with_file
(
self
):
return
self
.
exclude
(
audio_file
=
None
).
exclude
(
audio_file
=
''
)
return
self
.
exclude
(
audio_file
=
None
).
exclude
(
audio_file
=
""
)
TRACK_FILE_IMPORT_STATUS_CHOICES
=
(
(
"pending"
,
"Pending"
),
...
...
api/tests/manage/test_views.py
View file @
942e9a15
...
...
@@ -107,9 +107,7 @@ def test_domain_nodeinfo(factories, superuser_api_client, mocker):
def
test_domain_stats
(
factories
,
superuser_api_client
,
mocker
):
domain
=
factories
[
"federation.Domain"
]()
get_stats
=
mocker
.
patch
.
object
(
domain
.
__class__
,
"get_stats"
,
return_value
=
{
"hello"
:
"world"
}
)
mocker
.
patch
.
object
(
domain
.
__class__
,
"get_stats"
,
return_value
=
{
"hello"
:
"world"
})
url
=
reverse
(
"api:v1:manage:federation:domains-stats"
,
kwargs
=
{
"pk"
:
domain
.
name
})
response
=
superuser_api_client
.
get
(
url
)
assert
response
.
status_code
==
200
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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