X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FProfile.php;h=5d8e46a7410d161b493477b26a6ae760238164c6;hb=a23c4aa23605003de929ee3fb4bcef6603f9e9ac;hp=e07d37139b2bbcbe2de88f985a222e0c054c717a;hpb=88f3e690c3c34e7c033afbd7bc7734bbec316b2f;p=quix0rs-gnu-social.git diff --git a/classes/Profile.php b/classes/Profile.php index e07d37139b..5d8e46a741 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -44,11 +44,6 @@ class Profile extends Managed_DataObject public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP - /* Static get */ - function staticGet($k,$v=NULL) { - return Memcached_DataObject::staticGet('Profile',$k,$v); - } - public static function schemaDef() { $def = array( @@ -83,29 +78,47 @@ class Profile extends Managed_DataObject return $def; } - - function multiGet($keyCol, $keyVals, $skipNulls=true) - { - return parent::multiGet('Profile', $keyCol, $keyVals, $skipNulls); - } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + public static function getByEmail($email) + { + // in the future, profiles should have emails stored... + $user = User::getKV('email', $email); + if (!($user instanceof User)) { + throw new NoSuchUserException(array('email'=>$email)); + } + return $user->getProfile(); + } + protected $_user = -1; // Uninitialized value distinct from null - function getUser() + public function getUser() { - if (is_int($this->_user) && $this->_user == -1) { - $this->_user = User::staticGet('id', $this->id); + if ($this->_user === -1) { + $this->_user = User::getKV('id', $this->id); + } + if (!($this->_user instanceof User)) { + throw new NoSuchUserException(array('id'=>$this->id)); } return $this->_user; } + public function isLocal() + { + try { + $this->getUser(); + } catch (NoSuchUserException $e) { + return false; + } + return true; + } + protected $_avatars; - function getAvatar($width, $height=null) + public function getAvatar($width, $height=null) { if (is_null($height)) { $height = $width; @@ -114,7 +127,6 @@ class Profile extends Managed_DataObject $avatar = $this->_getAvatar($width); if (empty($avatar)) { - if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) { $avatar = Avatar::pkeyGet( array( @@ -126,6 +138,17 @@ class Profile extends Managed_DataObject Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar)); } + // if-empty within an if-empty? Let's find a prettier solution... + if (empty($avatar)) { + // Obviously we can't find an avatar, so let's resize the original! + try { + $avatar = Avatar::newSize($this, $width); + } catch (Exception $e) { + // Could not generate a resized avatar. How do we handle it? + } + } + + // cache the avatar for future use $this->_fillAvatar($width, $avatar); } @@ -151,21 +174,18 @@ class Profile extends Managed_DataObject return null; } - function _fillAvatar($width, $avatar) + protected function _fillAvatar($width, Avatar $avatar) { - //common_debug("Storing avatar of width: {$avatar->width} and profile_id {$avatar->profile_id} in profile {$this->id}."); - $this->_avatars[$width] = $avatar; - + // This avoids storing null values, a problem report in issue #3478 + $this->_avatars[$width] = $avatar; } - function getOriginalAvatar() + // For backwards compatibility only! + public function getOriginalAvatar() { - $avatar = DB_DataObject::factory('avatar'); - $avatar->profile_id = $this->id; - $avatar->original = true; - if ($avatar->find(true)) { - return $avatar; - } else { + try { + return Avatar::getOriginal($this); + } catch (Exception $e) { return null; } } @@ -194,21 +214,10 @@ class Profile extends Managed_DataObject foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) { // We don't do a scaled one if original is our scaled size if (!($avatar->width == $size && $avatar->height == $size)) { - $scaled_filename = $imagefile->resize($size); - - //$scaled = DB_DataObject::factory('avatar'); - $scaled = new Avatar(); - $scaled->profile_id = $this->id; - $scaled->width = $size; - $scaled->height = $size; - $scaled->original = false; - $scaled->mediatype = image_type_to_mime_type($imagefile->type); - $scaled->filename = $scaled_filename; - $scaled->url = Avatar::url($scaled_filename); - $scaled->created = DB_DataObject_Cast::dateTime(); # current time - - if (!$scaled->insert()) { - return null; + try { + Avatar::newSize($this, $size); + } catch (Exception $e) { + // should we abort the generation and live without smaller avatars? } } } @@ -445,7 +454,7 @@ class Profile extends Managed_DataObject $lists = array(); foreach ($ids as $id) { - $list = Profile_list::staticGet('id', $id); + $list = Profile_list::getKV('id', $id); if (!empty($list) && ($showPrivate || !$list->private)) { @@ -554,7 +563,7 @@ class Profile extends Managed_DataObject $lists = new Profile_list(); $subs = new Profile_tag_subscription(); - $lists->joinAdd('id', 'profile_tag_subscription:profile_tag_id'); + $lists->joinAdd(array('id', 'profile_tag_subscription:profile_tag_id')); #@fixme: postgres (round(date_part('epoch', my_date))) $lists->selectAdd('unix_timestamp(profile_tag_subscription.created) as "cursor"'); @@ -595,6 +604,8 @@ class Profile extends Managed_DataObject if (Event::handle('StartJoinGroup', array($group, $this))) { $join = Group_member::join($group->id, $this->id); self::blow('profile:groups:%d', $this->id); + self::blow('group:member_ids:%d', $group->id); + self::blow('group:member_count:%d', $group->id); Event::handle('EndJoinGroup', array($group, $this)); } } @@ -615,6 +626,8 @@ class Profile extends Managed_DataObject if (Event::handle('StartLeaveGroup', array($group, $this))) { Group_member::leave($group->id, $this->id); self::blow('profile:groups:%d', $this->id); + self::blow('group:member_ids:%d', $group->id); + self::blow('group:member_count:%d', $group->id); Event::handle('EndLeaveGroup', array($group, $this)); } } @@ -629,40 +642,18 @@ class Profile extends Managed_DataObject } } - function getSubscriptions($offset=0, $limit=null) + function getSubscribed($offset=0, $limit=null) { - $subs = Subscription::bySubscriber($this->id, - $offset, - $limit); - - $profiles = array(); - - while ($subs->fetch()) { - $profile = Profile::staticGet($subs->subscribed); - if ($profile) { - $profiles[] = $profile; - } - } - - return new ArrayWrapper($profiles); + $subs = Subscription::getSubscribedIDs($this->id, $offset, $limit); + $profiles = Profile::listFind('id', $subs); + return $profiles; } function getSubscribers($offset=0, $limit=null) { - $subs = Subscription::bySubscribed($this->id, - $offset, - $limit); - - $profiles = array(); - - while ($subs->fetch()) { - $profile = Profile::staticGet($subs->subscriber); - if ($profile) { - $profiles[] = $profile; - } - } - - return new ArrayWrapper($profiles); + $subs = Subscription::getSubscriberIDs($this->id, $offset, $limit); + $profiles = Profile::listFind('id', $subs); + return $profiles; } function getTaggedSubscribers($tag) @@ -682,7 +673,7 @@ class Profile extends Managed_DataObject $profile = new Profile(); $tagged = array(); - $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $tag)); + $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $profile->escape($tag))); while ($profile->fetch()) { $tagged[] = clone($profile); @@ -959,7 +950,7 @@ class Profile extends Managed_DataObject $sub->find(); while ($sub->fetch()) { - $other = Profile::staticGet('id', $sub->subscribed); + $other = Profile::getKV('id', $sub->subscribed); if (empty($other)) { continue; } @@ -974,7 +965,7 @@ class Profile extends Managed_DataObject $subd->find(); while ($subd->fetch()) { - $other = Profile::staticGet('id', $subd->subscriber); + $other = Profile::getKV('id', $subd->subscriber); if (empty($other)) { continue; } @@ -1190,6 +1181,8 @@ class Profile extends Managed_DataObject case Right::SILENCEUSER: case Right::DELETEUSER: case Right::DELETEGROUP: + case Right::TRAINSPAM: + case Right::REVIEWSPAM: $result = $this->hasRole(Profile_role::MODERATOR); break; case Right::CONFIGURESITE: @@ -1241,9 +1234,8 @@ class Profile extends Managed_DataObject { // XXX: not really a pkey, but should work - $notice = Memcached_DataObject::pkeyGet('Notice', - array('profile_id' => $this->id, - 'repeat_of' => $notice_id)); + $notice = Notice::pkeyGet(array('profile_id' => $this->id, + 'repeat_of' => $notice_id)); return !empty($notice); } @@ -1331,12 +1323,26 @@ class Profile extends Managed_DataObject return $noun->asString('activity:' . $element); } + /** + * Returns the profile's canonical url, not necessarily a uri/unique id + * + * @return string $profileurl + */ + public function getUrl() + { + if (empty($this->profileurl) || + !filter_var($this->profileurl, FILTER_VALIDATE_URL)) { + throw new InvalidUrlException($this->profileurl); + } + return $this->profileurl; + } + /** * Returns the best URI for a profile. Plugins may override. * * @return string $uri */ - function getUri() + public function getUri() { $uri = null; @@ -1344,7 +1350,7 @@ class Profile extends Managed_DataObject if (Event::handle('StartGetProfileUri', array($this, &$uri))) { // check for a local user first - $user = User::staticGet('id', $this->id); + $user = User::getKV('id', $this->id); if (!empty($user)) { $uri = $user->uri; @@ -1358,15 +1364,8 @@ class Profile extends Managed_DataObject function hasBlocked($other) { - $block = Profile_block::get($this->id, $other->id); - - if (empty($block)) { - $result = false; - } else { - $result = true; - } - - return $result; + $block = Profile_block::exists($this, $other); + return !empty($block); } function getAtomFeed() @@ -1374,7 +1373,7 @@ class Profile extends Managed_DataObject $feed = null; if (Event::handle('StartProfileGetAtomFeed', array($this, &$feed))) { - $user = User::staticGet('id', $this->id); + $user = User::getKV('id', $this->id); if (!empty($user)) { $feed = common_local_url('ApiTimelineUser', array('id' => $user->id, 'format' => 'atom')); @@ -1391,7 +1390,7 @@ class Profile extends Managed_DataObject if (Event::handle('StartGetProfileFromURI', array($uri, &$profile))) { // Get a local user or remote (OMB 0.1) profile - $user = User::staticGet('uri', $uri); + $user = User::getKV('uri', $uri); if (!empty($user)) { $profile = $user->getProfile(); } @@ -1494,8 +1493,4 @@ class Profile extends Managed_DataObject { return $this; } - - static function pivotGet($key, $values, $otherCols=array()) { - return Memcached_DataObject::pivotGet('Profile', $key, $values, $otherCols); - } }