diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 2ffe91feb5..7dcc6dbd88 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -21,13 +21,18 @@
namespace Friendica\Module\Profile;
+use Friendica\App;
+use Friendica\Content\Conversation;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Core\Protocol;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Database\DBA;
-use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Post;
@@ -36,150 +41,176 @@ use Friendica\Model\Profile as ProfileModel;
use Friendica\Model\User;
use Friendica\Model\Verb;
use Friendica\Module\BaseProfile;
+use Friendica\Module\Response;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
use Friendica\Security\Security;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
use Friendica\Util\Strings;
-use Friendica\Util\XML;
+use Psr\Log\LoggerInterface;
class Status extends BaseProfile
{
+ /** @var App */
+ private $app;
+ /** @var App\Page */
+ private $page;
+ /** @var DateTimeFormat */
+ private $dateTimeFormat;
+ /** @var IManageConfigValues */
+ private $config;
+ /** @var IHandleUserSessions */
+ private $session;
+ /** @var Conversation */
+ private $conversation;
+ /** @var IManagePersonalConfigValues */
+ private $pConfig;
+ /** @var App\Mode */
+ private $mode;
+
+ public function __construct(App\Mode $mode, IManagePersonalConfigValues $pConfig, Conversation $conversation, IHandleUserSessions $session, IManageConfigValues $config, DateTimeFormat $dateTimeFormat, App\Page $page, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+ {
+ parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+ $this->app = $app;
+ $this->page = $page;
+ $this->dateTimeFormat = $dateTimeFormat;
+ $this->config = $config;
+ $this->session = $session;
+ $this->conversation = $conversation;
+ $this->pConfig = $pConfig;
+ $this->mode = $mode;
+ }
+
protected function content(array $request = []): string
{
- $args = DI::args();
-
- $a = DI::app();
-
- $profile = ProfileModel::load($a, $this->parameters['nickname']);
-
+ $profile = ProfileModel::load($this->app, $this->parameters['nickname'] ?? '');
if (empty($profile)) {
- throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+ throw new HTTPException\NotFoundException($this->t('User not found.'));
+ }
+
+ if ($this->config->get('system', 'block_public') && !$this->session->isAuthenticated()) {
+ return Login::form();
+ }
+
+ if (!empty($profile['hidewall']) && !$this->session->isAuthenticated()) {
+ $this->baseUrl->redirect('profile/' . $profile['nickname'] . '/restricted');
}
if (!$profile['net-publish']) {
- DI::page()['htmlhead'] .= '' . "\n";
+ $this->page['htmlhead'] .= '' . "\n";
}
- DI::page()['htmlhead'] .= '' . "\n";
- DI::page()['htmlhead'] .= '' . "\n";
- DI::page()['htmlhead'] .= '' . "\n";
- DI::page()['htmlhead'] .= '' . "\n";
+ $this->page['htmlhead'] .= '' . "\n";
+ $this->page['htmlhead'] .= '' . "\n";
+ $this->page['htmlhead'] .= '' . "\n";
+ $this->page['htmlhead'] .= '' . "\n";
$category = $datequery = $datequery2 = '';
- $dtFormat = DI::dtFormat();
-
- if ($args->getArgc() > 3) {
- for ($x = 3; $x < $args->getArgc(); $x++) {
- if ($dtFormat->isYearMonthDay($args->get($x))) {
+ if ($this->args->getArgc() > 3) {
+ for ($x = 3; $x < $this->args->getArgc(); $x++) {
+ if ($this->dateTimeFormat->isYearMonthDay($this->args->get($x))) {
if ($datequery) {
- $datequery2 = Strings::escapeHtml($args->get($x));
+ $datequery2 = $this->args->get($x);
} else {
- $datequery = Strings::escapeHtml($args->get($x));
+ $datequery = $this->args->get($x);
}
} else {
- $category = $args->get($x);
+ $category = $this->args->get($x);
}
}
}
if (empty($category)) {
- $category = $_GET['category'] ?? '';
+ $category = $request['category'] ?? '';
}
- $hashtags = $_GET['tag'] ?? '';
-
- if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteContactID($profile['uid'])) {
- return Login::form();
- }
+ $hashtags = $request['tag'] ?? '';
$o = '';
- if ($profile['uid'] == DI::userSession()->getLocalUserId()) {
+ if ($profile['uid'] == $this->session->getLocalUserId()) {
Nav::setSelected('home');
}
- $remote_contact = DI::userSession()->getRemoteContactID($profile['uid']);
- $is_owner = DI::userSession()->getLocalUserId() == $profile['uid'];
- $last_updated_key = "profile:" . $profile['uid'] . ":" . DI::userSession()->getLocalUserId() . ":" . $remote_contact;
-
- if (!empty($profile['hidewall']) && !DI::userSession()->isAuthenticated()) {
- $this->baseUrl->redirect('profile/' . $profile['nickname'] . '/restricted');
- }
+ $remote_contact = $this->session->getRemoteContactID($profile['uid']);
+ $is_owner = $this->session->getLocalUserId() == $profile['uid'];
+ $last_updated_key = "profile:" . $profile['uid'] . ":" . $this->session->getLocalUserId() . ":" . $remote_contact;
$o .= self::getTabsHTML('status', $is_owner, $profile['nickname'], $profile['hide-friends']);
$o .= Widget::commonFriendsVisitor($profile['uid'], $profile['nickname']);
- $commpage = $profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
+ $commpage = $profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$commvisitor = $commpage && $remote_contact;
- DI::page()['aside'] .= Widget::postedByYear(DI::baseUrl() . '/profile/' . $profile['nickname'] . '/status', $profile['profile_uid'] ?? 0, true);
- DI::page()['aside'] .= Widget::categories($profile['uid'], DI::baseUrl() . '/profile/' . $profile['nickname'] . '/status', $category);
- DI::page()['aside'] .= Widget::tagCloud($profile['uid']);
+ $this->page['aside'] .= Widget::postedByYear($this->baseUrl . '/profile/' . $profile['nickname'] . '/status', $profile['profile_uid'] ?? 0, true);
+ $this->page['aside'] .= Widget::categories($profile['uid'], $this->baseUrl . '/profile/' . $profile['nickname'] . '/status', $category);
+ $this->page['aside'] .= Widget::tagCloud($profile['uid']);
if (Security::canWriteToUserWall($profile['uid'])) {
$x = [
- 'is_owner' => $is_owner,
- 'allow_location' => ($is_owner || $commvisitor) && $profile['allow_location'],
+ 'is_owner' => $is_owner,
+ 'allow_location' => ($is_owner || $commvisitor) && $profile['allow_location'],
'default_location' => $is_owner ? $profile['default-location'] : '',
- 'nickname' => $profile['nickname'],
- 'acl' => $is_owner ? ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true) : '',
- 'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
- 'profile_uid' => $profile['uid'],
+ 'nickname' => $profile['nickname'],
+ 'acl' => $is_owner ? ACL::getFullSelectorHTML($this->page, $this->app->getLoggedInUserId(), true) : '',
+ 'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
+ 'profile_uid' => $profile['uid'],
];
- $o .= DI::conversation()->statusEditor($x);
+ $o .= $this->conversation->statusEditor($x);
}
// Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
$condition = Item::getPermissionsConditionArrayByUserId($profile['uid']);
- $last_updated_array = DI::session()->get('last_updated', []);
+ $last_updated_array = $this->session->get('last_updated', []);
if (!empty($category)) {
$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `category-view` WHERE `name` = ? AND `type` = ? AND `uid` = ?)",
- $category, Category::CATEGORY, $profile['uid']]);
+ $category, Category::CATEGORY, $profile['uid']]);
}
if (!empty($hashtags)) {
$condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` = ? AND `uid` = ?)",
- $hashtags, $profile['uid']]);
+ $hashtags, $profile['uid']]);
}
if (!empty($datequery)) {
- $condition = DBA::mergeConditions($condition, ["`received` <= ?", DateTimeFormat::convert($datequery, 'UTC', $a->getTimeZone())]);
+ $condition = DBA::mergeConditions($condition, ["`received` <= ?", DateTimeFormat::convert($datequery, 'UTC', $this->app->getTimeZone())]);
}
+
if (!empty($datequery2)) {
- $condition = DBA::mergeConditions($condition, ["`received` >= ?", DateTimeFormat::convert($datequery2, 'UTC', $a->getTimeZone())]);
+ $condition = DBA::mergeConditions($condition, ["`received` >= ?", DateTimeFormat::convert($datequery2, 'UTC', $this->app->getTimeZone())]);
}
// Does the profile page belong to a forum?
// If not then we can improve the performance with an additional condition
- $condition2 = ['uid' => $profile['uid'], 'account-type' => User::ACCOUNT_TYPE_COMMUNITY];
- if (!DBA::exists('user', $condition2)) {
+ if ($profile['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
$condition = DBA::mergeConditions($condition, ['contact-id' => $profile['id']]);
}
- if (DI::mode()->isMobile()) {
- $itemspage_network = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_mobile_network',
- DI::config()->get('system', 'itemspage_network_mobile'));
+ if ($this->mode->isMobile()) {
+ $itemspage_network = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'itemspage_mobile_network',
+ $this->config->get('system', 'itemspage_network_mobile'));
} else {
- $itemspage_network = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'itemspage_network',
- DI::config()->get('system', 'itemspage_network'));
+ $itemspage_network = $this->pConfig->get($this->session->getLocalUserId(), 'system', 'itemspage_network',
+ $this->config->get('system', 'itemspage_network'));
}
$condition = DBA::mergeConditions($condition, ["((`gravity` = ? AND `wall`) OR
(`gravity` = ? AND `vid` = ? AND `origin`
AND EXISTS(SELECT `uri-id` FROM `post` WHERE `uri-id` = `post-user-view`.`thr-parent-id` AND `gravity` = ? AND `network` IN (?, ?))))",
- Item::GRAVITY_PARENT, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), Item::GRAVITY_PARENT, Protocol::ACTIVITYPUB, Protocol::DFRN]);
+ Item::GRAVITY_PARENT, Item::GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), Item::GRAVITY_PARENT, Protocol::ACTIVITYPUB, Protocol::DFRN]);
- $condition = DBA::mergeConditions($condition, ['uid' => $profile['uid'], 'network' => Protocol::FEDERATED,
- 'visible' => true, 'deleted' => false]);
+ $condition = DBA::mergeConditions($condition, ['uid' => $profile['uid'], 'network' => Protocol::FEDERATED,
+ 'visible' => true, 'deleted' => false]);
- $pager = new Pager(DI::l10n(), $args->getQueryString(), $itemspage_network);
+ $pager = new Pager($this->l10n, $this->args->getQueryString(), $itemspage_network);
$params = ['limit' => [$pager->getStart(), $pager->getItemsPerPage()], 'order' => ['received' => true]];
$items_stmt = Post::select(['uri-id', 'thr-parent-id', 'gravity', 'author-id', 'received'], $condition, $params);
@@ -187,29 +218,29 @@ class Status extends BaseProfile
// Set a time stamp for this page. We will make use of it when we
// search for new items (update routine)
$last_updated_array[$last_updated_key] = time();
- DI::session()->set('last_updated', $last_updated_array);
+ $this->session->set('last_updated', $last_updated_array);
- if ($is_owner && !DI::config()->get('theme', 'hide_eventlist')) {
+ if ($is_owner && !$this->config->get('theme', 'hide_eventlist')) {
$o .= ProfileModel::getBirthdays();
$o .= ProfileModel::getEventsReminderHTML();
}
if ($is_owner) {
- $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
+ $unseen = Post::exists(['wall' => true, 'unseen' => true, 'uid' => $this->session->getLocalUserId()]);
if ($unseen) {
- Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => DI::userSession()->getLocalUserId()]);
+ Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => $this->session->getLocalUserId()]);
}
}
$items = Post::toArray($items_stmt);
if ($pager->getStart() == 0 && !empty($profile['uid'])) {
- $pcid = Contact::getPublicIdByUserId($profile['uid']);
+ $pcid = Contact::getPublicIdByUserId($profile['uid']);
$pinned = Post\Collection::selectToArrayForContact($pcid, Post\Collection::FEATURED);
- $items = array_merge($items, $pinned);
+ $items = array_merge($items, $pinned);
}
- $o .= DI::conversation()->create($items, 'profile', false, false, 'pinned_received', $profile['uid']);
+ $o .= $this->conversation->create($items, 'profile', false, false, 'pinned_received', $profile['uid']);
$o .= $pager->renderMinimal(count($items));