bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix Photo delete endpoint

Browse source 
- Set the request variable type
- Fix the condition on a nonexistant item field
This commit is contained in:
Hypolite Petovan 2021-11-27 17:05:58 -05:00
parent d433c06632
commit e2016bc67d
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Api/Friendica/Photo/Delete.php
View file

@ -21,7 +21,6 @@
namespace Friendica\Module\Api\Friendica\Photo; namespace Friendica\Module\Api\Friendica\Photo;
use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
@ -35,11 +34,10 @@ class Delete extends BaseApi
{ {
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$request = self::getRequest([ $request = self::getRequest([
'photo_id' => null, // Photo id 'photo_id' => '', // Photo id
], $request); ], $request);
// do several checks on input parameters // do several checks on input parameters
@ -60,7 +58,7 @@ class Delete extends BaseApi
if ($result) { if ($result) {
// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
// to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion) // to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion)
$condition = ['uid' => $uid, 'resource-id' => $request['photo_id'], 'type' => 'photo']; $condition = ['uid' => $uid, 'resource-id' => $request['photo_id'], 'post-type' => Item::PT_IMAGE, 'origin' => true];
Item::deleteForUser($condition, $uid); Item::deleteForUser($condition, $uid);
$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.']; $result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];