mexon/friendica
1
0
Fork 0
Code Pull requests Activity

UserSession class [5] - Refactor src/Module/ files with DI

Browse source
This commit is contained in:
Philipp Holzer 2022-10-20 22:59:12 +02:00
commit eecc456e0c
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
78 changed files with 455 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Module/Item/Activity.php
View file

@ -26,7 +26,6 @@ use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Core\Session;
use Friendica\Model\Post;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Diaspora;
@ -39,7 +38,7 @@ class Activity extends BaseModule
{
protected function rawContent(array $request = [])
{
if (!Session::isAuthenticated()) {
if (!DI::userSession()->isAuthenticated()) {
throw new HTTPException\ForbiddenException();
}
@ -51,13 +50,13 @@ class Activity extends BaseModule
$itemId = $this->parameters['id'];
if (in_array($verb, ['announce', 'unannounce'])) {
$item = Post::selectFirst(['network', 'uri-id'], ['id' => $itemId, 'uid' => [Session::getLocalUser(), 0]]);
$item = Post::selectFirst(['network', 'uri-id'], ['id' => $itemId, 'uid' => [DI::userSession()->getLocalUserId(), 0]]);
if ($item['network'] == Protocol::DIASPORA) {
Diaspora::performReshare($item['uri-id'], Session::getLocalUser());
Diaspora::performReshare($item['uri-id'], DI::userSession()->getLocalUserId());
}
}
if (!Item::performActivity($itemId, $verb, Session::getLocalUser())) {
if (!Item::performActivity($itemId, $verb, DI::userSession()->getLocalUserId())) {
throw new HTTPException\BadRequestException();
}