friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

closes #6272

This commit is contained in:
root 2018-12-16 06:16:45 +00:00 committed by Hypolite Petovan
parent d331e4e6e3
commit b43dd28b7a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/api.md
View File

@ -379,6 +379,18 @@ Friendica doesn't allow showing the friends of other users.
* media: image data * media: image data
#### Return values
Object of:
* media_id: a media identifier (integer)
* media_id_string: a media identifier (string)
* size: size in byte
* image.w: image width
* image.h: image height
* image.image_type: image mime type
* image.friendica_preview_url: image preview url
--- ---
### oauth/request_token (*) ### oauth/request_token (*)

4
include/api.php
View File

@ -945,7 +945,6 @@ function api_format_data($root_element, $type, $data)
$ret = $data; $ret = $data;
break; break;
} }
return $ret; return $ret;
} }
@ -1244,7 +1243,7 @@ function api_media_upload()
$returndata["image"] = ["w" => $media["width"], $returndata["image"] = ["w" => $media["width"],
"h" => $media["height"], "h" => $media["height"],
"image_type" => $media["type"], "image_type" => $media["type"],
"preview" => $media["preview"]]; "friendica_preview_url" => $media["preview"]];
Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG); Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG);
@ -5685,7 +5684,6 @@ function api_friendica_notification($type)
$notes = $xmlnotes; $notes = $xmlnotes;
} }
return api_format_data("notes", $type, ['note' => $notes]); return api_format_data("notes", $type, ['note' => $notes]);
} }

1
tests/include/ApiTest.php
View File

@ -1249,6 +1249,7 @@ class ApiTest extends DatabaseTest
$this->assertEquals('image/png', $result['media']['image']['image_type']); $this->assertEquals('image/png', $result['media']['image']['image_type']);
$this->assertEquals(1, $result['media']['image']['w']); $this->assertEquals(1, $result['media']['image']['w']);
$this->assertEquals(1, $result['media']['image']['h']); $this->assertEquals(1, $result['media']['image']['h']);
$this->assertNotEmpty($result['media']['image']['friendica_preview_url']);
} }
/** /**