wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use HTTPClient to download avatar

Browse Source 
also make updateAvatar public so we can call it from update_ostatus_profile.php
This commit is contained in:
Mikael Nordfeldth 2015-01-18 02:44:55 +01:00
parent 0499736bb4
commit 010824c4b5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1233,7 +1233,7 @@ class Ostatus_profile extends Managed_DataObject
* @param string $url * @param string $url
* @throws Exception in various failure cases * @throws Exception in various failure cases
*/ */
protected function updateAvatar($url) public function updateAvatar($url)
{ {
if ($url == $this->avatar) { if ($url == $this->avatar) {
// We've already got this one. // We've already got this one.
@ -1262,10 +1262,15 @@ class Ostatus_profile extends Managed_DataObject
// ripped from oauthstore.php (for old OMB client) // ripped from oauthstore.php (for old OMB client)
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
try { try {
if (!copy($url, $temp_filename)) { $client = new HTTPClient();
$response = $client->get($url);
if (!$response->isOk()) {
// TRANS: Server exception. %s is a URL. // TRANS: Server exception. %s is a URL.
throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url)); throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.').':%s', $url, $response->getReasonPhrase()));
} }
// FIXME: make sure it's an image here instead of _after_ writing to a file?
file_put_contents($response->getBody(), $temp_filename);
if ($this->isGroup()) { if ($this->isGroup()) {
$id = $this->group_id; $id = $this->group_id;