diff --git a/dss/settings.py b/dss/settings.py index 875c3d0..b7ecb1d 100644 --- a/dss/settings.py +++ b/dss/settings.py @@ -240,5 +240,3 @@ PIPELINE_CSS = { COMPRESS_CSS_FILTERS = [ 'compressor.filters.css_default.CssAbsoluteFilter', ] -APE_PASSWORD = localsettings.APE_PASSWORD -APE_SERVER = localsettings.APE_SERVER diff --git a/spa/chat.py b/spa/chat.py deleted file mode 100644 index 4085430..0000000 --- a/spa/chat.py +++ /dev/null @@ -1,59 +0,0 @@ -import logging -import urllib2 -from django.conf.urls import url -from django.contrib.auth.decorators import login_required -from django.core import serializers -from django.core.serializers import json -from django.http import HttpResponse -from django.shortcuts import render_to_response -from django.views.decorators.csrf import csrf_exempt -from dss import settings -from spa.models.ChatMessage import ChatMessage - -class ChatHandler(): - - logger = logging.getLogger(__name__) - - def __init__(self, api_name="v1"): - self.api_name = api_name - - @property - def urls(self): - pattern_list = [ - url(r'^show_messages/$', 'spa.chat.show_messages'), - url(r'^post_message/$', 'spa.chat.post_message'), - ] - return pattern_list - -@csrf_exempt -def show_messages(request): - messages = ChatMessage.objects.all() - return render_to_response('inc/messages.html', {'messages': messages}) - -@csrf_exempt -@login_required -def post_message(request): - new_msg = ChatMessage(message = request.POST['message'], user = request.user.get_profile()) - new_msg.save() - # Again, we're just going to assume this always works - cmd = [{'cmd': 'inlinepush', - 'params': { - 'password': settings.APE_PASSWORD, - 'raw': 'postmsg', - 'channel': 'messages', - 'data': { - 'msg': new_msg.msg, - 'posted_by': new_msg.posted_by, - 'timestamp': new_msg.timestamp - } - } - }] - url = settings.APE_SERVER + urllib2.quote(json.dumps(cmd)) - response = urllib2.urlopen(url) - # Updating the message is handled by APE, so just return an empty 200 - return HttpResponse() - """ - jsonified_msg = serializers.serialize("json", [new_msg]) - # Again, we're just going to assume this always works - return HttpResponse(jsonified_msg, mimetype='application/javascript') - """ \ No newline at end of file diff --git a/spa/urls.py b/spa/urls.py index 46f44dc..e2838b7 100644 --- a/spa/urls.py +++ b/spa/urls.py @@ -11,7 +11,6 @@ from spa.api.v1.ReleaseAudioResource import ReleaseAudioResource from spa.api.v1.ReleaseResource import ReleaseResource from spa.api.v1.UserResource import UserResource from spa.social import SocialHandler -from spa.chat import ChatHandler v1_api = Api(api_name='v1') v1_api.register(MixResource()) @@ -24,7 +23,6 @@ v1_api.register(UserResource()) ajax = AjaxHandler() audio = AudioHandler() social = SocialHandler() -chat = ChatHandler() urlpatterns = django.conf.urls.patterns( '', @@ -34,7 +32,6 @@ urlpatterns = django.conf.urls.patterns( url(r'^tplex/(?P\w+)/$', 'spa.templates.get_template_ex'), (r'^social/', include(social.urls)), (r'^ajax/', include(ajax.urls)), - (r'^chat/', include(chat.urls)), (r'^audio/', include(audio.urls)), (r'^api/', include(v1_api.urls)), (r'^.*/$', 'spa.views.default')