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

Move hasFave() to Profile

Browse Source
This commit is contained in:
Zach Copley 2010-09-27 15:01:03 -07:00
parent 7c4fcefd31
commit d684a07fd9
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
classes/Profile.php
View File

@ -474,6 +474,41 @@ class Profile extends Memcached_DataObject
return $cnt; return $cnt;
} }
function hasFave($notice)
{
$cache = common_memcache();
// XXX: Kind of a hack.
if (!empty($cache)) {
// This is the stream of favorite notices, in rev chron
// order. This forces it into cache.
$ids = Fave::stream($this->id, 0, NOTICE_CACHE_WINDOW);
// If it's in the list, then it's a fave
if (in_array($notice->id, $ids)) {
return true;
}
// If we're not past the end of the cache window,
// then the cache has all available faves, so this one
// is not a fave.
if (count($ids) < NOTICE_CACHE_WINDOW) {
return false;
}
// Otherwise, cache doesn't have all faves;
// fall through to the default
}
$fave = Fave::pkeyGet(array('user_id' => $this->id,
'notice_id' => $notice->id));
return ((is_null($fave)) ? false : true);
}
function faveCount() function faveCount()
{ {
$c = common_memcache(); $c = common_memcache();

33
classes/User.php
View File

@ -412,37 +412,8 @@ class User extends Memcached_DataObject
function hasFave($notice) function hasFave($notice)
{ {
$cache = common_memcache(); $profile = $this->getProfile();
return $profile->hasFave($notice);
// XXX: Kind of a hack.
if ($cache) {
// This is the stream of favorite notices, in rev chron
// order. This forces it into cache.
$ids = Fave::stream($this->id, 0, NOTICE_CACHE_WINDOW);
// If it's in the list, then it's a fave
if (in_array($notice->id, $ids)) {
return true;
}
// If we're not past the end of the cache window,
// then the cache has all available faves, so this one
// is not a fave.
if (count($ids) < NOTICE_CACHE_WINDOW) {
return false;
}
// Otherwise, cache doesn't have all faves;
// fall through to the default
}
$fave = Fave::pkeyGet(array('user_id' => $this->id,
'notice_id' => $notice->id));
return ((is_null($fave)) ? false : true);
} }
function mutuallySubscribed($other) function mutuallySubscribed($other)