closes #6272
This commit is contained in:
parent
d331e4e6e3
commit
b43dd28b7a
12
doc/api.md
12
doc/api.md
|
@ -379,6 +379,18 @@ Friendica doesn't allow showing the friends of other users.
|
|||
|
||||
* 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 (*)
|
||||
|
|
|
@ -945,7 +945,6 @@ function api_format_data($root_element, $type, $data)
|
|||
$ret = $data;
|
||||
break;
|
||||
}
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
@ -1244,7 +1243,7 @@ function api_media_upload()
|
|||
$returndata["image"] = ["w" => $media["width"],
|
||||
"h" => $media["height"],
|
||||
"image_type" => $media["type"],
|
||||
"preview" => $media["preview"]];
|
||||
"friendica_preview_url" => $media["preview"]];
|
||||
|
||||
Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG);
|
||||
|
||||
|
@ -5685,7 +5684,6 @@ function api_friendica_notification($type)
|
|||
|
||||
$notes = $xmlnotes;
|
||||
}
|
||||
|
||||
return api_format_data("notes", $type, ['note' => $notes]);
|
||||
}
|
||||
|
||||
|
|
|
@ -1249,6 +1249,7 @@ class ApiTest extends DatabaseTest
|
|||
$this->assertEquals('image/png', $result['media']['image']['image_type']);
|
||||
$this->assertEquals(1, $result['media']['image']['w']);
|
||||
$this->assertEquals(1, $result['media']['image']['h']);
|
||||
$this->assertNotEmpty($result['media']['image']['friendica_preview_url']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue
Block a user