aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/federation
diff options
context:
space:
mode:
authorJessica Tallon <xray7224@googlemail.com>2013-08-14 17:51:36 +0100
committerJessica Tallon <jessica@megworld.co.uk>2014-07-22 23:13:14 +0100
commitbdde87a4b3a584a2dde5803b1a069496aee73daf (patch)
tree3ddbe28238fc67dd60c2d9e1374a49d4922cf25d /mediagoblin/federation
parent5a2056f7386371bd84b9481380235bb0f06ca149 (diff)
downloadmediagoblin-bdde87a4b3a584a2dde5803b1a069496aee73daf.tar.lz
mediagoblin-bdde87a4b3a584a2dde5803b1a069496aee73daf.tar.xz
mediagoblin-bdde87a4b3a584a2dde5803b1a069496aee73daf.zip
Changes serialization to .serialize method on object - MediaEntry
Diffstat (limited to 'mediagoblin/federation')
-rw-r--r--mediagoblin/federation/views.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py
index de9084d0..3fe5b3b5 100644
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/federation/views.py
@@ -39,25 +39,6 @@ def inbox(request):
""" Handles the user's inbox - /api/user/<username>/inbox """
raise NotImplemented("Yet to implement looking up user's inbox")
-def image_object(request, media):
- """ Return image object - /api/image/<uuid> """
- author = media.get_uploader
- url = request.urlgen(
- "mediagoblin.user_pages.media_home",
- user=author.username,
- media=media.slug,
- qualified=True
- )
-
- context = {
- "author": author.serialize(request),
- "displayName": media.title,
- "objectType": "image",
- "url": url,
- }
-
- return json_response(context)
-
@oauth_required
def object(request):
""" Lookup for a object type """
@@ -74,5 +55,4 @@ def object(request):
error = "Can't find a {0} with ID = {1}".format(objectType, uuid)
return json_response({"error": error}, status=404)
- if objectType == "image":
- return image_object(request, media)
+ return json_response(media.serialize(request))