X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FProfile.php;h=e8470d96c5d209641434934ee5d5bdde15b4046f;hb=d1e609a886ad31b1478a9500b92f363014fc0d7c;hp=a45511fe54b60a1a02d87258cb61656e2f9d1010;hpb=95d415257a43d5d4338ce22089463c1820b6bf8b;p=quix0rs-gnu-social.git diff --git a/classes/Profile.php b/classes/Profile.php index a45511fe54..e8470d96c5 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -175,7 +175,6 @@ class Profile extends Managed_DataObject $avatar->mediatype = image_type_to_mime_type($imagefile->type); $avatar->filename = $filename; $avatar->original = true; - $avatar->url = Avatar::url($filename); $avatar->created = common_sql_now(); // XXX: start a transaction here @@ -233,16 +232,22 @@ class Profile extends Managed_DataObject * * @return mixed Notice or null */ - function getCurrentNotice() + function getCurrentNotice(Profile $scoped=null) { - $notice = $this->getNotices(0, 1); + try { + $notice = $this->getNotices(0, 1, 0, 0, $scoped); - if ($notice->fetch()) { - if ($notice instanceof ArrayWrapper) { - // hack for things trying to work with single notices - return $notice->_items[0]; + if ($notice->fetch()) { + if ($notice instanceof ArrayWrapper) { + // hack for things trying to work with single notices + // ...but this shouldn't happen anymore I think. Keeping it for safety... + return $notice->_items[0]; + } + return $notice; } - return $notice; + } catch (PrivateStreamException $e) { + // Maybe we should let this through if it's handled well upstream + return null; } return null; @@ -375,7 +380,7 @@ class Profile extends Managed_DataObject return false; } - function getLists($auth_user, $offset=0, $limit=null, $since_id=0, $max_id=0) + function getLists(Profile $scoped=null, $offset=0, $limit=null, $since_id=0, $max_id=0) { $ids = array(); @@ -415,9 +420,7 @@ class Profile extends Managed_DataObject self::cacheSet($keypart, implode(',', $ids)); } - $showPrivate = (($auth_user instanceof User || - $auth_user instanceof Profile) && - $auth_user->id === $this->id); + $showPrivate = $this->sameAs($scoped); $lists = array(); @@ -440,7 +443,7 @@ class Profile extends Managed_DataObject /** * Get tags that other people put on this profile, in reverse-chron order * - * @param (Profile|User) $auth_user Authorized user (used for privacy) + * @param Profile $scoped User we are requesting as * @param int $offset Offset from latest * @param int $limit Max number to get * @param datetime $since_id max date @@ -449,7 +452,7 @@ class Profile extends Managed_DataObject * @return Profile_list resulting lists */ - function getOtherTags($auth_user=null, $offset=0, $limit=null, $since_id=0, $max_id=0) + function getOtherTags(Profile $scoped=null, $offset=0, $limit=null, $since_id=0, $max_id=0) { $list = new Profile_list(); @@ -461,11 +464,11 @@ class Profile extends Managed_DataObject $this->id); - if ($auth_user instanceof User || $auth_user instanceof Profile) { + if (!is_null($scoped)) { $qry .= sprintf('AND ( ( profile_list.private = false ) ' . 'OR ( profile_list.tagger = %d AND ' . 'profile_list.private = true ) )', - $auth_user->id); + $scoped->getID()); } else { $qry .= 'AND profile_list.private = 0 '; } @@ -682,25 +685,16 @@ class Profile extends Managed_DataObject */ function getRequests($offset=0, $limit=null) { - $qry = - 'SELECT profile.* ' . - 'FROM profile JOIN subscription_queue '. - 'ON profile.id = subscription_queue.subscriber ' . - 'WHERE subscription_queue.subscribed = %d ' . - 'ORDER BY subscription_queue.created DESC '; - - if ($limit != null) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; - } + // FIXME: mysql only + $subqueue = new Profile(); + $subqueue->joinAdd(array('id', 'subscription_queue:subscriber')); + $subqueue->whereAdd(sprintf('subscription_queue.subscribed = %d', $this->getID())); + $subqueue->limit($offset, $limit); + $subqueue->orderBy('subscription_queue.created', 'DESC'); + if (!$subqueue->find()) { + throw new NoResultException($subqueue); } - - $members = new Profile(); - - $members->query(sprintf($qry, $this->id)); - return $members; + return $subqueue; } function subscriptionCount() @@ -761,6 +755,36 @@ class Profile extends Managed_DataObject return Subscription::exists($this, $other); } + function readableBy(Profile $other=null) + { + // If it's not a private stream, it's readable by anyone + if (!$this->isPrivateStream()) { + return true; + } + + // If it's a private stream, $other must be a subscriber to $this + return is_null($other) ? false : $other->isSubscribed($this); + } + + function requiresSubscriptionApproval(Profile $other=null) + { + if (!$this->isLocal()) { + // We don't know for remote users, and we'll always be able to send + // the request. Whether it'll work immediately or require moderation + // can be determined in another function. + return false; + } + + // Assume that profiles _we_ subscribe to are permitted. Could be made configurable. + if (!is_null($other) && $this->isSubscribed($other)) { + return false; + } + + // If the local user either has a private stream (implies the following) + // or user has a moderation policy for new subscriptions, return true. + return $this->getUser()->private_stream || $this->getUser()->subscribe_policy === User::SUBSCRIBE_POLICY_MODERATE; + } + /** * Check if a pending subscription request is outstanding for this... * @@ -797,6 +821,7 @@ class Profile extends Managed_DataObject $notices = new Notice(); $notices->profile_id = $this->id; + $notices->verb = ActivityVerb::POST; $cnt = (int) $notices->count('distinct id'); if (!empty($c)) { @@ -920,41 +945,48 @@ class Profile extends Managed_DataObject function _deleteSubscriptions() { $sub = new Subscription(); - $sub->subscriber = $this->id; - + $sub->subscriber = $this->getID(); $sub->find(); while ($sub->fetch()) { - $other = Profile::getKV('id', $sub->subscribed); - if (empty($other)) { - continue; - } - if ($other->id == $this->id) { - continue; + try { + $other = $sub->getSubscribed(); + if (!$other->sameAs($this)) { + Subscription::cancel($this, $other); + } + } catch (NoResultException $e) { + // Profile not found + common_log(LOG_INFO, 'Subscribed profile id=='.$sub->subscribed.' not found when deleting profile id=='.$this->getID().', ignoring...'); + } catch (ServerException $e) { + // Subscription cancel failed + common_log(LOG_INFO, 'Subscribed profile id=='.$other->getID().' could not be reached for unsubscription notice when deleting profile id=='.$this->getID().', ignoring...'); } - Subscription::cancel($this, $other); } - $subd = new Subscription(); - $subd->subscribed = $this->id; - $subd->find(); + $sub = new Subscription(); + $sub->subscribed = $this->getID(); + $sub->find(); - while ($subd->fetch()) { - $other = Profile::getKV('id', $subd->subscriber); - if (empty($other)) { - continue; - } - if ($other->id == $this->id) { - continue; + while ($sub->fetch()) { + try { + $other = $sub->getSubscriber(); + common_log(LOG_INFO, 'Subscriber profile id=='.$sub->subscribed.' not found when deleting profile id=='.$this->getID().', ignoring...'); + if (!$other->sameAs($this)) { + Subscription::cancel($other, $this); + } + } catch (NoResultException $e) { + // Profile not found + common_log(LOG_INFO, 'Subscribed profile id=='.$sub->subscribed.' not found when deleting profile id=='.$this->getID().', ignoring...'); + } catch (ServerException $e) { + // Subscription cancel failed + common_log(LOG_INFO, 'Subscriber profile id=='.$other->getID().' could not be reached for unsubscription notice when deleting profile id=='.$this->getID().', ignoring...'); } - Subscription::cancel($other, $this); } + // Finally delete self-subscription $self = new Subscription(); - - $self->subscriber = $this->id; - $self->subscribed = $this->id; - + $self->subscriber = $this->getID(); + $self->subscribed = $this->getID(); $self->delete(); } @@ -1390,11 +1422,25 @@ class Profile extends Managed_DataObject */ public function getUrl() { - if (empty($this->profileurl) || - !filter_var($this->profileurl, FILTER_VALIDATE_URL)) { - throw new InvalidUrlException($this->profileurl); + $url = null; + if ($this->isGroup()) { + // FIXME: Get rid of this event, it fills no real purpose, data should be in Profile->profileurl (replaces User_group->mainpage) + if (Event::handle('StartUserGroupHomeUrl', array($this->getGroup(), &$url))) { + $url = $this->getGroup()->isLocal() + ? common_local_url('showgroup', array('nickname' => $this->getNickname())) + : $this->profileurl; + } + Event::handle('EndUserGroupHomeUrl', array($this->getGroup(), $url)); + } elseif ($this->isLocal()) { + $url = common_local_url('showstream', array('nickname' => $this->getNickname())); + } else { + $url = $this->profileurl; + } + if (empty($url) || + !filter_var($url, FILTER_VALIDATE_URL)) { + throw new InvalidUrlException($url); } - return $this->profileurl; + return $url; } public function getNickname()