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

Remove deprecated fields and fix activity creation in tools

Browse Source
This commit is contained in:
Jessica Tallon 2015-05-20 14:45:25 +02:00
parent 2e4782ef6d
commit d2256d0b3b
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/db/models.py
View File

@ -284,8 +284,6 @@ class User(Base, UserMixin):
location = Column(Integer, ForeignKey("core__locations.id")) location = Column(Integer, ForeignKey("core__locations.id"))
get_location = relationship("Location", lazy="joined") get_location = relationship("Location", lazy="joined")
activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
## TODO ## TODO
# plugin data would be in a separate model # plugin data would be in a separate model
@ -537,8 +535,6 @@ class MediaEntry(Base, MediaEntryMixin):
media_metadata = Column(MutationDict.as_mutable(JSONEncoded), media_metadata = Column(MutationDict.as_mutable(JSONEncoded),
default=MutationDict()) default=MutationDict())
activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
## TODO ## TODO
# fail_error # fail_error
@ -907,9 +903,6 @@ class MediaComment(Base, MediaCommentMixin):
lazy="dynamic", lazy="dynamic",
cascade="all, delete-orphan")) cascade="all, delete-orphan"))
activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
def serialize(self, request): def serialize(self, request):
""" Unserialize to python dictionary for API """ """ Unserialize to python dictionary for API """
href = request.urlgen( href = request.urlgen(
@ -990,8 +983,6 @@ class Collection(Base, CollectionMixin):
backref=backref("collections", backref=backref("collections",
cascade="all, delete-orphan")) cascade="all, delete-orphan"))
activity = Column(Integer, ForeignKey("core__activity_intermediators.id"))
__table_args__ = ( __table_args__ = (
UniqueConstraint('creator', 'slug'), UniqueConstraint('creator', 'slug'),
{}) {})

4
mediagoblin/tools/federation.py
View File

@ -72,10 +72,10 @@ def create_activity(verb, obj, actor, target=None, generator=None):
generator.save() generator.save()
activity = Activity(verb=verb) activity = Activity(verb=verb)
activity.set_object(obj) activity.object = obj
if target is not None: if target is not None:
activity.set_target(target) activity.target = target
# If they've set it override the actor from the obj. # If they've set it override the actor from the obj.
activity.actor = actor.id if isinstance(actor, User) else actor activity.actor = actor.id if isinstance(actor, User) else actor