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

Fix some problems with comments and image posting

Browse Source
This commit is contained in:
xray7224 2013-09-28 16:37:37 -04:00 committed by Jessica Tallon
parent 62dc7d3e6c
commit 3c3fa5e7bf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mediagoblin/federation/views.py
View File

@ -103,7 +103,7 @@ def feed(request):
error = "No such 'user' with id '{0}'".format(user) error = "No such 'user' with id '{0}'".format(user)
return json_response({"error": error}, status=404) return json_response({"error": error}, status=404)
user = requested_user[0] request.user = requested_user[0]
if request.method == "POST": if request.method == "POST":
data = json.loads(request.data) data = json.loads(request.data)
@ -122,6 +122,8 @@ def feed(request):
content=data["object"]["content"] content=data["object"]["content"]
) )
comment.save() comment.save()
data = {"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
# NB: This is currently just handing the image back until we have an # NB: This is currently just handing the image back until we have an
@ -146,12 +148,12 @@ def feed(request):
feed_url = request.urlgen( feed_url = request.urlgen(
"mediagoblin.federation.feed", "mediagoblin.federation.feed",
username=user.username, username=request.user.username,
qualified=True qualified=True
) )
feed = { feed = {
"displayName": "Activities by {0}@{1}".format(user.username, request.host), "displayName": "Activities by {0}@{1}".format(request.user.username, request.host),
"objectTypes": ["activity"], "objectTypes": ["activity"],
"url": feed_url, "url": feed_url,
"links": { "links": {
@ -168,7 +170,7 @@ def feed(request):
"href": feed_url, "href": feed_url,
} }
}, },
"author": user.serialize(request), "author": request.user.serialize(request),
"items": [], "items": [],
} }
@ -178,8 +180,8 @@ def feed(request):
feed["items"].append({ feed["items"].append({
"verb": "post", "verb": "post",
"object": media.serialize(request), "object": media.serialize(request),
"actor": user.serialize(request), "actor": request.user.serialize(request),
"content": "{0} posted a picture".format(user.username), "content": "{0} posted a picture".format(request.user.username),
"id": 1, "id": 1,
}) })
feed["items"][-1]["updated"] = feed["items"][-1]["object"]["updated"] feed["items"][-1]["updated"] = feed["items"][-1]["object"]["updated"]