Merge branch 'master' of git.autistici.org:djrandom

server/djrandom/frontend/api_views.py

@@ -161,7 +161,7 @@ def most_played_json():
 @require_auth
 def last_uploaded_json():
     n = int(request.args.get('n', 20))
-    last_uploaded = [x.to_dict() for x in MP3.last_uploaded(n)]
+    last_uploaded = [x.sha1 for x in MP3.last_uploaded(n)]
     return jsonify(results=last_uploaded)
 
 

server/djrandom/model/mp3.py

@@ -39,7 +39,8 @@ class MP3(Base):
     @classmethod
     def last_uploaded(cls, n=10):
         """Return the N last uploaded songs."""
-        return cls.query.filter_by(ready=True).order_by('desc uploaded_at').limit(n)
+        return cls.query.filter_by(ready=True).order_by(
+            desc(cls.uploaded_at)).limit(n)
 
 
 class PlayLog(Base):