novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Blacked the code

Browse source
This commit is contained in:
Eliot Berriot 2018-06-09 15:36:16 +02:00
commit 62ca3bd736
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
279 changed files with 8890 additions and 9556 deletions
Download patch file Download diff file Expand all files Collapse all files

15
api/funkwhale_api/history/activities.py
View file

@ -3,17 +3,14 @@ from funkwhale_api.activity import record
from . import serializers
record.registry.register_serializer(
serializers.ListeningActivitySerializer)
record.registry.register_serializer(serializers.ListeningActivitySerializer)
@record.registry.register_consumer('history.Listening')
@record.registry.register_consumer("history.Listening")
def broadcast_listening_to_instance_activity(data, obj):
if obj.user.privacy_level not in ['instance', 'everyone']:
if obj.user.privacy_level not in ["instance", "everyone"]:
return
channels.group_send('instance_activity', {
'type': 'event.send',
'text': '',
'data': data
})
channels.group_send(
"instance_activity", {"type": "event.send", "text": "", "data": data}
)

10
api/funkwhale_api/history/admin.py
View file

@ -2,11 +2,9 @@ from django.contrib import admin
from . import models
@admin.register(models.Listening)
class ListeningAdmin(admin.ModelAdmin):
list_display = ['track', 'creation_date', 'user', 'session_key']
search_fields = ['track__name', 'user__username']
list_select_related = [
'user',
'track'
]
list_display = ["track", "creation_date", "user", "session_key"]
search_fields = ["track__name", "user__username"]
list_select_related = ["user", "track"]

2
api/funkwhale_api/history/factories.py
View file

@ -11,4 +11,4 @@ class ListeningFactory(factory.django.DjangoModelFactory):
track = factory.SubFactory(factories.TrackFactory)
class Meta:
model = 'history.Listening'
model = "history.Listening"

52
api/funkwhale_api/history/migrations/0001_initial.py
View file

@ -9,22 +9,52 @@ import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('music', '0008_auto_20160529_1456'),
("music", "0008_auto_20160529_1456"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Listening',
name="Listening",
fields=[
('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
('end_date', models.DateTimeField(null=True, blank=True, default=django.utils.timezone.now)),
('session_key', models.CharField(null=True, blank=True, max_length=100)),
('track', models.ForeignKey(related_name='listenings', to='music.Track', on_delete=models.CASCADE)),
('user', models.ForeignKey(blank=True, null=True, related_name='listenings', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
(
"id",
models.AutoField(
verbose_name="ID",
primary_key=True,
serialize=False,
auto_created=True,
),
),
(
"end_date",
models.DateTimeField(
null=True, blank=True, default=django.utils.timezone.now
),
),
(
"session_key",
models.CharField(null=True, blank=True, max_length=100),
),
(
"track",
models.ForeignKey(
related_name="listenings",
to="music.Track",
on_delete=models.CASCADE,
),
),
(
"user",
models.ForeignKey(
blank=True,
null=True,
related_name="listenings",
to=settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
),
),
],
options={
'ordering': ('-end_date',),
},
),
options={"ordering": ("-end_date",)},
)
]

11
api/funkwhale_api/history/migrations/0002_auto_20180325_1433.py
View file

@ -5,18 +5,13 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('history', '0001_initial'),
]
dependencies = [("history", "0001_initial")]
operations = [
migrations.AlterModelOptions(
name='listening',
options={'ordering': ('-creation_date',)},
name="listening", options={"ordering": ("-creation_date",)}
),
migrations.RenameField(
model_name='listening',
old_name='end_date',
new_name='creation_date',
model_name="listening", old_name="end_date", new_name="creation_date"
),
]

16
api/funkwhale_api/history/models.py
View file

@ -6,21 +6,21 @@ from funkwhale_api.music.models import Track
class Listening(models.Model):
creation_date = models.DateTimeField(
default=timezone.now, null=True, blank=True)
creation_date = models.DateTimeField(default=timezone.now, null=True, blank=True)
track = models.ForeignKey(
Track, related_name="listenings", on_delete=models.CASCADE)
Track, related_name="listenings", on_delete=models.CASCADE
)
user = models.ForeignKey(
'users.User',
"users.User",
related_name="listenings",
null=True,
blank=True,
on_delete=models.CASCADE)
on_delete=models.CASCADE,
)
session_key = models.CharField(max_length=100, null=True, blank=True)
class Meta:
ordering = ('-creation_date',)
ordering = ("-creation_date",)
def get_activity_url(self):
return '{}/listenings/tracks/{}'.format(
self.user.get_activity_url(), self.pk)
return "{}/listenings/tracks/{}".format(self.user.get_activity_url(), self.pk)

22
api/funkwhale_api/history/serializers.py
View file

@ -9,35 +9,27 @@ from . import models
class ListeningActivitySerializer(activity_serializers.ModelSerializer):
type = serializers.SerializerMethodField()
object = TrackActivitySerializer(source='track')
actor = UserActivitySerializer(source='user')
published = serializers.DateTimeField(source='creation_date')
object = TrackActivitySerializer(source="track")
actor = UserActivitySerializer(source="user")
published = serializers.DateTimeField(source="creation_date")
class Meta:
model = models.Listening
fields = [
'id',
'local_id',
'object',
'type',
'actor',
'published'
]
fields = ["id", "local_id", "object", "type", "actor", "published"]
def get_actor(self, obj):
return UserActivitySerializer(obj.user).data
def get_type(self, obj):
return 'Listen'
return "Listen"
class ListeningSerializer(serializers.ModelSerializer):
class Meta:
model = models.Listening
fields = ('id', 'user', 'track', 'creation_date')
fields = ("id", "user", "track", "creation_date")
def create(self, validated_data):
validated_data['user'] = self.context['user']
validated_data["user"] = self.context["user"]
return super().create(validated_data)

3
api/funkwhale_api/history/urls.py
View file

@ -2,7 +2,8 @@ from django.conf.urls import include, url
from . import views
from rest_framework import routers
router = routers.SimpleRouter()
router.register(r'listenings', views.ListeningViewSet, 'listenings')
router.register(r"listenings", views.ListeningViewSet, "listenings")
urlpatterns = router.urls

7
api/funkwhale_api/history/views.py
View file

@ -12,9 +12,8 @@ from . import serializers
class ListeningViewSet(
mixins.CreateModelMixin,
mixins.RetrieveModelMixin,
viewsets.GenericViewSet):
mixins.CreateModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet
):
serializer_class = serializers.ListeningSerializer
queryset = models.Listening.objects.all()
@ -31,5 +30,5 @@ class ListeningViewSet(
def get_serializer_context(self):
context = super().get_serializer_context()
context['user'] = self.request.user
context["user"] = self.request.user
return context