Nochmals

docs/installation.rst

@@ -54,7 +54,7 @@ entry for every app in your project. It is recommended to use different app
                 'CANVAS-PAGE': 'https://apps.facebook.com/yourapp',
                 'CANVAS-URL': '',
                 'SECURE-CANVAS-URL': '',
-                'REDIRECT-URL': '',
+                'REDIRECT-URL': 'mydomain.com/facebook/redirect/?next=%2F%2Fwww.facebook.com%2Fpages%2F',
                 'DOMAIN' : 'localhost.local:8000',
                 'NAMESPACE': 'mynamespace',
         }
@@ -75,7 +75,7 @@ Add this to the header section of your base template::
     {% load fb_tags %}
     <script type="text/javascript">
         FACEBOOK_APP_ID = '{% fb_app_id %}';
-        FACEBOOK_REDIRECT_URL = '{% fb_redirect_url %}';
+        FACEBOOK_REDIRECT_URL = document.location.protocol + '//' + '{% fb_redirect_url %}';
         FACEBOOK_CHANNEL_URL = '{% url channel %}';
         FACEBOOK_APP_NAMESPACE = '{% fb_app_namespace %}'; // needed for og actions.
     </script>
@@ -87,7 +87,7 @@ Facebook applications in one installation::
     {% load fb_tags %}
     <script type="text/javascript">
         FACEBOOK_APP_ID = '{% fb_app_id feincms_page.facebook_application %}';
-        FACEBOOK_REDIRECT_URL = '{% fb_redirect_url feincms_page.facebook_application %}';
+        FACEBOOK_REDIRECT_URL = document.location.protocol + '//' + '{% fb_redirect_url feincms_page.facebook_application %}';
         FACEBOOK_CHANNEL_URL = '{% url channel %}';
     </script>
     <script type="text/javascript" src="{{ STATIC_URL }}facebook/fb_utils.js"></script>

docs/reference.rst

@@ -8,3 +8,25 @@ Django-facebook-graph reference
    installation
    clientside
 
+
+Deauthorization callback
+------------------------
+
+There is a default url that can be called for the deauthorization callback::
+
+    http://<canvas url>/facebook/deauthorize/<app name>/
+
+The app name parameter is optional but needed if you have multiple apps to
+decrypt the signed request. The default action is to delete the user model and
+all related entries.
+
+
+Testing the deauthorization callback
+------------------------------------
+
+If you are logged in to django you can test the deauthorization callback by calling this url::
+
+    http://localhost.local:8000/facebook/deauthorize/<app name>/?userid=<user_id>
+
+You will be shown a page like the one in the django admin
+that shows you which entries would be deleted on a deauthorization callback.

facebook/feincms/middleware.py

@@ -9,6 +9,9 @@ class PreventForeignApp(object):
     associated page """
 
     def process_request(self, request):
+        if 'deauthorize' in request.path:
+            return None
+
         if 'facebook' in request.session and 'signed_request' in request.session['facebook']:
             facebook_page = get_page_from_request(request)
             signed_request = request.session['facebook']['signed_request']

facebook/feincms/views.py

@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.http import HttpResponse
 from django.shortcuts import redirect
 
 from feincms.module.page.models import Page
@@ -9,8 +10,9 @@ def redirect_to_slug(request):
 
     try:
         facebook_page = request.session['facebook']['signed_request']['page']
-    except e:
-        return '<!-- could not redirect to slug via facebook page signed request params: %s -->' % e
+    except KeyError as e:
+        return HttpResponse('<!-- could not redirect to slug via facebook page signed request params: %s -->' % e)
+
 
     page = Page.objects.from_request(request, best_match=True)
     if facebook_page['admin'] and facebook_page['liked']:
@@ -32,4 +34,4 @@ def redirect_to_slug(request):
     try:
         return redirect(page.get_children().filter(slug='unliked')[0])
     except IndexError:
-        return '<!-- no childpage with matching slug found. looked for slugs: admin-liked, liked, admin, unliked -->'
+        return HttpResponse('<!-- no childpage with matching slug found. looked for slugs: admin-liked, liked, admin, unliked -->')

facebook/graph.py

@@ -84,9 +84,19 @@ def get_objects(self, ids, **args):
         return self.request("", args)
 
     def get_connections(self, id, connection_name, **args):
-        """Fetchs the connections for given object."""
+        """Fetches the connections for given object."""
         return self.request(id + "/" + connection_name, args)
 
+    def batch_request(self, batch):
+        """ Combines multiple requests into one.
+            Batch must be a List of Dicts in the format:
+            [{"method": "GET", "relative_url": "me"},
+            {"method": "GET", "relative_url": "me/friends?limit=50"}]
+            It returns a list of response dicts:
+            http://developers.facebook.com/docs/reference/api/batch/
+        """
+        return self.request('', None, {'batch': json.dumps(batch)})
+
     def put_object(self, parent_object, connection_name, **data):
         """Writes the given object to the graph, connected to the given parent.
 

facebook/middleware.py

@@ -31,6 +31,10 @@ def process_request(self, request):
 
         logger.debug('Request Method = %s\n, AccessToken=%s' % (request.method, fb.access_token))
 
+        if 'deauthorize' in request.path:
+            logger.debug('deauthorize call, SignedRequestMiddleware returning...')
+            return None
+
         if 'feincms' in settings.INSTALLED_APPS:
             # if feincms is installed, try to get the application from the page
             from facebook.feincms.utils import get_application_from_request

facebook/modules/base.py

@@ -120,6 +120,9 @@ def to_django(self, response, graph=None, save_related=True):
                         obj.get_from_facebook(graph=graph, save=True)
                     elif created and not save_related and 'name' in val:
                         obj._name = val['name']
+                    elif not created and 'name' in val:
+                        # make sure name is defined:
+                        obj._name = val['name']
                 elif isinstance(fieldclass, models.DateField):
                     # Check for Birthday:
                     setattr(self, field, datetime.strptime(val, "%m/%d/%Y").date())
@@ -133,8 +136,8 @@ def to_django(self, response, graph=None, save_related=True):
                 setattr(self, '_%s_id' % prop, val['id'])
 
 
-    def save_from_facebook(self, response, update_slug=False, save_related=True):
-        self.to_django(response, save_related)
+    def save_from_facebook(self, response, update_slug=False, save_related=True, graph=None):
+        self.to_django(response, graph=graph, save_related=save_related)
         if update_slug or not self.slug:
             self.generate_slug()
         self.save()

facebook/modules/connections/milestone/models.py

@@ -0,0 +1,26 @@
+from django.db import models
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes import generic
+from facebook.modules.base import Base
+
+class Milestone(Base):
+    id = models.BigIntegerField(primary_key=True)
+    # from is a Generic FK to User or Page.
+    _from = generic.GenericForeignKey('__profile_type', '__profile_id')
+    __profile_id = models.BigIntegerField()
+    __profile_type = models.ForeignKey(ContentType)
+    _created_time = models.DateTimeField(blank=True, null=True)
+    _updated_time = models.DateTimeField(blank=True, null=True)
+    _start_time = models.DateTimeField(blank=True, null=True)
+    _end_time = models.DateTimeField(blank=True, null=True)
+    _title = models.CharField(max_lenght=255, blank=True, null=True)
+    _description = models.TextField()
+
+    class Meta:
+        ordering = ['-_start_time']
+        get_latest_by = '_start_time'
+        verbose_name = _('Milestone')
+        verbose_name_plural = _('Milestones')
+
+    def __unicode__(self):
+        return self.title

facebook/modules/connections/post/admin.py

@@ -1,5 +1,8 @@
+from django.contrib.admin.options import InlineModelAdmin
 from facebook.modules.base import AdminBase
 
+from django.contrib.contenttypes.models import ContentType
+
 class PostAdmin(AdminBase):
     def picture_link(self, obj):
             return '<img src="%s" />' % (obj._picture)
@@ -17,3 +20,4 @@ def icon_link(self, obj):
                        '_properties', '_actions', '_privacy', '_likes', '_comments', '_targeting')
     date_hierarchy = '_updated_time'
     list_filter = ('_type',)
+

facebook/modules/connections/post/models.py

@@ -1,5 +1,7 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes import generic
 
 from facebook.fields import JSONField
 from facebook.modules.base import Base
@@ -55,7 +57,7 @@ class Facebook:
 
 
     def __unicode__(self):
-        return u'%s, %s %s' % (self.id, self._message[:50], self._picture)
+        return u'%s, %s' % (self.id, self._message[:50])
 
     # Deal with changes from Facebook
     @property
@@ -70,6 +72,8 @@ def _subject(self):
 
     # Note has no type attribute.
     def guess_type(self):
+        if self._type:
+            return self._type
         if self._subject:
             self._type = 'note'
         elif self._story and self._picture:
@@ -126,9 +130,26 @@ def status(self):
 
 
 class Post(PostBase):
+
     class Meta(PostBase.Meta):
         app_label = 'facebook'
         verbose_name = _('Post')
         verbose_name_plural = _('Posts')
         abstract = False
 
+
+class PagePost(models.Model):
+    """ This is a generic intermediate model to attach posts to Pages or Profiles
+    """
+    post = models.ForeignKey(Post)
+    content_type = models.ForeignKey(ContentType)
+    object_id = models.BigIntegerField()
+    to = generic.GenericForeignKey()
+    created = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        app_label = 'facebook'
+        unique_together = (('post', 'content_type', 'object_id'),)
+
+    def __unicode__(self):
+        return u'%s to %s' % (self.post, self.to)

facebook/modules/profile/models.py

@@ -1,7 +1,8 @@
+from django.contrib.contenttypes import generic
 from django.db import models
 from django.template.defaultfilters import slugify
 from django.utils.translation import ugettext_lazy as _
-from django import forms
+from django.conf import settings
 
 from facebook.modules.base import Base, AdminBase
 
@@ -18,6 +19,12 @@ class Profile(Base):
     _pic_large = models.URLField(max_length=500, blank=True, null=True, verify_exists=False, editable=False)
     _pic_crop = models.URLField(max_length=500, blank=True, null=True, verify_exists=False, editable=False)
 
+    # get all posts for the selected profile
+    #    posts = [p.post for p in page.post_throughs.select_related('post').all()]
+    if 'facebook.modules.connections.post' in settings.INSTALLED_APPS:
+        post_throughs = generic.GenericRelation('PagePost',
+                            related_name="%(app_label)s_%(class)s_related")
+
     class Meta(Base.Meta):
         abstract = True
         app_label = 'facebook'
@@ -45,4 +52,4 @@ class ProfileAdmin(AdminBase):
     def pic_img(self, obj):
         return '<img src="%s" height="75" />' % obj._picture if obj._picture else ''
     pic_img.allow_tags = True
-    pic_img.short_description = _('Picture')
+    pic_img.short_description = _('Picture')

facebook/modules/profile/page/admin.py

@@ -13,7 +13,6 @@
 
 from .models import Page
 
-
 class PageAdmin(ProfileAdmin):
     def has_access(self, obj):
         if obj.updated + datetime.timedelta(days=60) < datetime.datetime.now():
@@ -23,7 +22,30 @@ def has_access(self, obj):
     has_access.short_description = _('Access Token')
     has_access.boolean = True
 
-    list_display = ('id', 'profile_link', 'slug', '_name', 'pic_img', '_likes', 'has_access')
+    def token_expires_in(self, obj):
+        if not obj._access_token_expires:
+            return ''
+        expires_in = (obj._access_token_expires - datetime.datetime.now()).days
+        if expires_in > 10:
+            return _('%s days' % expires_in)
+        elif expires_in < 0:
+            return _('<span style="color:red;font-weight:bold;">expired</span>')
+        else:
+            return _('<span style="color:orange;font-weight:bold;">%s days</span>' % expires_in)
+
+    token_expires_in.short_description = _('expires in')
+    token_expires_in.allow_tags = True
+
+    def insight_link(self, obj):
+        if '?' in obj.facebook_link:
+            return u'<a href="%s&sk=page_insights" target="_blank">%s</a>' % (obj.facebook_link, obj._name)
+        else:
+            return u'<a href="%s?sk=page_insights" target="_blank">%s</a>' % (obj.facebook_link, obj._name)
+    insight_link.allow_tags = True
+    insight_link.short_description = _('Name')
+
+
+    list_display = ('id', 'profile_link', 'slug', 'insight_link', 'pic_img', '_likes', 'has_access', 'token_expires_in')
     readonly_fields = ('_name', '_picture', '_likes', '_graph', '_link', '_location', '_phone',
                        '_checkins', '_website', '_talking_about_count','_username', '_category')
     actions = ['get_page_access_token']
@@ -34,14 +56,17 @@ def get_page_access_token(self, request, queryset):
         app_dict = get_app_dict(default_post_app)
         token_exchange = do_exchange_token(app_dict, graph.access_token)
         logger.debug('exchanged token: %s' % token_exchange)
+        token_expires_in = datetime.timedelta(minutes=60)
         if 'access_token' in token_exchange:
             graph.access_token = token_exchange['access_token']
+            token_expires_in = datetime.timedelta(days=60)
         try:
             response = graph.request('me/accounts/')
         except GraphAPIError as e:
             self.message_user(request, 'There was an error: %s' % e.message )
             return False
         #logger.debug(response)
+        token_expires_in = datetime.datetime.now() + token_expires_in
         if response and response.get('data', False):
             data = response['data']
             message = {'count': 0, 'message': u''}
@@ -51,7 +76,8 @@ def get_page_access_token(self, request, queryset):
             for page in queryset:
                 if accounts.get(page._id, None):
                     if accounts[page._id].get('access_token', False):
-                        queryset.filter(id=page._id).update(_access_token=accounts[page._id]['access_token'])
+                        queryset.filter(id=page._id).update(_access_token=accounts[page._id]['access_token'],
+                                                            _access_token_expires=token_expires_in)
                         message['message'] = u'%sSet access token for page %s\n' % (message['message'], page._name)
                     else:
                         message['message'] = u'%sDid not get access token for page %s\n' % (message['message'], page._name)
@@ -63,5 +89,4 @@ def get_page_access_token(self, request, queryset):
 
     get_page_access_token.short_description = _('Get an access token for the selected page(s)')
 
-
 admin.site.register(Page, PageAdmin)

facebook/modules/profile/page/models.py

@@ -13,6 +13,7 @@ class PageBase(Profile):
     # Cached Facebook Graph fields for db lookup
     _likes = models.IntegerField(blank=True, null=True, help_text=_('Cached fancount of the page'))
     _access_token = models.CharField(max_length=255, blank=True, null=True)
+    _access_token_expires = models.DateTimeField(blank=True, null=True)
     _category = models.CharField(_('category'), max_length=255, blank=True, null=True)
     _location = JSONField(_('location'), blank=True, null=True)
     _phone = models.CharField(_('phone'), max_length=255, blank=True, null=True)

facebook/modules/profile/user/models.py

@@ -21,6 +21,8 @@ class UserBase(Profile):
     _location = models.CharField(max_length=70, blank=True, null=True)
     _gender = models.CharField(max_length=10, blank=True, null=True)
     _locale = models.CharField(max_length=6, blank=True, null=True)
+    _timezone = models.IntegerField(blank=True, null=True)
+    _verified = models.BooleanField(blank=True)
 
     friends = models.ManyToManyField('self')
 

facebook/templates/admin/facebook/change_form.html

@@ -14,7 +14,7 @@
 		<option value="{{ app }}">{{ app }}</option>
 		{% endfor %}
 	</select-->Application: {% fb_first_app %} &nbsp;
-    <fb:login-button show-faces="false" width="200" max-rows="1" scope="user_events, email, rsvp_event, create_event, friends_events, read_stream, publish_stream, user_photos, manage_pages"></fb:login-button>
+    <fb:login-button show-faces="false" width="200" max-rows="1" scope="user_events, email, rsvp_event, create_event, friends_events, read_stream, publish_stream, user_photos, manage_pages, read_insights"></fb:login-button>
 </div>
 <p>App Access Token: {{ graph.access_token }}, via {{ graph.via }}</p>
 <p>User Access Token: <span id="user-access-token">None</span></p>

facebook/templates/admin/facebook/change_list.html

@@ -9,7 +9,7 @@
 <p>Make sure your page has an access token if you would like to post a message in the future. (Select 'get access token' from the menu above.)</p>
 <p>The access token is only for the application {% fb_first_app %}.</p>
 <div id="fb-login-button" style="display:block;">
-    <fb:login-button show-faces="false" width="200" max-rows="1" scope="user_events, email, rsvp_event, create_event, friends_events, read_stream, publish_stream, user_photos, manage_pages"></fb:login-button>
+    <fb:login-button show-faces="false" width="200" max-rows="1" scope="user_events, email, rsvp_event, create_event, friends_events, read_stream, publish_stream, user_photos, manage_pages, read_insights"></fb:login-button>
 </div>
 <p>App Access Token: {% access_token request %}</p>
 <p>User Access Token: <span id="user-access-token">None</span></p>

facebook/urls.py

@@ -10,7 +10,7 @@
 
 
 urlpatterns = patterns('',
-    url(r'^deauthorize/$', 'facebook.views.deauthorize_and_delete', name='deauthorize'),
+    url(r'^deauthorize/(?:(?P<app_name>[A-Za-z0-9_-]+)/)?$', 'facebook.views.deauthorize_and_delete', name='deauthorize'),
     url(r'^fql/$', 'facebook.views.fql_console', name="fql_console"),
     url(r'^log_error/$', 'facebook.views.log_error', name="log_error"),
     url(r'^channel.html$', 'facebook.views.channel', name='channel'),