GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Ostatus_profile smarter test if avatar exists 

If you accidentally deleted a remote user's avatar from filesystem,
it'd take until its URL was updated that you got it back. Now it
happens if the local avatar file doesn't exist.
This commit is contained in:
Mikael Nordfeldth 2015-01-26 17:43:09 +01:00
parent 697a00d8e1
commit cf46de6ca7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,14 +1231,22 @@ class Ostatus_profile extends Managed_DataObject
* Download and update given avatar image
*
* @param string $url
* @return Avatar The Avatar we have on disk. (seldom used)
* @throws Exception in various failure cases
*/
public function updateAvatar($url, $force)
{
if ($url == $this->avatar && !$force) {
// We've already got this one.
return;
try {
// If avatar URL differs: update. If URLs were identical but we're forced: update.
if ($url == $this->avatar && !$force) {
// If there's no locally stored avatar, throw an exception and continue fetching below.
$avatar = Avatar::getUploaded($this->localProfile()) instanceof Avatar;
return $avatar;
}
} catch (NoAvatarException $e) {
// No avatar available, let's fetch it.
}
if (!common_valid_http_url($url)) {
// TRANS: Server exception. %s is a URL.
throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
@ -1301,6 +1309,8 @@ class Ostatus_profile extends Managed_DataObject
$orig = clone($this);
$this->avatar = $url;
$this->update($orig);
return Avatar::getUploaded($self);
}
/**