Merge branch '905-activities'

    Add Activity and Generator models which allow for
    activities to be created. This now works with the
    feed API.

1 files changed, 10 insertions, 0 deletions

diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index 637d5038..1813aa82 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -26,6 +26,7 @@ from werkzeug.datastructures import FileStorage
 from mediagoblin import mg_globals
 from mediagoblin.tools.response import json_response
 from mediagoblin.tools.text import convert_to_tag_list_of_dicts
+from mediagoblin.tools.federation import create_activity
 from mediagoblin.db.models import MediaEntry, ProcessingMetaData
 from mediagoblin.processing import mark_entry_failed
 from mediagoblin.processing.task import ProcessMedia
@@ -202,6 +203,10 @@ def submit_media(mg_app, user, submitted_file, filename,
 
     add_comment_subscription(user, entry)
 
+    # Create activity
+    entry.activity = create_activity("post", entry, entry.uploader).id
+    entry.save()
+
     return entry
 
 
@@ -291,4 +296,9 @@ def api_add_to_feed(request, entry):
 
     run_process_media(entry, feed_url)
     add_comment_subscription(request.user, entry)
+
+    # Create activity
+    entry.activity = create_activity("post", entry, entry.uploader).id
+    entry.save()
+
     return json_response(entry.serialize(request))