Do calls straight to the result of getProfile

This commit is contained in:
Mikael Nordfeldth 2013-10-15 02:34:10 +02:00
parent 4e8d7795d0
commit 8202e922aa

View File

@ -141,14 +141,12 @@ class User extends Managed_DataObject
function isSubscribed($other) function isSubscribed($other)
{ {
$profile = $this->getProfile(); return $this->getProfile()->isSubscribed($other);
return $profile->isSubscribed($other);
} }
function hasPendingSubscription($other) function hasPendingSubscription($other)
{ {
$profile = $this->getProfile(); return $this->getProfile()->hasPendingSubscription($other);
return $profile->hasPendingSubscription($other);
} }
// 'update' won't write key columns, so we have to do it ourselves. // 'update' won't write key columns, so we have to do it ourselves.
@ -218,8 +216,7 @@ class User extends Managed_DataObject
*/ */
function getCurrentNotice() function getCurrentNotice()
{ {
$profile = $this->getProfile(); return $this->getProfile()->getCurrentNotice();
return $profile->getCurrentNotice();
} }
function getCarrier() function getCarrier()
@ -229,8 +226,7 @@ class User extends Managed_DataObject
function hasBlocked($other) function hasBlocked($other)
{ {
$profile = $this->getProfile(); return $this->getProfile()->hasBlocked($other);
return $profile->hasBlocked($other);
} }
/** /**
@ -492,14 +488,12 @@ class User extends Managed_DataObject
function hasFave($notice) function hasFave($notice)
{ {
$profile = $this->getProfile(); return $this->getProfile()->hasFave($notice);
return $profile->hasFave($notice);
} }
function mutuallySubscribed($other) function mutuallySubscribed($other)
{ {
$profile = $this->getProfile(); return $this->getProfile()->mutuallySubscribed($other);
return $profile->mutuallySubscribed($other);
} }
function mutuallySubscribedUsers() function mutuallySubscribedUsers()
@ -523,14 +517,12 @@ class User extends Managed_DataObject
} }
function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) { function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
$profile = $this->getProfile(); return $this->getProfile()->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id);
return $profile->getTaggedNotices($tag, $offset, $limit, $since_id, $before_id);
} }
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{ {
$profile = $this->getProfile(); return $this->getProfile()->getNotices($offset, $limit, $since_id, $before_id);
return $profile->getNotices($offset, $limit, $since_id, $before_id);
} }
function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
@ -581,8 +573,7 @@ class User extends Managed_DataObject
function blowFavesCache() function blowFavesCache()
{ {
$profile = $this->getProfile(); $this->getProfile()->blowFavesCache();
$profile->blowFavesCache();
} }
function getSelfTags() function getSelfTags()
@ -663,20 +654,17 @@ class User extends Managed_DataObject
function isMember($group) function isMember($group)
{ {
$profile = $this->getProfile(); return $this->getProfile()->isMember($group);
return $profile->isMember($group);
} }
function isAdmin($group) function isAdmin($group)
{ {
$profile = $this->getProfile(); return $this->getProfile()->isAdmin($group);
return $profile->isAdmin($group);
} }
function getGroups($offset=0, $limit=null) function getGroups($offset=0, $limit=null)
{ {
$profile = $this->getProfile(); return $this->getProfile()->getGroups($offset, $limit);
return $profile->getGroups($offset, $limit);
} }
/** /**
@ -688,8 +676,7 @@ class User extends Managed_DataObject
*/ */
function joinGroup(User_group $group) function joinGroup(User_group $group)
{ {
$profile = $this->getProfile(); return $this->getProfile()->joinGroup($group);
return $profile->joinGroup($group);
} }
/** /**
@ -699,20 +686,17 @@ class User extends Managed_DataObject
*/ */
function leaveGroup(User_group $group) function leaveGroup(User_group $group)
{ {
$profile = $this->getProfile(); return $this->getProfile()->leaveGroup($group);
return $profile->leaveGroup($group);
} }
function getSubscribed($offset=0, $limit=null) function getSubscribed($offset=0, $limit=null)
{ {
$profile = $this->getProfile(); return $this->getProfile()->getSubscribed($offset, $limit);
return $profile->getSubscribed($offset, $limit);
} }
function getSubscribers($offset=0, $limit=null) function getSubscribers($offset=0, $limit=null)
{ {
$profile = $this->getProfile(); return $this->getProfile()->getSubscribers($offset, $limit);
return $profile->getSubscribers($offset, $limit);
} }
function getTaggedSubscribers($tag, $offset=0, $limit=null) function getTaggedSubscribers($tag, $offset=0, $limit=null)
@ -727,8 +711,7 @@ class User extends Managed_DataObject
function hasRight($right) function hasRight($right)
{ {
$profile = $this->getProfile(); return $this->getProfile()->hasRight($right);
return $profile->hasRight($right);
} }
function delete() function delete()
@ -778,32 +761,27 @@ class User extends Managed_DataObject
function hasRole($name) function hasRole($name)
{ {
$profile = $this->getProfile(); return $this->getProfile()->hasRole($name);
return $profile->hasRole($name);
} }
function grantRole($name) function grantRole($name)
{ {
$profile = $this->getProfile(); return $this->getProfile()->grantRole($name);
return $profile->grantRole($name);
} }
function revokeRole($name) function revokeRole($name)
{ {
$profile = $this->getProfile(); return $this->getProfile()->revokeRole($name);
return $profile->revokeRole($name);
} }
function isSandboxed() function isSandboxed()
{ {
$profile = $this->getProfile(); return $this->getProfile()->isSandboxed();
return $profile->isSandboxed();
} }
function isSilenced() function isSilenced()
{ {
$profile = $this->getProfile(); return $this->getProfile()->isSilenced();
return $profile->isSilenced();
} }
function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null) function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null)