From 7ab72a5f2881c06ace09241f38212ca743cc01de Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 21 May 2015 06:49:27 +0930
Subject: [PATCH] Fix for new activity API

---
 extensions/tags/js/bootstrap.js                   | 2 +-
 extensions/tags/src/CategoriesServiceProvider.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/tags/js/bootstrap.js b/extensions/tags/js/bootstrap.js
index 901278cd3..769382d83 100644
--- a/extensions/tags/js/bootstrap.js
+++ b/extensions/tags/js/bootstrap.js
@@ -217,7 +217,7 @@ app.initializers.add('categories', function() {
 
   // Add a category label next to the discussion title in post activity items.
   extend(PostedActivity.prototype, 'headerItems', function(items) {
-    var category = this.props.activity.post().discussion().category();
+    var category = this.props.activity.subject().discussion().category();
     if (category) {
       items.add('category', categoryLabel(category));
     }
diff --git a/extensions/tags/src/CategoriesServiceProvider.php b/extensions/tags/src/CategoriesServiceProvider.php
index 8e67f8700..5906e8e7c 100644
--- a/extensions/tags/src/CategoriesServiceProvider.php
+++ b/extensions/tags/src/CategoriesServiceProvider.php
@@ -40,10 +40,12 @@ class CategoriesServiceProvider extends ServiceProvider
 
             new Relationship('Flarum\Core\Models\Discussion', 'belongsTo', 'category', 'Flarum\Categories\Category'),
 
-            new SerializeRelationship('Flarum\Api\Serializers\DiscussionSerializer', 'hasOne', 'category', 'Flarum\Categories\CategorySerializer'),
+            new SerializeRelationship('Flarum\Api\Serializers\DiscussionBasicSerializer', 'hasOne', 'category', 'Flarum\Categories\CategorySerializer'),
 
             new ApiInclude(['discussions.index', 'discussions.show'], 'category', true),
 
+            new ApiInclude(['activity.index'], 'subject.discussion.category', true),
+
             (new Permission('discussion.move'))
                 ->serialize()
                 ->grant(function ($grant, $user) {