Ticket #8729: 8729.diff

contrib/comments/feeds.py

@@ -2 +2 @@
 from django.contrib.syndication.feeds import Feed
 from django.contrib.sites.models import Site
 from django.contrib import comments
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import Model
 
 class LatestCommentFeed(Feed):
     """Feed of latest comments on the current site."""
 
-    def title(self):
+    def title(self, obj):
         if not hasattr(self, '_site'):
             self._site = Site.objects.get_current()
-        return u"%s comments" % self._site.name
+        if isinstance(obj, type):
+            # Feed is filtered according to a ContentType (Model class).
+            subtitle =  u' on all %s' % unicode(obj._meta.verbose_name_plural)
+        elif isinstance(obj, Model):
+            # Feed is filtered according to a model instance.
+            subtitle =  u' on "%s"' % obj
+        elif isinstance(obj, type(None)):
+            # Feed is not filtered.
+            subtitle = u''
+        return u"%s comments%s" % (self._site.name, subtitle)
 
     def link(self):
         if not hasattr(self, '_site'):
@@ -21 +32 @@
             self._site = Site.objects.get_current()
         return u"Latest comments on %s" % self._site.name
 
-    def items(self):
-        qs = comments.get_model().objects.filter(
-            site__pk = settings.SITE_ID,
-            is_public = True,
-            is_removed = False,
-        )
+    def items(self, obj):
+        filters = {
+            'site__pk': settings.SITE_ID,
+            'is_public': True,
+            'is_removed': False,
+        }
+        if obj is None:
+            qs = comments.get_model().objects.filter(**filters)
+        else:
+            # Filter comments according to `obj`, which is
+            # either a Model class or instance.
+            qs = comments.get_model().objects.for_model(obj).filter(**filters)
         if getattr(settings, 'COMMENTS_BANNED_USERS_GROUP', None):
             where = ['user_id NOT IN (SELECT user_id FROM auth_users_group WHERE group_id = %s)']
             params = [settings.COMMENTS_BANNED_USERS_GROUP]
@@ -34 +51 @@
         return qs[:40]
         
     def item_pubdate(self, item):
-        return item.submit_date
- No newline at end of file
+        return item.submit_date
+
+    def get_object(self, bits):
+        """
+        Allows the comment feed to be filtered according to
+        a particular ContentType or object based on URL bits.
+        
+        Feed URLs will have a scheme similar to this, depending on your URLCONF:
+            /feeds/comments/  (All comments)
+            /feeds/comments/<app>.<model>/  (Comments for a particular ContentType)
+            /feeds/comments/<app>.<model>/<pk>/  (Comments for a specific object)
+        """
+        comment_model = comments.get_model()
+        if len(bits) == 0:
+            # No extra parameters were provided (default feed).
+            return None
+        if len(bits)  >= 1:
+            try:
+                # First, determine the ContentType.
+                app_name, model_name = bits[0].split('.')
+                content_type = ContentType.objects.get(app_label=app_name, name=model_name)
+            except ValueError:
+                # Parameters were not in proper format, or were not a ContentType.
+                raise comment_model.DoesNotExist
+            if len(bits) == 1:
+                # User wants a feed for an entire ContentType.
+                return content_type.model_class()
+            elif len(bits) == 2:
+                try:
+                    # User wants a feed for a specfic instance of ContentType.
+                    return content_type.get_object_for_this_type(pk=bits[1])
+                except:
+                    raise comment_model.DoesNotExist
+        # Anything else is invalid.
+        raise comment_model.DoesNotExist