Moved comments inline in mix page

core/utils/string.py

@@ -0,0 +1,14 @@
+__author__ = 'fergalm'
+import re
+
+def lreplace(string, pattern, sub):
+    """
+    Replaces 'pattern' in 'string' with 'sub' if 'pattern' starts 'string'.
+    """
+    return re.sub('^%s' % pattern, sub, string)
+
+def rreplace(string, pattern, sub):
+    """
+    Replaces 'pattern' in 'string' with 'sub' if 'pattern' ends 'string'.
+    """
+    return re.sub('%s$' % pattern, sub, string)

spa/social.py

@@ -30,22 +30,26 @@ def _getPayload(request):
         "site_image_url": '%s/img/dss-large.png' % settings.STATIC_URL,
     }
 
-def mix(request, mix_id):
+def mix(request, args):
     try:
-        mix = Mix.objects.get(pk=mix_id)
+        mix = Mix.objects.get(pk=args['mix_id'])
     except Mix.DoesNotExist:
         raise Http404
 
     image = mix.get_image_url()
     audio_url = mix.get_stream_path()
-    redirect_url = mix.get_absolute_url()
+    mix_url = mix.get_absolute_url()
+    default = _getPayload(request)
+    extras = {
+        "description"   : mix.title,
+        "image_url"     : image,
+        "audio_url"     : 'http://%s:%s%s' % (Site.objects.get_current().domain, request.META['SERVER_PORT'], audio_url),
+        "mix_url"       : 'http://%s:%s%s' % (Site.objects.get_current().domain, request.META['SERVER_PORT'], mix_url)
+    }
+    payload = dict(default.items() + extras.items())
     response = render_to_response(
         'inc/facebook/mix.html',
-        _getPayload(request) + {
+        payload,
-            "description"   : mix.title,
-            "audio_url"     : 'http://%s:%s%s' % (Site.objects.get_current().domain, request.META['SERVER_PORT'], audio_url),
-            "redirect"      : 'http://%s:%s#%s' % (Site.objects.get_current().domain, request.META['SERVER_PORT'], redirect_url)
-        },
         context_instance = RequestContext(request)
     )
     return response
@@ -59,8 +63,11 @@ def index(request):
 
 def social_redirect(request):
     try:
-        resolver = resolve('/social' + request.path.replace('#', ''))
+        resolver = resolve('/social' + request.path)
         if resolver is not None:
-            return resolver.func(request)
+            return resolver.func(request, resolver.kwargs)
     except Http404:
         return index(request)
+    except Exception, ex:
+        return index(request)
+

spa/views.py

@@ -1,6 +1,7 @@
 from django.shortcuts import render_to_response, redirect
 from django.template.context import RequestContext
 import re
+from core.utils.string import lreplace, rreplace
 from spa.social import social_redirect
 
 def _app(request):
@@ -15,8 +16,11 @@ def app(request):
             context_instance=RequestContext(request))
 
 def default(request):
-    backbone_url = "http://%s/#%s" % (request.get_host(), re.sub('/$', '', request.path))
+    if request.META['HTTP_USER_AGENT'].startswith('facebookexternalhit'):
-    return redirect(backbone_url)
+        return social_redirect(request)
+    else:
+        backbone_url = "http://%s/#%s" % (request.get_host(), rreplace(lreplace(request.path, '/', ''), '/', ''))
+        return redirect(backbone_url)
 
 def upload(request):
     return render_to_response("inc/upload.html", context_instance=RequestContext(request))