From c61b0f94b5cf4bd5ce33404615e73f44a4f2dc05 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 10:50:31 +0100
Subject: [PATCH 1/2] Moving mod/feedtest to src/Module/Feedtest

---
 mod/feedtest.php        | 50 -------------------------------------
 src/Model/Contact.php   | 10 ++++++++
 src/Module/Feedtest.php | 55 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 50 deletions(-)
 delete mode 100644 mod/feedtest.php
 create mode 100644 src/Module/Feedtest.php

diff --git a/mod/feedtest.php b/mod/feedtest.php
deleted file mode 100644
index cffc1f3451..0000000000
--- a/mod/feedtest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file_tag_list_to_file mod/feedtest.php
- */
-
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Protocol\Feed;
-use Friendica\Util\Network;
-
-function feedtest_content(App $a)
-{
-	if (!local_user()) {
-		info(L10n::t('You must be logged in to use this module'));
-		return;
-	};
-
-	$result = [];
-	if (!empty($_REQUEST['url'])) {
-		$url = $_REQUEST['url'];
-
-		$importer = DBA::selectFirst('user', [], ['uid' => local_user()]);
-
-		$contact_id = Contact::getIdForURL($url, local_user(), true);
-
-		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
-
-		$xml = Network::fetchUrl($contact['poll']);
-
-		$dummy = null;
-		$import_result = Feed::import($xml, $importer, $contact, $dummy, true);
-
-		$result = [
-			'input' => $xml,
-			'output' => var_export($import_result, true),
-		];
-	}
-
-	$tpl = Renderer::getMarkupTemplate('feedtest.tpl');
-	$o = Renderer::replaceMacros($tpl, [
-		'$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
-		'$result' => $result
-	]);
-
-	return $o;
-}
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2d6bc716bb..1fbe85c3ca 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -109,6 +109,16 @@ class Contact extends BaseObject
 	 * @}
 	 */
 
+	/**
+	 * @param  integer       $id
+	 * @return array|boolean Contact record if it exists, false otherwise
+	 * @throws \Exception
+	 */
+	public static function getById($id)
+	{
+		return DBA::selectFirst('contact', [], ['id' => $id]);
+	}
+
 	/**
 	 * @brief Tests if the given contact is a follower
 	 *
diff --git a/src/Module/Feedtest.php b/src/Module/Feedtest.php
new file mode 100644
index 0000000000..ff4c960c1b
--- /dev/null
+++ b/src/Module/Feedtest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Model;
+use Friendica\Protocol;
+use Friendica\Util\Network;
+
+/**
+ * Tests a given feed of a contact
+ */
+class Feedtest extends BaseModule
+{
+	public static function init()
+	{
+		if (!local_user()) {
+			info(L10n::t('You must be logged in to use this module'));
+			self::getApp()->internalRedirect();
+		}
+	}
+
+	public static function content()
+	{
+		$result = [];
+		if (!empty($_REQUEST['url'])) {
+			$url = $_REQUEST['url'];
+
+			$importer = Model\User::getById(local_user());
+
+			$contact_id = Model\Contact::getIdForURL($url, local_user(), true);
+			$contact = Model\Contact::getById($contact_id);
+
+			$xml = Network::fetchUrl($contact['poll']);
+
+			$dummy = null;
+			$import_result = Protocol\Feed::import($xml, $importer, $contact, $dummy, true);
+
+			$result = [
+				'input' => $xml,
+				'output' => var_export($import_result, true),
+			];
+		}
+
+		print_r($result);
+
+		$tpl = Renderer::getMarkupTemplate('feedtest.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],
+			'$result' => $result
+		]);
+	}
+}

From bae82df326246118ec1482804232818b2ed553e7 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 17:29:18 +0100
Subject: [PATCH 2/2] removed debugging

---
 src/Module/Feedtest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Module/Feedtest.php b/src/Module/Feedtest.php
index ff4c960c1b..75cca52086 100644
--- a/src/Module/Feedtest.php
+++ b/src/Module/Feedtest.php
@@ -44,8 +44,6 @@ class Feedtest extends BaseModule
 			];
 		}
 
-		print_r($result);
-
 		$tpl = Renderer::getMarkupTemplate('feedtest.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'$url'    => ['url', L10n::t('Source URL'), defaults($_REQUEST, 'url', ''), ''],