X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FProfile.php;h=e461254f9dde88daea334c282510942a83d0573a;hb=039874195649f578c89d4435e99a0359501cda79;hp=7005e776a59da542c91ee18fff2d8ff5e0e1ae71;hpb=1c3c269ab460345d2d201bff5d3e72bfd16291d9;p=quix0rs-gnu-social.git diff --git a/classes/Profile.php b/classes/Profile.php index 7005e776a5..e461254f9d 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,94 +78,52 @@ 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 - protected $_user = -1; // Uninitialized value distinct from null - - function getUser() + public static function getByEmail($email) { - if (is_int($this->_user) && $this->_user == -1) { - $this->_user = User::staticGet('id', $this->id); + // 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(); + } - return $this->_user; - } - - protected $_avatars; + protected $_user = -1; // Uninitialized value distinct from null - function getAvatar($width, $height=null) + public function getUser() { - if (is_null($height)) { - $height = $width; + if ($this->_user === -1) { + $this->_user = User::getKV('id', $this->id); } - - $avatar = $this->_getAvatar($width); - - if (empty($avatar)) { - - if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) { - $avatar = Avatar::pkeyGet( - array( - 'profile_id' => $this->id, - 'width' => $width, - 'height' => $height - ) - ); - Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar)); - } - - $this->_fillAvatar($width, $avatar); + if (!($this->_user instanceof User)) { + throw new NoSuchUserException(array('id'=>$this->id)); } - return $avatar; + return $this->_user; } - // XXX: @Fix me gargargar - function _getAvatar($width) + public function isLocal() { - if (empty($this->_avatars)) { - $this->_avatars = array(); - } - - // GAR! I cannot figure out where _avatars gets pre-filled with the avatar from - // the previously used profile! Please shoot me now! --Zach - if (array_key_exists($width, $this->_avatars)) { - // Don't return cached avatar unless it's really for this profile - if ($this->_avatars[$width]->profile_id == $this->id) { - return $this->_avatars[$width]; - } + try { + $this->getUser(); + } catch (NoSuchUserException $e) { + return false; } - - return null; + return true; } - function _fillAvatar($width, $avatar) - { - //common_debug("Storing avatar of width: {$avatar->width} and profile_id {$avatar->profile_id} in profile {$this->id}."); - $this->_avatars[$width] = $avatar; - - } + protected $_avatars = array(); - function getOriginalAvatar() + public function getAvatar($width, $height=null) { - $avatar = DB_DataObject::factory('avatar'); - $avatar->profile_id = $this->id; - $avatar->original = true; - if ($avatar->find(true)) { - return $avatar; - } else { - return null; - } + return Avatar::byProfile($this, $width, $height); } - function setOriginal($filename) + public function setOriginal($filename) { $imagefile = new ImageFile($this->id, Avatar::path($filename)); @@ -182,11 +135,11 @@ class Profile extends Managed_DataObject $avatar->filename = $filename; $avatar->original = true; $avatar->url = Avatar::url($filename); - $avatar->created = DB_DataObject_Cast::dateTime(); # current time + $avatar->created = common_sql_now(); // XXX: start a transaction here - - if (!$this->delete_avatars() || !$avatar->insert()) { + if (!Avatar::deleteFromProfile($this, true) || !$avatar->insert()) { + // If we can't delete the old avatars, let's abort right here. @unlink(Avatar::path($filename)); return null; } @@ -194,21 +147,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? } } } @@ -216,30 +158,6 @@ class Profile extends Managed_DataObject return $avatar; } - /** - * Delete attached avatars for this user from the database and filesystem. - * This should be used instead of a batch delete() to ensure that files - * get removed correctly. - * - * @param boolean $original true to delete only the original-size file - * @return - */ - function delete_avatars($original=true) - { - $avatar = new Avatar(); - $avatar->profile_id = $this->id; - $avatar->find(); - while ($avatar->fetch()) { - if ($avatar->original) { - if ($original == false) { - continue; - } - } - $avatar->delete(); - } - return true; - } - /** * Gets either the full name (if filled) or the nickname. * @@ -293,9 +211,9 @@ class Profile extends Managed_DataObject return $stream->getNotices($offset, $limit, $since_id, $max_id); } - function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) + function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, Profile $scoped=null) { - $stream = new ProfileNoticeStream($this); + $stream = new ProfileNoticeStream($this, $scoped); return $stream->getNotices($offset, $limit, $since_id, $max_id); } @@ -445,7 +363,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 +472,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"'); @@ -625,73 +543,75 @@ class Profile extends Managed_DataObject function avatarUrl($size=AVATAR_PROFILE_SIZE) { - $avatar = $this->getAvatar($size); - if ($avatar) { - return $avatar->displayUrl(); - } else { - return Avatar::defaultImage($size); - } + return Avatar::urlByProfile($this, $size); } - 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; - } + $subs = Subscription::getSubscribedIDs($this->id, $offset, $limit); + try { + $profiles = Profile::listFind('id', $subs); + } catch (NoResultException $e) { + return $e->obj; } - - return new ArrayWrapper($profiles); + return $profiles; } function getSubscribers($offset=0, $limit=null) { - $subs = Subscription::bySubscribed($this->id, - $offset, - $limit); + $subs = Subscription::getSubscriberIDs($this->id, $offset, $limit); + try { + $profiles = Profile::listFind('id', $subs); + } catch (NoResultException $e) { + return $e->obj; + } + return $profiles; + } - $profiles = array(); + function getTaggedSubscribers($tag, $offset=0, $limit=null) + { + $qry = + 'SELECT profile.* ' . + 'FROM profile JOIN subscription ' . + 'ON profile.id = subscription.subscriber ' . + 'JOIN profile_tag ON (profile_tag.tagged = subscription.subscriber ' . + 'AND profile_tag.tagger = subscription.subscribed) ' . + 'WHERE subscription.subscribed = %d ' . + "AND profile_tag.tag = '%s' " . + 'AND subscription.subscribed != subscription.subscriber ' . + 'ORDER BY subscription.created DESC '; - while ($subs->fetch()) { - $profile = Profile::staticGet($subs->subscriber); - if ($profile) { - $profiles[] = $profile; - } + if ($offset) { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; } - return new ArrayWrapper($profiles); + $profile = new Profile(); + + $cnt = $profile->query(sprintf($qry, $this->id, $profile->escape($tag))); + + return $profile; } - function getTaggedSubscribers($tag) + function getTaggedSubscriptions($tag, $offset=0, $limit=null) { $qry = 'SELECT profile.* ' . - 'FROM profile JOIN (subscription, profile_tag, profile_list) ' . - 'ON profile.id = subscription.subscriber ' . - 'AND profile.id = profile_tag.tagged ' . - 'AND profile_tag.tagger = profile_list.tagger AND profile_tag.tag = profile_list.tag ' . - 'WHERE subscription.subscribed = %d ' . + 'FROM profile JOIN subscription ' . + 'ON profile.id = subscription.subscribed ' . + 'JOIN profile_tag on (profile_tag.tagged = subscription.subscribed ' . + 'AND profile_tag.tagger = subscription.subscriber) ' . + 'WHERE subscription.subscriber = %d ' . + "AND profile_tag.tag = '%s' " . 'AND subscription.subscribed != subscription.subscriber ' . - 'AND profile_tag.tagger = %d AND profile_tag.tag = "%s" ' . - 'AND profile_list.private = false ' . - 'ORDER BY subscription.created DESC'; + 'ORDER BY subscription.created DESC '; + + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; $profile = new Profile(); - $tagged = array(); - $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $tag)); + $profile->query(sprintf($qry, $this->id, $profile->escape($tag))); - while ($profile->fetch()) { - $tagged[] = clone($profile); - } - return $tagged; + return $profile; } /** @@ -833,6 +753,11 @@ class Profile extends Managed_DataObject return $cnt; } + function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) + { + return Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id); + } + function noticeCount() { $c = Cache::instance(); @@ -917,6 +842,31 @@ class Profile extends Managed_DataObject return ($biolimit > 0 && !empty($bio) && (mb_strlen($bio) > $biolimit)); } + public function update($orig) + { + if ($this->nickname != $orig->nickname) { + $local = User::getKV('id', $this->id); + if ($local instanceof User) { + common_debug("Updating User ({$this->id}) nickname from {$orig->nickname} to {$this->nickname}"); + $origuser = clone($local); + $local->nickname = $this->nickname; + $result = $local->updateKeys($origuser); + if ($result === false) { + common_log_db_error($local, 'UPDATE', __FILE__); + // TRANS: Server error thrown when user profile settings could not be updated. + throw new ServerException(_('Could not update user nickname.')); + } + + // Clear the site owner, in case nickname changed + if ($local->hasRole(Profile_role::OWNER)) { + User::blow('user:site_owner'); + } + } + } + + return parent::update($orig); + } + function delete() { $this->_deleteNotices(); @@ -924,7 +874,7 @@ class Profile extends Managed_DataObject $this->_deleteMessages(); $this->_deleteTags(); $this->_deleteBlocks(); - $this->delete_avatars(); + Avatar::deleteFromProfile($this, true); // Warning: delete() will run on the batch objects, // not on individual objects. @@ -963,7 +913,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; } @@ -978,7 +928,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; } @@ -1027,7 +977,7 @@ class Profile extends Managed_DataObject // XXX: identical to Notice::getLocation. - function getLocation() + public function getLocation() { $location = null; @@ -1050,6 +1000,29 @@ class Profile extends Managed_DataObject return $location; } + public function shareLocation() + { + $cfg = common_config('location', 'share'); + + if ($cfg == 'always') { + return true; + } else if ($cfg == 'never') { + return false; + } else { // user + $share = common_config('location', 'sharedefault'); + + // Check if user has a personal setting for this + $prefs = User_location_prefs::getKV('user_id', $this->id); + + if (!empty($prefs)) { + $share = $prefs->share_location; + $prefs->free(); + } + + return $share; + } + } + function hasRole($name) { $has_role = false; @@ -1177,7 +1150,7 @@ class Profile extends Managed_DataObject * @param $right string Name of the right, usually a constant in class Right * @return boolean whether the user has the right in question */ - function hasRight($right) + public function hasRight($right) { $result = false; @@ -1243,13 +1216,13 @@ class Profile extends Managed_DataObject return $result; } - function hasRepeated($notice_id) + // FIXME: Can't put Notice typing here due to ArrayWrapper + public function hasRepeated($notice) { // 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); } @@ -1337,12 +1310,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; @@ -1350,7 +1337,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; @@ -1364,15 +1351,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() @@ -1380,7 +1360,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')); @@ -1397,7 +1377,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(); } @@ -1474,34 +1454,9 @@ class Profile extends Managed_DataObject $skip = array('_user', '_avatars'); return array_diff($vars, $skip); } - - static function fillAvatars(&$profiles, $width) - { - $ids = array(); - foreach ($profiles as $profile) { - if (!empty($profile)) { - $ids[] = $profile->id; - } - } - - $avatars = Avatar::pivotGet('profile_id', $ids, array('width' => $width, - 'height' => $width)); - - foreach ($profiles as $profile) { - if (!empty($profile)) { // ??? - $profile->_fillAvatar($width, $avatars[$profile->id]); - } - } - } - - // Can't seem to find how to fix this. - function getProfile() + public function getProfile() { return $this; } - - static function pivotGet($key, $values, $otherCols=array()) { - return Memcached_DataObject::pivotGet('Profile', $key, $values, $otherCols); - } }