A couple more fixes.

[osqa.git] / forum_modules / akismet / startup.py

diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index cb449cc5877f6242b37c4327d591f5846d84a8d4..159efe17663b9172aa7ae99d4d007ee94eccbed1 100644 (file)
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -1,53 +1,59 @@
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils import simplejson
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils import simplejson

+from django.utils.encoding import smart_str

 from django.shortcuts import render_to_response
 from django.shortcuts import render_to_response

-from forum.modules.decorators import decorate
+from forum.modules import decorate

 from forum import views
 from lib.akismet import Akismet
 from forum import views
 from lib.akismet import Akismet

-from forum.settings import APP_URL, OSQA_VERSION, REP_TO_FOR_NO_SPAM_CHECK
+from forum.settings import APP_URL, OSQA_VERSION
+from settings import WORDPRESS_API_KEY, REP_FOR_NO_SPAM_CHECK

 from forum.models.user import User
 
 import settings
 
 from forum.models.user import User
 
 import settings
 

+def can_bypass_spam_check(user):
+    return user.is_authenticated() and (user.is_superuser or user.is_staff or cmp(user.reputation, REP_FOR_NO_SPAM_CHECK
+                                                                                  ) > 0)
+

 
 def check_spam(param, comment_type):
     def wrapper(origin, request, *args, **kwargs):
 
 def check_spam(param, comment_type):
     def wrapper(origin, request, *args, **kwargs):

-        if request.POST and request.POST.get(param, None) and settings.WORDPRESS_API_KEY:
-            comment = request.POST[param]
-            user = request.user
+        if request.POST and request.POST.get(param, None) and WORDPRESS_API_KEY and (not can_bypass_spam_check(
+                request.user)):
+            comment = smart_str(request.POST[param])

 
             data = {
 
             data = {

-                "user_ip":request.META["REMOTE_ADDR"],
-                "user_agent":request.environ['HTTP_USER_AGENT'],
-                "comment_type": comment_type,
-                "comment":comment
+            "user_ip":request.META["REMOTE_ADDR"],
+            "user_agent":request.environ['HTTP_USER_AGENT'],
+            "comment_type": comment_type,
+            "comment":comment

             }
 
             }
 

-            if user.is_authenticated():
+            if request.user.is_authenticated():

                 data.update({
                 data.update({

-                    "comment_author":request.user.username,
-                    "comment_author_email":request.user.email,
-                    "comment_author_url":request.user.website,    
+                "comment_author":smart_str(request.user.username),
+                "comment_author_email":request.user.email,
+                "comment_author_url":request.user.website,

                 })
 
             api = Akismet(settings.WORDPRESS_API_KEY, APP_URL, "OSQA/%s" % OSQA_VERSION)
                 })
 
             api = Akismet(settings.WORDPRESS_API_KEY, APP_URL, "OSQA/%s" % OSQA_VERSION)

-            if not user.is_authenticated() or (user.reputation < settings.REP_TO_FOR_NO_SPAM_CHECK and not user.is_staff and not user.is_superuser):
-                if api.comment_check(comment, data):
-                    if request.is_ajax():
-                        response = {
-                            'success': False,
-                            'error_message': _("Sorry, but akismet thinks your %s is spam.") % comment_type
-                        }
-                        return HttpResponse(simplejson.dumps(response), mimetype="application/json")
-                    else:
-                        return render_to_response('modules/akismet/foundspam.html', {
-                            'action_name': comment_type
-                        })
-                    
+            if api.comment_check(comment, data):
+                if request.is_ajax():
+                    response = {
+                    'success': False,
+                    'error_message': _("Sorry, but akismet thinks your %s is spam.") % comment_type
+                    }
+                    return HttpResponse(simplejson.dumps(response), mimetype="application/json")
+                else:
+                    return render_to_response('modules/akismet/foundspam.html', {
+                    'action_name': comment_type
+                    })
+

         return origin(request, *args, **kwargs)
         return origin(request, *args, **kwargs)

+

     return wrapper
     return wrapper

-            
+

 
 decorate(views.writers.ask)(check_spam('text', _('question')))
 decorate(views.writers.answer)(check_spam('text', _('answer')))
 
 decorate(views.writers.ask)(check_spam('text', _('question')))
 decorate(views.writers.answer)(check_spam('text', _('answer')))