X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendSuggest.php;h=1bbae8042a91974db196b63886ca4d912838405f;hb=2e4d654c0a241891a8a64ebd3e49ebde42fad8cc;hp=b0456377f1c53d8ed76f29996d3b9f81300ec12d;hpb=89d6c89b6775bc37340dd93d747022e2d7db9618;p=friendica.git

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index b0456377f1..1bbae8042a 100644
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -21,37 +21,53 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
-use Friendica\DI;
+use Friendica\Database\Database;
 use Friendica\Model\Contact as ContactModel;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
+use Psr\Log\LoggerInterface;
 
 /**
  * Suggest friends to a known contact
  */
 class FriendSuggest extends BaseModule
 {
-	public function init()
+	/** @var Database */
+	protected $dba;
+	/** @var \Friendica\Contact\FriendSuggest\Repository\FriendSuggest */
+	protected $friendSuggestRepo;
+	/** @var \Friendica\Contact\FriendSuggest\Factory\FriendSuggest */
+	protected $friendSuggestFac;
+
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, \Friendica\Contact\FriendSuggest\Repository\FriendSuggest $friendSuggestRepo, \Friendica\Contact\FriendSuggest\Factory\FriendSuggest $friendSuggestFac, array $server, array $parameters = [])
 	{
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
 		if (!local_user()) {
-			throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
+			throw new ForbiddenException($this->t('Permission denied.'));
 		}
+
+		$this->dba               = $dba;
+		$this->friendSuggestRepo = $friendSuggestRepo;
+		$this->friendSuggestFac  = $friendSuggestFac;
 	}
 
-	public function post()
+	protected function post(array $request = [])
 	{
 		$cid = intval($this->parameters['contact']);
 
 		// We do query the "uid" as well to ensure that it is our contact
-		if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
-			throw new NotFoundException(DI::l10n()->t('Contact not found.'));
+		if (!$this->dba->exists('contact', ['id' => $cid, 'uid' => local_user()])) {
+			throw new NotFoundException($this->t('Contact not found.'));
 		}
 
 		$suggest_contact_id = intval($_POST['suggest']);
@@ -60,15 +76,15 @@ class FriendSuggest extends BaseModule
 		}
 
 		// We do query the "uid" as well to ensure that it is our contact
-		$contact = DI::dba()->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
+		$contact = $this->dba->selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
 		if (empty($contact)) {
-			notice(DI::l10n()->t('Suggested contact not found.'));
+			notice($this->t('Suggested contact not found.'));
 			return;
 		}
 
 		$note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
 
-		$suggest = DI::fsuggest()->save(DI::fsuggestFactory()->createNew(
+		$suggest = $this->friendSuggestRepo->save($this->friendSuggestFac->createNew(
 			local_user(),
 			$cid,
 			$contact['name'],
@@ -80,17 +96,17 @@ class FriendSuggest extends BaseModule
 
 		Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
 
-		info(DI::l10n()->t('Friend suggestion sent.'));
+		info($this->t('Friend suggestion sent.'));
 	}
 
-	public function content(): string
+	protected function content(array $request = []): string
 	{
 		$cid = intval($this->parameters['contact']);
 
-		$contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+		$contact = $this->dba->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 		if (empty($contact)) {
-			notice(DI::l10n()->t('Contact not found.'));
-			DI::baseUrl()->redirect();
+			notice($this->t('Contact not found.'));
+			$this->baseUrl->redirect();
 		}
 
 		$suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
@@ -117,15 +133,15 @@ class FriendSuggest extends BaseModule
 		$tpl = Renderer::getMarkupTemplate('fsuggest.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'$contact_id'      => $cid,
-			'$fsuggest_title'  => DI::l10n()->t('Suggest Friends'),
+			'$fsuggest_title'  => $this->t('Suggest Friends'),
 			'$fsuggest_select' => [
 				'suggest',
-				DI::l10n()->t('Suggest a friend for %s', $contact['name']),
+				$this->t('Suggest a friend for %s', $contact['name']),
 				'',
 				'',
 				$formattedContacts,
 			],
-			'$submit'          => DI::l10n()->t('Submit'),
+			'$submit'          => $this->t('Submit'),
 		]);
 	}
 }