Remove deprecated fields and fix activity creation in tools

2 files changed, 2 insertions, 11 deletions

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 30dd80df..d1df1da1 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -284,8 +284,6 @@ class User(Base, UserMixin):
     location = Column(Integer, ForeignKey("core__locations.id"))
     get_location = relationship("Location", lazy="joined")
 
-    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
-
     ## TODO
     # plugin data would be in a separate model
 
@@ -537,8 +535,6 @@ class MediaEntry(Base, MediaEntryMixin):
     media_metadata = Column(MutationDict.as_mutable(JSONEncoded),
         default=MutationDict())
 
-    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
-
     ## TODO
     # fail_error
 
@@ -907,9 +903,6 @@ class MediaComment(Base, MediaCommentMixin):
                                                    lazy="dynamic",
                                                    cascade="all, delete-orphan"))
 
-
-    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
-
     def serialize(self, request):
         """ Unserialize to python dictionary for API """
         href = request.urlgen(
@@ -990,8 +983,6 @@ class Collection(Base, CollectionMixin):
                                backref=backref("collections",
                                                cascade="all, delete-orphan"))
 
-    activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
-
     __table_args__ = (
         UniqueConstraint('creator', 'slug'),
         {})
diff --git a/mediagoblin/tools/federation.py b/mediagoblin/tools/federation.py
index 6c2d27da..e8d6fc36 100644
--- a/mediagoblin/tools/federation.py
+++ b/mediagoblin/tools/federation.py
@@ -72,10 +72,10 @@ def create_activity(verb, obj, actor, target=None, generator=None):
             generator.save()
 
     activity = Activity(verb=verb)
-    activity.set_object(obj)
+    activity.object = obj
 
     if target is not None:
-        activity.set_target(target)
+        activity.target = target
 
    # If they've set it override the actor from the obj.
     activity.actor = actor.id if isinstance(actor, User) else actor