diff options
| author | Jessica Tallon <jessica@megworld.co.uk> | 2014-08-22 18:53:29 +0100 |
|---|---|---|
| committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-08-22 23:18:01 +0100 |
| commit | b949201152b2ff3a5b072107ae903ddac309a530 (patch) | |
| tree | 1823d3ec62b0bcdaee372bfa6ae193087912eb9b /mediagoblin/user_pages/views.py | |
| parent | 51f49118555be3021127602aef78a548850b59b5 (diff) | |
| download | mediagoblin-b949201152b2ff3a5b072107ae903ddac309a530.tar.lz mediagoblin-b949201152b2ff3a5b072107ae903ddac309a530.tar.xz mediagoblin-b949201152b2ff3a5b072107ae903ddac309a530.zip | |
Create activity model and add activity creation
This creates the Activity and Genrator models from the Activity
Streams spec and. I then created a migration which retro-actively
create activities for media uploaded and comments created. Through
out the code I've added so automatically activties are created when
a user peforms an action (uploading media, commenting, etc.).
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 78751a28..8203cfa7 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -26,6 +26,7 @@ from mediagoblin.tools.response import render_to_response, render_404, \ from mediagoblin.tools.text import cleaned_markdown_conversion from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.pagination import Pagination +from mediagoblin.tools.federation import create_activity from mediagoblin.user_pages import forms as user_forms from mediagoblin.user_pages.lib import (send_comment_email, add_media_to_collection, build_report_object) @@ -199,7 +200,7 @@ def media_post_comment(request, media): _('Your comment has been posted!')) trigger_notification(comment, media, request) - + create_activity("post", comment) add_comment_subscription(request.user, media) return redirect_obj(request, media) @@ -261,6 +262,7 @@ def media_collect(request, media): collection.creator = request.user.id collection.generate_slug() collection.save() + create_activity("create", collection) # Otherwise, use the collection selected from the drop-down else: @@ -287,7 +289,7 @@ def media_collect(request, media): % (media.title, collection.title)) else: # Add item to collection add_media_to_collection(collection, media, form.note.data) - + create_activity("add", media) messages.add_message(request, messages.SUCCESS, _('"%s" added to collection "%s"') % (media.title, collection.title)) |