keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'api-finally-moved' of github.com:annando/friendica into api-finally-moved

Browse source
This commit is contained in:
Michael 2022-01-16 20:47:20 +00:00
commit 1fd9557ef7
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Factory/Api/Friendica/Group.php
View file

@ -22,7 +22,7 @@
namespace Friendica\Factory\Api\Friendica;
use Friendica\BaseFactory;
use Friendica\Database\DBA;
use Friendica\Database\Database;
use Friendica\Network\HTTPException;
use Psr\Log\LoggerInterface;
use Friendica\Factory\Api\Twitter\User as TwitterUser;
@ -31,12 +31,15 @@ class Group extends BaseFactory
{
/** @var twitterUser entity */
private $twitterUser;
/** @var Database */
private $database;
public function __construct(LoggerInterface $logger, TwitterUser $twitteruser)
public function __construct(LoggerInterface $logger, TwitterUser $twitteruser, Database $dba)
{
parent::__construct($logger);
$this->twitterUser = $twitteruser;
$this->dba = $dba;
}
/**
@ -46,7 +49,7 @@ class Group extends BaseFactory
*/
public function createFromId(int $id): array
{
$group = DBA::selectFirst('group', [], ['id' => $id, 'deleted' => false]);
$group = $this->dba->selectFirst('group', [], ['id' => $id, 'deleted' => false]);
if (empty($group)) {
return [];
}

1
src/Module/Api/Friendica/Group/Show.php
View file

@ -22,7 +22,6 @@
namespace Friendica\Module\Api\Friendica\Group;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Module\BaseApi;
use Friendica\Network\HTTPException;

1
src/Module/Api/Friendica/Photo/Create.php
View file

@ -90,7 +90,6 @@ class Create extends BaseApi
if (!empty($photo)) {
$data = ['photo' => $this->friendicaPhoto->createFromId($photo['resource_id'], null, $uid, $type)];
$this->response->exit('photo_create', $data, $this->parameters['extension'] ?? null);
return;
} else {
throw new HTTPException\InternalServerErrorException('unknown error - uploading photo failed, see Friendica log for more information');
}