yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 04:29:23 +02:00
Code Issues Releases Wiki Activity

Ensure radio tracks only return playable tracks

Browse source
This commit is contained in:
Eliot Berriot 2018-09-28 22:19:43 +02:00
parent 4d425e92ee
commit ec3fcefabf
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
5 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/funkwhale_api/music/models.py
View file

@ -576,7 +576,7 @@ TRACK_FILE_IMPORT_STATUS_CHOICES = (
def get_file_path(instance, filename):
if instance.library.actor.is_local:
if instance.library.actor.get_user():
return common_utils.ChunkedPath("tracks")(instance, filename)
else:
# we cache remote tracks in a different directory
@ -725,7 +725,7 @@ class Upload(models.Model):
self.mimetype = mimetypes.guess_type(self.source)[0]
if not self.size and self.audio_file:
self.size = self.audio_file.size
if not self.pk and not self.fid and self.library.actor.is_local:
if not self.pk and not self.fid and self.library.actor.get_user():
self.fid = self.get_federation_id()
return super().save(**kwargs)
@ -908,7 +908,7 @@ class Library(federation_models.FederationMixin):
def should_autoapprove_follow(self, actor):
if self.privacy_level == "everyone":
return True
if self.privacy_level == "instance" and actor.is_local:
if self.privacy_level == "instance" and actor.get_user():
return True
return False