clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13667 from annando/issue-12743 

Issue 12743: Allow editing of media in posts
This commit is contained in:
Hypolite Petovan 2023-11-25 10:19:42 -05:00 committed by GitHub
parent 5c3227ac4c ca366e5437
commit 5c6ac25945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Module/Api/Mastodon/Statuses.php
View File

@ -52,12 +52,13 @@ class Statuses extends BaseApi
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$request = $this->getRequest([ $request = $this->getRequest([
'status' => '', // Text content of the status. If media_ids is provided, this becomes optional. Attaching a poll is optional while status is provided. 'status' => '', // Text content of the status. If media_ids is provided, this becomes optional. Attaching a poll is optional while status is provided.
'media_ids' => [], // Array of Attachment ids to be attached as media. If provided, status becomes optional, and poll cannot be used. 'media_ids' => [], // Array of Attachment ids to be attached as media. If provided, status becomes optional, and poll cannot be used.
'in_reply_to_id' => 0, // ID of the status being replied to, if status is a reply 'in_reply_to_id' => 0, // ID of the status being replied to, if status is a reply
'spoiler_text' => '', // Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field. 'spoiler_text' => '', // Text to be shown as a warning or subject before the actual content. Statuses are generally collapsed behind this field.
'language' => '', // ISO 639 language code for this status. 'language' => '', // ISO 639 language code for this status.
'friendica' => [], 'media_attributes' => [],
'friendica' => [],
], $request); ], $request);
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
@ -120,6 +121,12 @@ class Statuses extends BaseApi
$media_ids = []; $media_ids = [];
$existing_media = array_column(Post\Media::getByURIId($post['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]), 'id'); $existing_media = array_column(Post\Media::getByURIId($post['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]), 'id');
foreach ($request['media_attributes'] as $attributes) {
if (in_array($attributes['id'], $existing_media)) {
Post\Media::updateById(['description' => $attributes['description']], $attributes['id']);
}
}
foreach ($request['media_ids'] as $media) { foreach ($request['media_ids'] as $media) {
if (!in_array($media, $existing_media)) { if (!in_array($media, $existing_media)) {
$media_ids[] = $media; $media_ids[] = $media;