1 files changed, 52 insertions, 8 deletions
diff --git a/app/Controller/FeedController.php b/app/Controller/FeedController.php
index cf2b1088..f9b0ed7c 100644
--- a/app/Controller/FeedController.php
+++ b/app/Controller/FeedController.php
@@ -2,7 +2,11 @@
 
 namespace Kanboard\Controller;
 
+use DateTime;
 use Kanboard\Core\Controller\AccessForbiddenException;
+use PicoFeed\Syndication\AtomFeedBuilder;
+use PicoFeed\Syndication\AtomItemBuilder;
+use PicoFeed\Syndication\FeedBuilder;
 
 /**
  * Atom/RSS Feed controller
@@ -27,10 +31,15 @@ class FeedController extends BaseController
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
 
-        $this->response->xml($this->template->render('feed/user', array(
-            'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id'])),
-            'user' => $user,
-        )));
+        $events = $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']));
+
+        $feedBuilder = AtomFeedBuilder::create()
+            ->withTitle(e('Project activities for %s', $this->helper->user->getFullname($user)))
+            ->withFeedUrl($this->helper->url->to('FeedController', 'user', array('token' => $user['token']), '', true))
+            ->withSiteUrl($this->helper->url->base())
+            ->withDate(new DateTime());
+
+        $this->response->xml($this->buildFeedItems($events, $feedBuilder)->build());
     }
 
     /**
@@ -47,9 +56,44 @@ class FeedController extends BaseController
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
 
-        $this->response->xml($this->template->render('feed/project', array(
-            'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
-            'project' => $project,
-        )));
+        $events = $this->helper->projectActivity->getProjectEvents($project['id']);
+
+        $feedBuilder = AtomFeedBuilder::create()
+            ->withTitle(e('%s\'s activity', $project['name']))
+            ->withFeedUrl($this->helper->url->to('FeedController', 'project', array('token' => $project['token']), '', true))
+            ->withSiteUrl($this->helper->url->base())
+            ->withDate(new DateTime());
+
+        $this->response->xml($this->buildFeedItems($events, $feedBuilder)->build());
+    }
+
+    /**
+     * Build feed items
+     *
+     * @access protected
+     * @param  array       $events
+     * @param  FeedBuilder $feedBuilder
+     * @return FeedBuilder
+     */
+    protected function buildFeedItems(array $events, FeedBuilder $feedBuilder)
+    {
+        foreach ($events as $event) {
+            $itemDate = new DateTime();
+            $itemDate->setTimestamp($event['date_creation']);
+
+            $itemUrl = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $event['task_id']), '', true);
+
+            $feedBuilder
+                ->withItem(AtomItemBuilder::create($feedBuilder)
+                    ->withTitle($event['event_title'])
+                    ->withUrl($itemUrl.'#event-'.$event['id'])
+                    ->withAuthor($event['author'])
+                    ->withPublishedDate($itemDate)
+                    ->withUpdatedDate($itemDate)
+                    ->withContent($event['event_content'])
+                );
+        }
+
+        return $feedBuilder;
     }
 }