Commit 06e24225 authored by Evan Prodromou's avatar Evan Prodromou

pre-fill avatars for Profiles in a notice list

parent e05f423b
......@@ -27,6 +27,11 @@ class Avatar extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
static function pivotGet($keyCol, $keyVals, $otherCols)
{
return Memcached_DataObject::pivotGet('Avatar', $keyCol, $keyVals, $otherCols);
}
// We clean up the file, too
function delete()
......
......@@ -2481,24 +2481,26 @@ class Notice extends Memcached_DataObject
static function fillProfiles($notices)
{
$authors = array();
$map = self::getProfiles($notices);
foreach ($notices as $notice) {
if (array_key_exists($notice->profile_id, $authors)) {
$authors[$notice->profile_id][] = $notice;
} else {
$authors[$notice->profile_id] = array($notice);
}
if (array_key_exists($notice->profile_id, $map)) {
$notice->_setProfile($map[$notice->profile_id]);
}
}
$profile = Profile::multiGet('id', array_keys($authors));
return array_values($map);
}
static function getProfiles(&$notices)
{
$ids = array();
foreach ($notices as $notice) {
$ids[] = $notice->profile_id;
}
$profiles = $profile->fetchAll();
$ids = array_unique($ids);
foreach ($profiles as $p) {
foreach ($authors[$p->id] as $notice) {
$notice->_setProfile($p);
}
}
return Memcached_DataObject::pivotGet('Profile', 'id', $ids);
}
}
......@@ -68,12 +68,18 @@ class Profile extends Memcached_DataObject
return $this->_user;
}
protected $_avatars = array();
function getAvatar($width, $height=null)
{
if (is_null($height)) {
$height = $width;
}
if (array_key_exists($width, $this->_avatars)) {
return $this->_avatars[$width];
}
$avatar = null;
if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) {
......@@ -83,9 +89,16 @@ class Profile extends Memcached_DataObject
Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar));
}
$this->_avatars[$width] = $avatar;
return $avatar;
}
function _fillAvatar($width, $avatar)
{
$this->_avatars[$width] = $avatar;
}
function getOriginalAvatar()
{
$avatar = DB_DataObject::factory('avatar');
......@@ -1353,7 +1366,26 @@ class Profile extends Memcached_DataObject
function __sleep()
{
$vars = parent::__sleep();
$skip = array('_user');
$skip = array('_user', '_avatars');
return array_diff($vars, $skip);
}
static function fillAvatars(&$profiles, $width)
{
$ids = array();
foreach ($profiles as $profile) {
$ids[] = $profile->id;
}
common_debug('Got here');
$avatars = Avatar::pivotGet('profile_id', $ids, array('width' => $width,
'height' => $width));
common_debug(sprintf('Got %d avatars for %d profiles', count($avatars), count($ids)));
foreach ($profiles as $profile) {
$profile->_fillAvatar($width, $avatars[$profile->id]);
}
}
}
......@@ -125,6 +125,7 @@ class NoticeList extends Widget
function prefill(&$notices)
{
// Prefill the profiles
Notice::fillProfiles($notices);
$profiles = Notice::fillProfiles($notices);
Profile::fillAvatars($profiles, AVATAR_STREAM_SIZE);
}
}
......@@ -254,7 +254,8 @@ class ThreadedNoticeListItem extends NoticeListItem
function prefill(&$notices)
{
// Prefill the profiles
Notice::fillProfiles($notices);
$profiles = Notice::fillProfiles($notices);
Profile::fillAvatars($profiles, AVATAR_MINI_SIZE);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment