aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxray7224 <xray7224@googlemail.com>2013-09-28 16:37:37 -0400
committerJessica Tallon <jessica@megworld.co.uk>2014-07-22 23:13:15 +0100
commit3c3fa5e7bfd60fc80215c2c96ccf3c68be7b424e (patch)
tree34f7a9117888b068fee444b1a6960567ca8aa9f6
parent62dc7d3e6c50eda84074e43ff93e2945c3b81e1b (diff)
downloadmediagoblin-3c3fa5e7bfd60fc80215c2c96ccf3c68be7b424e.tar.lz
mediagoblin-3c3fa5e7bfd60fc80215c2c96ccf3c68be7b424e.tar.xz
mediagoblin-3c3fa5e7bfd60fc80215c2c96ccf3c68be7b424e.zip
Fix some problems with comments and image posting
-rw-r--r--mediagoblin/federation/views.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py
index f19edef7..4add17d9 100644
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/federation/views.py
@@ -103,7 +103,7 @@ def feed(request):
error = "No such 'user' with id '{0}'".format(user)
return json_response({"error": error}, status=404)
- user = requested_user[0]
+ request.user = requested_user[0]
if request.method == "POST":
data = json.loads(request.data)
@@ -122,6 +122,8 @@ def feed(request):
content=data["object"]["content"]
)
comment.save()
+ data = {"verb": "post", "object": comment.serialize(request)}
+ return json_response(data)
elif obj.get("objectType", None) == "image":
# Posting an image to the feed
# NB: This is currently just handing the image back until we have an
@@ -146,12 +148,12 @@ def feed(request):
feed_url = request.urlgen(
"mediagoblin.federation.feed",
- username=user.username,
+ username=request.user.username,
qualified=True
)
feed = {
- "displayName": "Activities by {0}@{1}".format(user.username, request.host),
+ "displayName": "Activities by {0}@{1}".format(request.user.username, request.host),
"objectTypes": ["activity"],
"url": feed_url,
"links": {
@@ -168,7 +170,7 @@ def feed(request):
"href": feed_url,
}
},
- "author": user.serialize(request),
+ "author": request.user.serialize(request),
"items": [],
}
@@ -178,8 +180,8 @@ def feed(request):
feed["items"].append({
"verb": "post",
"object": media.serialize(request),
- "actor": user.serialize(request),
- "content": "{0} posted a picture".format(user.username),
+ "actor": request.user.serialize(request),
+ "content": "{0} posted a picture".format(request.user.username),
"id": 1,
})
feed["items"][-1]["updated"] = feed["items"][-1]["object"]["updated"]