holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix API changes to python-akismet, #687

Browse Source
This commit is contained in:
Garret Wassermann 2019-01-02 19:17:19 -05:00
parent f779e8b5ce
commit 6cfc1ca75c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helpdesk/lib.py
View File

@ -175,19 +175,27 @@ def text_is_spam(text, request):
except ImproperlyConfigured: except ImproperlyConfigured:
site = Site(domain='configure-django-sites.com') site = Site(domain='configure-django-sites.com')
ak = Akismet( # see https://akismet.readthedocs.io/en/latest/overview.html#using-akismet
blog_url='http://%s/' % site.domain,
agent='django-helpdesk', apikey = None
)
if hasattr(settings, 'TYPEPAD_ANTISPAM_API_KEY'): if hasattr(settings, 'TYPEPAD_ANTISPAM_API_KEY'):
ak.setAPIKey(key=settings.TYPEPAD_ANTISPAM_API_KEY) apikey = settings.TYPEPAD_ANTISPAM_API_KEY
ak.baseurl = 'api.antispam.typepad.com/1.1/' ak.baseurl = 'api.antispam.typepad.com/1.1/'
elif hasattr(settings, 'PYTHON_AKISMET_API_KEY'):
# new env var expected by python-akismet package
apikey = settings.PYTHON_AKISMET_API_KEY
elif hasattr(settings, 'AKISMET_API_KEY'): elif hasattr(settings, 'AKISMET_API_KEY'):
ak.setAPIKey(key=settings.AKISMET_API_KEY) # deprecated, but kept for backward compatibility
apikey = settings.AKISMET_API_KEY
else: else:
return False return False
ak = Akismet(
blog_url='http://%s/' % site.domain,
key=apikey,
)
if ak.verify_key(): if ak.verify_key():
ak_data = { ak_data = {
'user_ip': request.META.get('REMOTE_ADDR', '127.0.0.1'), 'user_ip': request.META.get('REMOTE_ADDR', '127.0.0.1'),