Add image URL's (thumb & full)

diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 3d96ba34e61c895fb2458afb77f15c30dde4ca6b..87f4383a45b6323e0201d37d2f2ac38ac7b6fc7d 100644 (file)
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -202,6 +202,17 @@ class MediaEntryMixin(GenerateSlugMixin):
             thumb_url = mg_globals.app.staticdirector(manager[u'default_thumb'])
         return thumb_url
 
+    @property
+    def original_url(self):
+        """ Returns the URL for the original image
+        will return self.thumb_url if original url doesn't exist"""
+        if u"original" not in self.media_files:
+            return self.thumb_url
+        
+        return mg_globals.app.public_store.file_url(
+            self.media_files[u"original"]
+            )
+
     @cached_property
     def media_manager(self):
         """Returns the MEDIA_MANAGER of the media's media_type

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 281c09d96caaea9530633c8275a23553c7f70dc6..925f0d24e9597add7017fb5faa11a5696e24284a 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -455,6 +455,12 @@ class MediaEntry(Base, MediaEntryMixin):
             "displayName": self.title,
             "objectType": self.objectType,
             "url": url,
+            "image": {
+                "url": request.host_url + self.thumb_url[1:],
+            },
+            "fullImage":{
+                "url": request.host_url + self.original_url[1:],
+            }
         }
 
         if show_comments:

diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py
index b3f63db5e904dde4a919d394b62941f611f5069c..3fe5b3b5899297868c0d52cf18091b39640073de 100644 (file)
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/federation/views.py
@@ -2,7 +2,7 @@ from mediagoblin.decorators import oauth_required
 from mediagoblin.db.models import User, MediaEntry
 from mediagoblin.tools.response import json_response
 
-#@oauth_required
+@oauth_required
 def user(request):
     """ Handles user response at /api/user/<username>/ """
     user = request.matchdict["username"]
@@ -39,7 +39,7 @@ def inbox(request):
     """ Handles the user's inbox - /api/user/<username>/inbox """
     raise NotImplemented("Yet to implement looking up user's inbox")
 
-#@oauth_required
+@oauth_required
 def object(request):
     """ Lookup for a object type """
     objectType = request.matchdict["objectType"]