heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #1054 - Add missing attributes to Activity.serialize

Browse Source
This commit is contained in:
Jessica Tallon 2014-12-08 14:46:48 +00:00
parent a5c09c50c0
commit 3588522606
3 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/db/mixin.py
View File

@ -465,6 +465,11 @@ class ActivityMixin(object):
"url": self.get_url(request), "url": self.get_url(request),
"object": self.get_object.serialize(request), "object": self.get_object.serialize(request),
"objectType": self.object_type, "objectType": self.object_type,
"links": {
"self": {
"href": href,
},
},
} }
if self.generator: if self.generator:

53
mediagoblin/federation/views.py
View File

@ -192,11 +192,7 @@ def feed_endpoint(request):
generator=generator generator=generator
) )
data = { return json_response(activity.serialize(request))
"verb": "post",
"object": comment.serialize(request)
}
return json_response(data)
elif obj.get("objectType", None) == "image": elif obj.get("objectType", None) == "image":
# Posting an image to the feed # Posting an image to the feed
@ -231,12 +227,9 @@ def feed_endpoint(request):
Location.create(data["location"], self) Location.create(data["location"], self)
media.save() media.save()
api_add_to_feed(request, media) activity = api_add_to_feed(request, media)
return json_response({ return json_response(activity.serialize(request))
"verb": "post",
"object": media.serialize(request)
})
elif obj.get("objectType", None) is None: elif obj.get("objectType", None) is None:
# They need to tell us what type of object they're giving us. # They need to tell us what type of object they're giving us.
@ -296,11 +289,16 @@ def feed_endpoint(request):
comment.save() comment.save()
activity = { # Create an update activity
"verb": "update", generator = create_generator(request)
"object": comment.serialize(request), activity = create_activity(
} verb="update",
return json_response(activity) actor=request.user,
obj=comment,
generator=generator
)
return json_response(activity.serialize(request))
elif obj["objectType"] == "image": elif obj["objectType"] == "image":
image = MediaEntry.query.filter_by(id=obj_id).first() image = MediaEntry.query.filter_by(id=obj_id).first()
@ -324,11 +322,16 @@ def feed_endpoint(request):
image.generate_slug() image.generate_slug()
image.save() image.save()
activity = { # Create an update activity
"verb": "update", generator = create_generator(request)
"object": image.serialize(request), activity = create_activity(
} verb="update",
return json_response(activity) actor=request.user,
obj=image,
generator=generator
)
return json_response(activity.serialize(request))
elif obj["objectType"] == "person": elif obj["objectType"] == "person":
# check this is the same user # check this is the same user
if "id" not in obj or obj["id"] != requested_user.id: if "id" not in obj or obj["id"] != requested_user.id:
@ -339,6 +342,16 @@ def feed_endpoint(request):
requested_user.unserialize(obj) requested_user.unserialize(obj)
requested_user.save() requested_user.save()
generator = create_generator(request)
activity = create_activity(
verb="update",
actor=request.user,
obj=requested_user,
generator=generator
)
return json_response(activity.serialize(request))
elif request.method != "GET": elif request.method != "GET":
return json_error( return json_error(
"Unsupported HTTP method {0}".format(request.method), "Unsupported HTTP method {0}".format(request.method),

4
mediagoblin/submit/lib.py
View File

@ -294,7 +294,7 @@ def api_add_to_feed(request, entry):
add_comment_subscription(request.user, entry) add_comment_subscription(request.user, entry)
# Create activity # Create activity
create_activity( activity = create_activity(
verb="post", verb="post",
obj=entry, obj=entry,
actor=entry.uploader, actor=entry.uploader,
@ -303,4 +303,4 @@ def api_add_to_feed(request, entry):
entry.save() entry.save()
run_process_media(entry, feed_url) run_process_media(entry, feed_url)
return json_response(entry.serialize(request)) return activity