X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/60a99b45f40f6249687c6e4fd3b5fc25fb0208dd..19a817e69c4518215a96e0456bbea06aa4e03e63:/forum/models/node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 3150e99..19973e9 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -166,6 +166,10 @@ class Node(BaseModel, NodeContent):
     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):
         self.last_activity_by = user
         self.last_activity_at = datetime.datetime.now()
@@ -181,13 +185,13 @@ class Node(BaseModel, NodeContent):
         revision.save()
         return revision
 
-    def create_revision(self, user, action=None, **kwargs):
+    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, action)
+        self.activate_revision(user, revision)
         return revision
 
-    def activate_revision(self, user, revision, action=None):
+    def activate_revision(self, user, revision):
         self.title = revision.title
         self.tagnames = revision.tagnames
         self.body = revision.body
@@ -195,9 +199,6 @@ class Node(BaseModel, NodeContent):
         self.active_revision = revision
         self.update_last_activity(user)
 
-        if action:
-            self.last_edited = action
-
         self.save()
 
     def get_tag_list_if_changed(self):
@@ -256,16 +257,11 @@ class Node(BaseModel, NodeContent):
 
     @staticmethod
     def isSpam(comment, data):
-        api = Akismet()
-
-        if not api.key:
+        if not settings.WORDPRESS_API_KEY:
             return False
-        else:
-            if api.comment_check(comment, data):
-                return True
-            else:
-                return False
-        return data
+            
+        api = Akismet(settings.WORDPRESS_API_KEY, settings.APP_URL)
+        return api.comment_check(comment, data)
 
     class Meta:
         app_label = 'forum'