|
@@ -56,6 +56,7 @@ from scrobbles.utils import (
|
|
|
get_long_plays_completed,
|
|
|
get_long_plays_in_progress,
|
|
|
)
|
|
|
+from moods.models import Mood
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
@@ -66,15 +67,17 @@ class ScrobbleableListView(ListView):
|
|
|
|
|
|
def get_queryset(self):
|
|
|
queryset = super().get_queryset()
|
|
|
+ if self.model == Mood:
|
|
|
+ return queryset
|
|
|
+
|
|
|
user_filter = Q()
|
|
|
if not self.request.user.is_anonymous:
|
|
|
user_filter = Q(scrobble__user=self.request.user)
|
|
|
+
|
|
|
queryset = (
|
|
|
- queryset.annotate(
|
|
|
- scrobble_count=Count("scrobble"),
|
|
|
- )
|
|
|
- .filter(user_filter, scrobble_count__gt=0)
|
|
|
- .order_by("-scrobble_count")
|
|
|
+ queryset.filter(user_filter).annotate(
|
|
|
+ scrobble_count=Count("scrobble")
|
|
|
+ ).filter(scrobble_count__gt=0).order_by("-scrobble_count")
|
|
|
)
|
|
|
return queryset
|
|
|
|