all original avatars are not called -original-, so get the largest one instead

This commit is contained in:
Hannes Mannerheim 2016-01-12 04:53:24 +01:00
parent 79288b3200
commit 734bff0946

View File

@ -1257,13 +1257,21 @@ class QvitterPlugin extends Plugin {
// ugly fix if avatar is missing in the db but exists on the server // ugly fix if avatar is missing in the db but exists on the server
$avatar_profile_size = Avatar::byProfile($profile, AVATAR_PROFILE_SIZE); $avatar_profile_size = Avatar::byProfile($profile, AVATAR_PROFILE_SIZE);
$maybe_original_avatar = str_replace('-'.AVATAR_PROFILE_SIZE.'-','-original-',$avatar_profile_size->filename); $wildcard_avatar = str_replace('-'.AVATAR_PROFILE_SIZE.'-','-*-',$avatar_profile_size->filename);
error_log('maybe: '.$maybe_original_avatar); $largest_avatar = array('name'=>false,'size'=>0);
if(file_exists(Avatar::path($maybe_original_avatar))) { foreach (glob('avatar/'.$wildcard_avatar) as $filename) {
$origurl = common_path('avatar/', StatusNet::isHTTPS()).$maybe_original_avatar; $size = filesize($filename);
if($size > $largest_avatar['size']) {
$largest_avatar['size'] = $size;
$largest_avatar['name'] = $filename;
}
}
if($largest_avatar['size']>0) {
$origurl = common_path('', StatusNet::isHTTPS()).$largest_avatar['name'];
} else { } else {
$origurl = $twitter_user['profile_image_url_profile_size']; $origurl = $twitter_user['profile_image_url_profile_size'];
} }
} }
$twitter_user['profile_image_url_original'] = $origurl; $twitter_user['profile_image_url_original'] = $origurl;