X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFeed.php;h=1465e10e7196a349ecf999924b20c8a10d2fa001;hb=b36d4eb0dd4bdc25a468c95c749bfae1b6324be9;hp=0ccffbb96b38bbb7e7ada2f11ea321946fb0f1e9;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git

diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 0ccffbb96b..1465e10e71 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,8 +22,11 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Session;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Protocol\Feed as ProtocolFeed;
+use Friendica\Network\HTTPException;
 
 /**
  * Provides public Atom feeds
@@ -41,22 +44,15 @@ use Friendica\Protocol\Feed as ProtocolFeed;
  */
 class Feed extends BaseModule
 {
-	public static function content(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
-		$a = DI::app();
-
-		$last_update = $_GET['last_update'] ?? '';
-		$nocache     = !empty($_GET['nocache']) && local_user();
-
-		// @TODO: Replace with parameter from router
-		if ($a->argc < 2) {
-			throw new \Friendica\Network\HTTPException\BadRequestException();
-		}
+		$last_update = $this->getRequestValue($request, 'last_update', '');
+		$nocache     = !empty($request['nocache']) && Session::getLocalUser();
 
 		$type = null;
 		// @TODO: Replace with parameter from router
-		if ($a->argc > 2) {
-			$type = $a->argv[2];
+		if (DI::args()->getArgc() > 2) {
+			$type = DI::args()->getArgv()[2];
 		}
 
 		switch ($type) {
@@ -72,10 +68,11 @@ class Feed extends BaseModule
 				$type = 'posts';
 		}
 
-		// @TODO: Replace with parameter from router
-		$nickname = $a->argv[1];
-		header("Content-type: application/atom+xml; charset=utf-8");
-		echo ProtocolFeed::atom($nickname, $last_update, 10, $type, $nocache, true);
-		exit();
+		$feed = ProtocolFeed::atom($this->parameters['nickname'], $last_update, 10, $type, $nocache, true);
+		if (empty($feed)) {
+			throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+		}
+
+		System::httpExit($feed, Response::TYPE_ATOM);
 	}
 }