Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 07:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace Module::init() with Constructors

Browse source
This commit is contained in:
Philipp 2021-11-17 21:32:57 +01:00
parent de6bb280b1
commit ce578a7745
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
33 changed files with 882 additions and 600 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/Module/FriendSuggest.php
View file

@ -21,15 +21,16 @@
namespace Friendica\Module;
use Friendica\App\BaseURL;
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\Strings;
use Friendica\Worker\Delivery;
@ -38,11 +39,27 @@ use Friendica\Worker\Delivery;
*/
class FriendSuggest extends BaseModule
{
public function init()
/** @var BaseURL */
protected $baseUrl;
/** @var Database */
protected $dba;
/** @var \Friendica\Contact\FriendSuggest\Repository\FriendSuggest */
protected $friendSuggestRepo;
/** @var \Friendica\Contact\FriendSuggest\Factory\FriendSuggest */
protected $friendSuggestFac;
public function __construct(BaseURL $baseUrl, Database $dba, \Friendica\Contact\FriendSuggest\Repository\FriendSuggest $friendSuggestRepo, \Friendica\Contact\FriendSuggest\Factory\FriendSuggest $friendSuggestFac, L10n $l10n, array $parameters = [])
{
parent::__construct($l10n, $parameters);
if (!local_user()) {
throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
throw new ForbiddenException($this->l10n->t('Permission denied.'));
}
$this->baseUrl = $baseUrl;
$this->dba = $dba;
$this->friendSuggestRepo = $friendSuggestRepo;
$this->friendSuggestFac = $friendSuggestFac;
}
public function post()
@ -50,8 +67,8 @@ class FriendSuggest extends BaseModule
$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->l10n->t('Contact not found.'));
}
$suggest_contact_id = intval($_POST['suggest']);
@ -60,15 +77,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->l10n->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 +97,17 @@ class FriendSuggest extends BaseModule
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
info(DI::l10n()->t('Friend suggestion sent.'));
info($this->l10n->t('Friend suggestion sent.'));
}
public function content(): 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->l10n->t('Contact not found.'));
$this->baseUrl->redirect();
}
$suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
@ -117,15 +134,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->l10n->t('Suggest Friends'),
'$fsuggest_select' => [
'suggest',
DI::l10n()->t('Suggest a friend for %s', $contact['name']),
$this->l10n->t('Suggest a friend for %s', $contact['name']),
'',
'',
$formattedContacts,
],
'$submit' => DI::l10n()->t('Submit'),
'$submit' => $this->l10n->t('Submit'),
]);
}
}