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

Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

Browse source
This commit is contained in:
Michael 2021-11-30 05:00:46 +00:00
commit 33c8872c65
7 changed files with 103 additions and 10 deletions
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;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Module\BaseApi;
@ -35,11 +34,10 @@ class Delete extends BaseApi
{
protected function post(array $request = [], array $post = [])
{
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$request = self::getRequest([
'photo_id' => null, // Photo id
'photo_id' => '', // Photo id
], $request);
// do several checks on input parameters
@ -60,7 +58,7 @@ class Delete extends BaseApi
if ($result) {
// 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)
$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);
$result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.'];

2
src/Module/Api/Friendica/Photoalbum/Delete.php
View file

@ -58,7 +58,7 @@ class Delete extends BaseApi
// 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() performs the federation of the deletion to other networks
$condition = ['uid' => $uid, 'resource-id' => $resourceIds, 'type' => 'photo'];
$condition = ['uid' => $uid, 'resource-id' => $resourceIds, 'post-type' => Item::PT_IMAGE, 'origin' => true];
Item::deleteForUser($condition, $uid);
// now let's delete all photos from the album