X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/4128d661e981e887019a448762c6b912de5efb6b..82dcc31b8529752efa45cb92f671f974c33621c3:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 19973e9..cf69233 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -1,4 +1,3 @@ -from forum.akismet import * from base import * from tag import Tag @@ -31,12 +30,13 @@ class NodeContent(models.Model): def tagname_list(self): if self.tagnames: - return [name for name in self.tagnames.split(u' ')] + 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([unicode(tag) for tag in self.tagname_list()]) + return u','.join([tag for tag in self.tagname_list()]) class Meta: abstract = True @@ -255,14 +255,6 @@ class Node(BaseModel, NodeContent): super(Node, self).save(*args, **kwargs) if tags is not None: self.tags = tags - @staticmethod - def isSpam(comment, data): - if not settings.WORDPRESS_API_KEY: - return False - - api = Akismet(settings.WORDPRESS_API_KEY, settings.APP_URL) - return api.comment_check(comment, data) - class Meta: app_label = 'forum'