Merge pull request #8135 from annando/brief

[friendica.git] / src / Module / Feed.php

diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 5df68f223ed57b93a365f8f1cc8580e306111d70..cf3a0f7154fc23f0133351c9cf32fd7ee7a4e4b2 100644 (file)
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -3,7 +3,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Protocol\OStatus;
 
 /**
@@ -18,24 +18,24 @@ use Friendica\Protocol\OStatus;
  *
  * The nocache GET parameter is provided mainly for debug purposes, requires auth
  *
- * @brief Provides public Atom feeds
- *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Feed extends BaseModule
 {
-       public static function content()
+       public static function content(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
-               $last_update = x($_GET, 'last_update') ? $_GET['last_update'] : '';
-               $nocache     = x($_GET, 'nocache') && local_user();
+               $last_update = $_GET['last_update'] ?? '';
+               $nocache     = !empty($_GET['nocache']) && local_user();
 
+               // @TODO: Replace with parameter from router
                if ($a->argc < 2) {
-                       System::httpExit(400);
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
                $type = null;
+               // @TODO: Replace with parameter from router
                if ($a->argc > 2) {
                        $type = $a->argv[2];
                }
@@ -44,6 +44,7 @@ class Feed extends BaseModule
                        case 'posts':
                        case 'comments':
                        case 'activity':
+                               // Correct type names, no change needed
                                break;
                        case 'replies':
                                $type = 'comments';
@@ -52,9 +53,10 @@ class Feed extends BaseModule
                                $type = 'posts';
                }
 
+               // @TODO: Replace with parameter from router
                $nickname = $a->argv[1];
-               header("Content-type: application/atom+xml");
-               echo OStatus::feed($nickname, $last_update, 10, $type, $nocache);
-               killme();
+               header("Content-type: application/atom+xml; charset=utf-8");
+               echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true);
+               exit();
        }
 }