From be144be7cfe6384ab24c8589ac433b1e43fa0418 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Fri, 19 Oct 2012 13:22:10 +0100
Subject: [PATCH] Fixed open graph handler for user

---
 dss/logsettings.py               |  8 +++++++-
 spa/models/UserProfile.py        |  4 ++++
 spa/social.py                    | 14 ++++++++------
 spa/views.py                     |  2 +-
 templates/inc/facebook/mix.html  |  4 +++-
 templates/inc/facebook/user.html |  2 +-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/dss/logsettings.py b/dss/logsettings.py
index 4a5c76a..b72e95e 100644
--- a/dss/logsettings.py
+++ b/dss/logsettings.py
@@ -1,3 +1,9 @@
+import os
+if os.name == 'posix':
+    LOG_FILE = '/tmp/dss.log'
+else:
+    LOG_FILE = 'c:\\temp\\dss.log'
+
 LOGGING = {
     'version': 1,
     'formatters': {
@@ -17,7 +23,7 @@ LOGGING = {
         'file': {
             'level': 'DEBUG',
             'class': 'logging.FileHandler',
-            'filename': '/tmp/dss.lgo',
+            'filename': LOG_FILE,
             'formatter': 'simple'
             },
         },
diff --git a/spa/models/UserProfile.py b/spa/models/UserProfile.py
index dc80f22..be26f20 100644
--- a/spa/models/UserProfile.py
+++ b/spa/models/UserProfile.py
@@ -1,6 +1,7 @@
 import urlparse
 from allauth.socialaccount.models import SocialAccount
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.signals import post_save
@@ -96,6 +97,9 @@ class UserProfile(_BaseModel):
 
         return urlparse.urljoin(settings.STATIC_URL, "img/default-avatar-32.png")
 
+    def get_profile_url(self):
+        return 'http://%s/user/%s' % (Site.objects.get_current().domain, self.profile_slug)
+
     def save(self, force_insert=False, force_update=False, using=None):
         return super(UserProfile, self).save(force_insert, force_update, using)
 
diff --git a/spa/social.py b/spa/social.py
index 3f0ca42..4202922 100644
--- a/spa/social.py
+++ b/spa/social.py
@@ -10,10 +10,10 @@ from dss import  settings
 from spa.models.Mix import Mix
 from spa.models.UserProfile import UserProfile
 from allauth.socialaccount.models import SocialToken
+import logging
+logger = logging.getLogger(__name__)
 
 class SocialHandler(object):
-    import logging
-    logger = logging.getLogger(__name__)
 
     def __init__(self, api_name="v1"):
         self.api_name = api_name
@@ -67,8 +67,8 @@ def mix(request, args):
     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)
+        "audio_url": 'http://%s%s' % (Site.objects.get_current().domain, audio_url),
+        "mix_url": 'http://%s%s' % (Site.objects.get_current().domain, mix_url)
     }
     payload = dict(default.items() + extras.items())
     response = render_to_response(
@@ -80,19 +80,21 @@ def mix(request, args):
 
 def user(request, args):
     try:
-        user = UserProfile.objects.get(profile_slug=args['mix_id'])
+        user = UserProfile.objects.get(profile_slug=args['user_id'])
     except UserProfile.DoesNotExist:
         raise Http404
 
     image = user.get_avatar_image()
+    profile_url = user.get_profile_url()
     default = _getPayload(request)
     extras = {
         "description": user.nice_name,
+        "profile_url": profile_url,
         "image_url": image,
     }
     payload = dict(default.items() + extras.items())
     response = render_to_response(
-        'inc/facebook/mix.html',
+        'inc/facebook/user.html',
         payload,
         context_instance=RequestContext(request)
     )
diff --git a/spa/views.py b/spa/views.py
index 569dd1b..64d43b0 100644
--- a/spa/views.py
+++ b/spa/views.py
@@ -1,3 +1,4 @@
+from django.http import HttpResponse
 from django.shortcuts import render_to_response, redirect
 from django.template.context import RequestContext
 from core.utils.string import lreplace, rreplace
@@ -11,7 +12,6 @@ def _app(request):
 
 def app(request):
     logger.error("App request hit")
-    return HttpResponse('Hello Sailor')
     if 'HTTP_USER_AGENT' in request.META:
         if request.META['HTTP_USER_AGENT'].startswith('facebookexternalhit'):
             logger.debug("Redirecting facebook hit")
diff --git a/templates/inc/facebook/mix.html b/templates/inc/facebook/mix.html
index bdbe847..08f50aa 100644
--- a/templates/inc/facebook/mix.html
+++ b/templates/inc/facebook/mix.html
@@ -1,5 +1,7 @@
 <!DOCTYPE HTML>
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:og="http://ogp.me/ns#"
+      xmlns:fb="https://www.facebook.com/2008/fbml">
 <head>
     <meta property="fb:app_id" content="{{ app_id }}" />
     <meta property="og:url" content="{{ mix_url }}/" />
diff --git a/templates/inc/facebook/user.html b/templates/inc/facebook/user.html
index 415242a..e19ab26 100644
--- a/templates/inc/facebook/user.html
+++ b/templates/inc/facebook/user.html
@@ -3,7 +3,7 @@
 <head>
     <title>Deep South Sounds User Profile</title>
     <meta property="fb:app_id" content="{{ app_id }}" />
-    <meta property="og:type"   content="deepsouthsounds:user" />
+    <meta property="og:url"  content="{{ profile_url }}/" />
     <meta property="og:title"  content="{{ description }}" />
     <meta property="og:image"  content="{{ image_url }}" />
 </head>