]> git.openstreetmap.org Git - osqa.git/blobdiff - forum/models/node.py
Applies some of the Justin Grant's patches.
[osqa.git] / forum / models / node.py
index dc3ecb93ff9b61130a1980ee4d947828e2c2a7cf..69c6396a4bc2cd9e26c5e86360172c3b41c13c76 100644 (file)
-from base import *\r
-import re\r
-from tag import Tag\r
-\r
-import markdown\r
-from django.utils.translation import ugettext as _\r
-from django.utils.safestring import mark_safe\r
-from django.utils.html import strip_tags\r
-from forum.utils.html import sanitize_html\r
-\r
-class NodeContent(models.Model):\r
-    title      = models.CharField(max_length=300)\r
-    tagnames   = models.CharField(max_length=125)\r
-    author     = models.ForeignKey(User, related_name='%(class)ss')\r
-    body       = models.TextField()\r
-\r
-    @property\r
-    def user(self):\r
-        return self.author\r
-\r
-    @property\r
-    def html(self):\r
-        return self.as_markdown()\r
-\r
-    def as_markdown(self, *extensions):\r
-        return mark_safe(sanitize_html(markdown.markdown(self.body, extensions=extensions)))\r
-\r
-    @property\r
-    def headline(self):\r
-        return self.title\r
-\r
-    def tagname_list(self):\r
-        if self.tagnames:\r
-            t = [name.strip() for name in self.tagnames.split(u' ') if name]\r
-            return [name.strip() for name in self.tagnames.split(u' ') if name]\r
-        else:\r
-            return []\r
-\r
-    def tagname_meta_generator(self):\r
-        return u','.join([tag for tag in self.tagname_list()])\r
-\r
-    class Meta:\r
-        abstract = True\r
-        app_label = 'forum'\r
-\r
-class NodeMetaClass(BaseMetaClass):\r
-    types = {}\r
-\r
-    def __new__(cls, *args, **kwargs):\r
-        new_cls = super(NodeMetaClass, cls).__new__(cls, *args, **kwargs)\r
-\r
-        if not new_cls._meta.abstract and new_cls.__name__ is not 'Node':\r
-            NodeMetaClass.types[new_cls.get_type()] = new_cls\r
-\r
-        return new_cls\r
-\r
-    @classmethod\r
-    def setup_relations(cls):\r
-        for node_cls in NodeMetaClass.types.values():\r
-            NodeMetaClass.setup_relation(node_cls)        \r
-\r
-    @classmethod\r
-    def setup_relation(cls, node_cls):\r
-        name = node_cls.__name__.lower()\r
-\r
-        def children(self):\r
-            return node_cls.objects.filter(parent=self)\r
-\r
-        def parent(self):\r
-            p = self.__dict__.get('_%s_cache' % name, None)\r
-\r
-            if p is None and (self.parent is not None) and self.parent.node_type == name:\r
-                p = self.parent.leaf\r
-                self.__dict__['_%s_cache' % name] = p\r
-\r
-            return p\r
-\r
-        Node.add_to_class(name + 's', property(children))\r
-        Node.add_to_class(name, property(parent))\r
-\r
-\r
-class NodeQuerySet(CachedQuerySet):\r
-    def obj_from_datadict(self, datadict):\r
-        cls = NodeMetaClass.types.get(datadict.get("node_type", ""), None)\r
-        if cls:\r
-            obj = cls()\r
-            obj.__dict__.update(datadict)\r
-            return obj\r
-        else:\r
-            return super(NodeQuerySet, self).obj_from_datadict(datadict)\r
-\r
-    def get(self, *args, **kwargs):\r
-        return super(NodeQuerySet, self).get(*args, **kwargs).leaf\r
-\r
-    def filter_state(self, **kwargs):\r
-        apply_bool = lambda q, b: b and q or ~q\r
-        return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])\r
-\r
-\r
-class NodeManager(CachedManager):\r
-    use_for_related_fields = True\r
-\r
-    def get_query_set(self):\r
-        qs = NodeQuerySet(self.model)\r
-\r
-        if self.model is not Node:\r
-            return qs.filter(node_type=self.model.get_type())\r
-        else:\r
-            return qs\r
-\r
-    def get_for_types(self, types, *args, **kwargs):\r
-        kwargs['node_type__in'] = [t.get_type() for t in types]\r
-        return self.get(*args, **kwargs)\r
-\r
-    def filter_state(self, **kwargs):\r
-        return self.all().filter_state(**kwargs)\r
-\r
-\r
-class NodeStateDict(object):\r
-    def __init__(self, node):\r
-        self.__dict__['_node'] = node\r
-\r
-    def __getattr__(self, name):\r
-        if self.__dict__.get(name, None):\r
-            return self.__dict__[name]\r
-\r
-        try:\r
-            node = self.__dict__['_node']\r
-            action = NodeState.objects.get(node=node, state_type=name).action\r
-            self.__dict__[name] = action\r
-            return action\r
-        except:\r
-            return None\r
-\r
-    def __setattr__(self, name, value):\r
-        current = self.__getattr__(name)\r
-\r
-        if value:\r
-            if current:\r
-                current.action = value\r
-                current.save()\r
-            else:\r
-                node = self.__dict__['_node']\r
-                state = NodeState(node=node, action=value, state_type=name)\r
-                state.save()\r
-                self.__dict__[name] = value\r
-\r
-                if not "(%s)" % name in node.state_string:\r
-                    node.state_string = "%s(%s)" % (node.state_string, name)\r
-                    node.save()\r
-        else:\r
-            if current:\r
-                node = self.__dict__['_node']\r
-                node.state_string = "".join("(%s)" % s for s in re.findall('\w+', node.state_string) if s != name)\r
-                node.save()\r
-                current.node_state.delete()\r
-                del self.__dict__[name]\r
-\r
-\r
-class NodeStateQuery(object):\r
-    def __init__(self, node):\r
-        self.__dict__['_node'] = node\r
-\r
-    def __getattr__(self, name):\r
-        node = self.__dict__['_node']\r
-        return "(%s)" % name in node.state_string\r
-\r
-\r
-\r
-class Node(BaseModel, NodeContent):\r
-    __metaclass__ = NodeMetaClass\r
-\r
-    node_type            = models.CharField(max_length=16, default='node')\r
-    parent               = models.ForeignKey('Node', related_name='children', null=True)\r
-    abs_parent           = models.ForeignKey('Node', related_name='all_children', null=True)\r
-\r
-    added_at             = models.DateTimeField(default=datetime.datetime.now)\r
-    score                 = models.IntegerField(default=0)\r
-\r
-    state_string          = models.TextField(default='')\r
-\r
-    #deleted               = models.ForeignKey('Action', null=True, unique=True, related_name="deleted_node")\r
-    #in_moderation         = models.ForeignKey('Action', null=True, unique=True, related_name="moderated_node")\r
-    last_edited           = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node")\r
-\r
-    last_activity_by       = models.ForeignKey(User, null=True)\r
-    last_activity_at       = models.DateTimeField(null=True, blank=True)\r
-\r
-    tags                 = models.ManyToManyField('Tag', related_name='%(class)ss')\r
-    active_revision       = models.OneToOneField('NodeRevision', related_name='active', null=True)\r
-\r
-    extra_ref = models.ForeignKey('Node', null=True)\r
-    extra_count = models.IntegerField(default=0)\r
-    #extra_action = models.ForeignKey('Action', null=True, related_name="extra_node")\r
-    \r
-    marked = models.BooleanField(default=False)\r
-    #wiki = models.BooleanField(default=False)\r
-\r
-    comment_count = DenormalizedField("children", node_type="comment", canceled=False)\r
-    flag_count = DenormalizedField("flags")\r
-\r
-    friendly_name = _("post")\r
-\r
-    objects = NodeManager()\r
-\r
-    @classmethod\r
-    def cache_key(cls, pk):\r
-        return '%s:node:%s' % (settings.APP_URL, pk)\r
-\r
-    @classmethod\r
-    def get_type(cls):\r
-        return cls.__name__.lower()\r
-\r
-    @property\r
-    def leaf(self):\r
-        leaf_cls = NodeMetaClass.types.get(self.node_type, None)\r
-\r
-        if leaf_cls is None:\r
-            return self\r
-\r
-        leaf = leaf_cls()\r
-        leaf.__dict__ = self.__dict__\r
-        return leaf\r
-\r
-    @property\r
-    def nstate(self):\r
-        state = self.__dict__.get('_nstate', None)\r
-\r
-        if state is None:\r
-            state = NodeStateDict(self)\r
-            self._nstate = state\r
-\r
-        return state\r
-\r
-    @property\r
-    def nis(self):\r
-        nis = self.__dict__.get('_nis', None)\r
-\r
-        if nis is None:\r
-            nis = NodeStateQuery(self)\r
-            self._nis = nis\r
-\r
-        return nis\r
-\r
-    #@property\r
-    #def deleted(self):\r
-    #    return self.nstate.deleted\r
-\r
-    @property    \r
-    def absolute_parent(self):\r
-        if not self.abs_parent_id:\r
-            return self.leaf\r
-\r
-        return self.abs_parent.leaf\r
-\r
-    @property\r
-    def summary(self):\r
-        return strip_tags(self.html)[:300]\r
-\r
-    @models.permalink\r
-    def get_revisions_url(self):\r
-        return ('revisions', (), {'id': self.id})\r
-\r
-    def update_last_activity(self, user, save=False):\r
-        self.last_activity_by = user\r
-        self.last_activity_at = datetime.datetime.now()\r
-\r
-        if self.parent:\r
-            self.parent.update_last_activity(user, save=True)\r
-\r
-        if save:\r
-            self.save()\r
-\r
-    def _create_revision(self, user, number, **kwargs):\r
-        revision = NodeRevision(author=user, revision=number, node=self, **kwargs)\r
-        revision.save()\r
-        return revision\r
-\r
-    def create_revision(self, user, **kwargs):\r
-        number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1\r
-        revision = self._create_revision(user, number, **kwargs)\r
-        self.activate_revision(user, revision)\r
-        return revision\r
-\r
-    def activate_revision(self, user, revision):\r
-        self.title = revision.title\r
-        self.tagnames = revision.tagnames\r
-        self.body = revision.body\r
-\r
-        self.active_revision = revision\r
-        self.update_last_activity(user)\r
-\r
-        self.save()\r
-\r
-    def _list_changes_in_tags(self):\r
-        dirty = self.get_dirty_fields()\r
-\r
-        if not 'tagnames' in dirty:\r
-            return None\r
-        else:\r
-            if self._original_state['tagnames']:\r
-                old_tags = set(name for name in self._original_state['tagnames'].split(u' '))\r
-            else:\r
-                old_tags = set()\r
-            new_tags = set(name for name in self.tagnames.split(u' ') if name)\r
-\r
-            return dict(\r
-                current=list(new_tags),\r
-                added=list(new_tags - old_tags),\r
-                removed=list(old_tags - new_tags)\r
-            )\r
-\r
-    def _last_active_user(self):\r
-        return self.last_edited and self.last_edited.by or self.author\r
-\r
-    def _process_changes_in_tags(self):\r
-        tag_changes = self._list_changes_in_tags()\r
-\r
-        if tag_changes is not None:\r
-            for name in tag_changes['added']:\r
-                try:\r
-                    tag = Tag.objects.get(name=name)\r
-                except:\r
-                    tag = Tag.objects.create(name=name, created_by=self._last_active_user())\r
-\r
-                if not self.nis.deleted:\r
-                    tag.used_count = models.F('used_count') + 1\r
-                    tag.save()\r
-\r
-            if not self.nis.deleted:\r
-                for name in tag_changes['removed']:\r
-                    try:\r
-                        tag = Tag.objects.get(name=name)\r
-                        tag.used_count = models.F('used_count') - 1\r
-                        tag.save()\r
-                    except:\r
-                        pass\r
-\r
-            return True\r
-\r
-        return False\r
-\r
-    def mark_deleted(self, action):\r
-        self.nstate.deleted = action\r
-        self.save()\r
-\r
-        if action:\r
-            for tag in self.tags.all():\r
-                tag.used_count = models.F('used_count') - 1\r
-                tag.save()\r
-        else:\r
-            for tag in Tag.objects.filter(name__in=self.tagname_list()):\r
-                tag.used_count = models.F('used_count') + 1\r
-                tag.save()\r
-\r
-    def save(self, *args, **kwargs):\r
-        tags_changed = self._process_changes_in_tags()\r
-        \r
-        if not self.id:\r
-            self.node_type = self.get_type()\r
-            super(BaseModel, self).save(*args, **kwargs)\r
-            self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames, body=self.body)\r
-            self.update_last_activity(self.author)\r
-\r
-        if self.parent_id and not self.abs_parent_id:\r
-            self.abs_parent = self.parent.absolute_parent\r
-\r
-        super(Node, self).save(*args, **kwargs)\r
-        if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))\r
-\r
-    class Meta:\r
-        app_label = 'forum'\r
-\r
-\r
-class NodeRevision(BaseModel, NodeContent):\r
-    node       = models.ForeignKey(Node, related_name='revisions')\r
-    summary    = models.CharField(max_length=300)\r
-    revision   = models.PositiveIntegerField()\r
-    revised_at = models.DateTimeField(default=datetime.datetime.now)\r
-\r
-    class Meta:\r
-        unique_together = ('node', 'revision')\r
-        app_label = 'forum'\r
-\r
-\r
-class NodeState(models.Model):\r
-    node       = models.ForeignKey(Node, related_name='states')\r
-    state_type = models.CharField(max_length=16)\r
-    action     = models.OneToOneField('Action', related_name="node_state")\r
-\r
-    class Meta:\r
-        unique_together = ('node', 'state_type')\r
-        app_label = 'forum'\r
-\r
-\r
+from base import *
+import re
+from tag import Tag
+
+import markdown
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+from django.utils.html import strip_tags
+from forum.utils.html import sanitize_html
+from utils import PickledObjectField
+
+class NodeContent(models.Model):
+    title      = models.CharField(max_length=300)
+    tagnames   = models.CharField(max_length=125)
+    author     = models.ForeignKey(User, related_name='%(class)ss')
+    body       = models.TextField()
+
+    @property
+    def user(self):
+        return self.author
+
+    @property
+    def html(self):
+        return self.as_markdown()
+
+    @classmethod
+    def _as_markdown(cls, content, *extensions):
+        try:
+            return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
+        except Exception, e:
+            import traceback
+            logging.error("Caught exception %s in markdown parser rendering %s %s:\s %s" % (
+                str(e), cls.__name__, str(e), traceback.format_exc()))
+            return ''
+
+    def as_markdown(self, *extensions):
+        return self._as_markdown(self.body, *extensions)
+
+    @property
+    def headline(self):
+        return self.title
+
+    def tagname_list(self):
+        if self.tagnames:
+            t = [name.strip() for name in self.tagnames.split(u' ') if name]
+            return [name.strip() for name in self.tagnames.split(u' ') if name]
+        else:
+            return []
+
+    def tagname_meta_generator(self):
+        return u','.join([tag for tag in self.tagname_list()])
+
+    class Meta:
+        abstract = True
+        app_label = 'forum'
+
+class NodeMetaClass(BaseMetaClass):
+    types = {}
+
+    def __new__(cls, *args, **kwargs):
+        new_cls = super(NodeMetaClass, cls).__new__(cls, *args, **kwargs)
+
+        if not new_cls._meta.abstract and new_cls.__name__ is not 'Node':
+            NodeMetaClass.types[new_cls.get_type()] = new_cls
+
+        return new_cls
+
+    @classmethod
+    def setup_relations(cls):
+        for node_cls in NodeMetaClass.types.values():
+            NodeMetaClass.setup_relation(node_cls)
+
+    @classmethod
+    def setup_relation(cls, node_cls):
+        name = node_cls.__name__.lower()
+
+        def children(self):
+            return node_cls.objects.filter(parent=self)
+
+        def parent(self):
+            if (self.parent is not None) and self.parent.node_type == name:
+                return self.parent.leaf
+
+            return None
+
+        Node.add_to_class(name + 's', property(children))
+        Node.add_to_class(name, property(parent))
+
+
+class NodeQuerySet(CachedQuerySet):
+    def obj_from_datadict(self, datadict):
+        cls = NodeMetaClass.types.get(datadict.get("node_type", ""), None)
+        if cls:
+            obj = cls()
+            obj.__dict__.update(datadict)
+            return obj
+        else:
+            return super(NodeQuerySet, self).obj_from_datadict(datadict)
+
+    def get(self, *args, **kwargs):
+        node = super(NodeQuerySet, self).get(*args, **kwargs).leaf
+
+        if not isinstance(node, self.model):
+            raise self.model.DoesNotExist()
+
+        return node
+
+    def any_state(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter | s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self
+
+    def all_states(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter & s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self
+
+    def filter_state(self, **kwargs):
+        apply_bool = lambda q, b: b and q or ~q
+        return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
+
+    def children_count(self, child_type):
+        return NodeMetaClass.types[child_type].objects.filter_state(deleted=False).filter(parent__in=self).count()
+
+
+class NodeManager(CachedManager):
+    use_for_related_fields = True
+
+    def get_query_set(self):
+        qs = NodeQuerySet(self.model)
+
+        if self.model is not Node:
+            return qs.filter(node_type=self.model.get_type())
+        else:
+            return qs
+
+    def get_for_types(self, types, *args, **kwargs):
+        kwargs['node_type__in'] = [t.get_type() for t in types]
+        return self.get(*args, **kwargs)
+
+    def filter_state(self, **kwargs):
+        return self.all().filter_state(**kwargs)
+
+
+class NodeStateDict(object):
+    def __init__(self, node):
+        self.__dict__['_node'] = node
+
+    def __getattr__(self, name):
+        if self.__dict__.get(name, None):
+            return self.__dict__[name]
+
+        try:
+            node = self.__dict__['_node']
+            action = NodeState.objects.get(node=node, state_type=name).action
+            self.__dict__[name] = action
+            return action
+        except:
+            return None
+
+    def __setattr__(self, name, value):
+        current = self.__getattr__(name)
+
+        if value:
+            if current:
+                current.action = value
+                current.save()
+            else:
+                node = self.__dict__['_node']
+                state = NodeState(node=node, action=value, state_type=name)
+                state.save()
+                self.__dict__[name] = value
+
+                if not "(%s)" % name in node.state_string:
+                    node.state_string = "%s(%s)" % (node.state_string, name)
+                    node.save()
+        else:
+            if current:
+                node = self.__dict__['_node']
+                node.state_string = "".join("(%s)" % s for s in re.findall('\w+', node.state_string) if s != name)
+                node.save()
+                current.node_state.delete()
+                del self.__dict__[name]
+
+
+class NodeStateQuery(object):
+    def __init__(self, node):
+        self.__dict__['_node'] = node
+
+    def __getattr__(self, name):
+        node = self.__dict__['_node']
+        return "(%s)" % name in node.state_string
+
+
+class Node(BaseModel, NodeContent):
+    __metaclass__ = NodeMetaClass
+
+    node_type            = models.CharField(max_length=16, default='node')
+    parent               = models.ForeignKey('Node', related_name='children', null=True)
+    abs_parent           = models.ForeignKey('Node', related_name='all_children', null=True)
+
+    added_at             = models.DateTimeField(default=datetime.datetime.now)
+    score                 = models.IntegerField(default=0)
+
+    state_string          = models.TextField(default='')
+    last_edited           = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node")
+
+    last_activity_by       = models.ForeignKey(User, null=True)
+    last_activity_at       = models.DateTimeField(null=True, blank=True)
+
+    tags                 = models.ManyToManyField('Tag', related_name='%(class)ss')
+    active_revision       = models.OneToOneField('NodeRevision', related_name='active', null=True)
+
+    extra = PickledObjectField()
+    extra_ref = models.ForeignKey('Node', null=True)
+    extra_count = models.IntegerField(default=0)
+
+    marked = models.BooleanField(default=False)
+
+    comment_count = DenormalizedField("children", node_type="comment", canceled=False)
+    flag_count = DenormalizedField("flags")
+
+    friendly_name = _("post")
+
+    objects = NodeManager()
+
+    def __unicode__(self):
+        return self.headline
+
+    @classmethod
+    def _generate_cache_key(cls, key, group="node"):
+        return super(Node, cls)._generate_cache_key(key, group)
+        
+    @classmethod
+    def get_type(cls):
+        return cls.__name__.lower()
+
+    @property
+    def leaf(self):
+        leaf_cls = NodeMetaClass.types.get(self.node_type, None)
+
+        if leaf_cls is None:
+            return self
+
+        leaf = leaf_cls()
+        leaf.__dict__ = self.__dict__
+        return leaf
+
+    @property
+    def nstate(self):
+        state = self.__dict__.get('_nstate', None)
+
+        if state is None:
+            state = NodeStateDict(self)
+            self._nstate = state
+
+        return state
+
+    @property
+    def nis(self):
+        nis = self.__dict__.get('_nis', None)
+
+        if nis is None:
+            nis = NodeStateQuery(self)
+            self._nis = nis
+
+        return nis
+
+    @property
+    def last_activity(self):
+        try:
+            return self.actions.order_by('-action_date')[0].action_date
+        except:
+            return self.last_seen
+
+    @property
+    def state_list(self):
+        return [s.state_type for s in self.states.all()]
+
+    @property
+    def deleted(self):
+        return self.nis.deleted
+
+    @property
+    def absolute_parent(self):
+        if not self.abs_parent_id:
+            return self
+
+        return self.abs_parent
+
+    @property
+    def summary(self):
+        return strip_tags(self.html)[:300]
+
+    @models.permalink
+    def get_revisions_url(self):
+        return ('revisions', (), {'id': self.id})
+
+    def update_last_activity(self, user, save=False, time=None):
+        if not time:
+            time = datetime.datetime.now()
+
+        self.last_activity_by = user
+        self.last_activity_at = time
+
+        if self.parent:
+            self.parent.update_last_activity(user, save=True, time=time)
+
+        if save:
+            self.save()
+
+    def _create_revision(self, user, number, **kwargs):
+        revision = NodeRevision(author=user, revision=number, node=self, **kwargs)
+        revision.save()
+        return revision
+
+    def create_revision(self, user, **kwargs):
+        number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1
+        revision = self._create_revision(user, number, **kwargs)
+        self.activate_revision(user, revision)
+        return revision
+
+    def activate_revision(self, user, revision):
+        self.title = revision.title
+        self.tagnames = revision.tagnames
+        self.body = revision.body
+
+        self.active_revision = revision
+        self.update_last_activity(user)
+
+        self.save()
+
+    def _list_changes_in_tags(self):
+        dirty = self.get_dirty_fields()
+
+        if not 'tagnames' in dirty:
+            return None
+        else:
+            if self._original_state['tagnames']:
+                old_tags = set(name for name in self._original_state['tagnames'].split(u' '))
+            else:
+                old_tags = set()
+            new_tags = set(name for name in self.tagnames.split(u' ') if name)
+
+            return dict(
+                    current=list(new_tags),
+                    added=list(new_tags - old_tags),
+                    removed=list(old_tags - new_tags)
+                    )
+
+    def _last_active_user(self):
+        return self.last_edited and self.last_edited.by or self.author
+
+    def _process_changes_in_tags(self):
+        tag_changes = self._list_changes_in_tags()
+
+        if tag_changes is not None:
+            for name in tag_changes['added']:
+                try:
+                    tag = Tag.objects.get(name=name)
+                except:
+                    tag = Tag.objects.create(name=name, created_by=self._last_active_user())
+
+                if not self.nis.deleted:
+                    tag.add_to_usage_count(1)
+                    tag.save()
+
+            if not self.nis.deleted:
+                for name in tag_changes['removed']:
+                    try:
+                        tag = Tag.objects.get(name=name)
+                        tag.add_to_usage_count(-1)
+                        tag.save()
+                    except:
+                        pass
+
+            return True
+
+        return False
+
+    def mark_deleted(self, action):
+        self.nstate.deleted = action
+        self.save()
+
+        if action:
+            for tag in self.tags.all():
+                tag.add_to_usage_count(-1)
+                tag.save()
+        else:
+            for tag in Tag.objects.filter(name__in=self.tagname_list()):
+                tag.add_to_usage_count(1)
+                tag.save()
+
+    def delete(self, *args, **kwargs):
+        self.active_revision = None
+        self.save()
+
+        for n in self.children.all():
+            n.delete()
+
+        for a in self.actions.all():
+            a.cancel()
+
+        super(Node, self).delete(*args, **kwargs)
+
+    def save(self, *args, **kwargs):
+        tags_changed = self._process_changes_in_tags()
+
+        if not self.id:
+            self.node_type = self.get_type()
+            super(BaseModel, self).save(*args, **kwargs)
+            self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
+                                                         body=self.body)
+            self.update_last_activity(self.author, time=self.added_at)
+
+        if self.parent_id and not self.abs_parent_id:
+            self.abs_parent = self.parent.absolute_parent
+
+        super(Node, self).save(*args, **kwargs)
+        if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
+
+    class Meta:
+        app_label = 'forum'
+
+
+class NodeRevision(BaseModel, NodeContent):
+    node       = models.ForeignKey(Node, related_name='revisions')
+    summary    = models.CharField(max_length=300)
+    revision   = models.PositiveIntegerField()
+    revised_at = models.DateTimeField(default=datetime.datetime.now)
+
+    class Meta:
+        unique_together = ('node', 'revision')
+        app_label = 'forum'
+
+
+class NodeState(models.Model):
+    node       = models.ForeignKey(Node, related_name='states')
+    state_type = models.CharField(max_length=16)
+    action     = models.OneToOneField('Action', related_name="node_state")
+
+    class Meta:
+        unique_together = ('node', 'state_type')
+        app_label = 'forum'
+
+