X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=4812dff91a29b5caf70fb9e2262154fcaef43889;hb=34a6624452e8b7f60b40181441c6ea2c8158379a;hp=83d49f3d0f405a47fc8e5ee72bdd4b734067eed8;hpb=fe2c0a9687f2d92e9dc66190e168836f41c8ad72;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index 83d49f3d0f..4812dff91a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -76,12 +76,6 @@ class Notice extends Managed_DataObject public $object_type; // varchar(255) public $scope; // int(4) - /* Static get */ - function staticGet($k,$v=NULL) - { - return Memcached_DataObject::staticGet('Notice',$k,$v); - } - /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE @@ -136,11 +130,6 @@ class Notice extends Managed_DataObject return $def; } - - function multiGet($kc, $kvs, $skipNulls=true) - { - return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls); - } /* Notice types */ const LOCAL_PUBLIC = 1; @@ -159,7 +148,7 @@ class Notice extends Managed_DataObject function getProfile() { if (is_int($this->_profile) && $this->_profile == -1) { - $this->_setProfile(Profile::staticGet('id', $this->profile_id)); + $this->_setProfile(Profile::getKV('id', $this->profile_id)); if (empty($this->_profile)) { // TRANS: Server exception thrown when a user profile for a notice cannot be found. @@ -183,10 +172,10 @@ class Notice extends Managed_DataObject // @fixme we have some cases where things get re-run and so the // insert fails. - $deleted = Deleted_notice::staticGet('id', $this->id); + $deleted = Deleted_notice::getKV('id', $this->id); if (!$deleted) { - $deleted = Deleted_notice::staticGet('uri', $this->uri); + $deleted = Deleted_notice::getKV('uri', $this->uri); } if (!$deleted) { @@ -222,6 +211,11 @@ class Notice extends Managed_DataObject return $result; } + public function getUri() + { + return $this->uri; + } + /** * Extract #hashtags from this notice's content and save them to the database. */ @@ -325,7 +319,7 @@ class Notice extends Managed_DataObject * @return Notice * @throws ClientException */ - static function saveNew($profile_id, $content, $source, $options=null) { + static function saveNew($profile_id, $content, $source, array $options=null) { $defaults = array('uri' => null, 'url' => null, 'reply_to' => null, @@ -346,8 +340,8 @@ class Notice extends Managed_DataObject $is_local = Notice::LOCAL_PUBLIC; } - $profile = Profile::staticGet('id', $profile_id); - $user = User::staticGet('id', $profile_id); + $profile = Profile::getKV('id', $profile_id); + $user = User::getKV('id', $profile_id); if ($user) { // Use the local user's shortening preferences, if applicable. $final = $user->shortenLinks($content); @@ -426,9 +420,9 @@ class Notice extends Managed_DataObject // Check for a private one - $repeat = Notice::staticGet('id', $repeat_of); + $repeat = Notice::getKV('id', $repeat_of); - if (empty($repeat)) { + if (!($repeat instanceof Notice)) { // TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice. throw new ClientException(_('Cannot repeat; original notice is missing or deleted.')); } @@ -450,7 +444,7 @@ class Notice extends Managed_DataObject throw new ClientException(_('Cannot repeat a notice you cannot read.'), 403); } - if ($profile->hasRepeated($repeat->id)) { + if ($profile->hasRepeated($repeat)) { // TRANS: Client error displayed when trying to repeat an already repeated notice. throw new ClientException(_('You already repeated that notice.')); } @@ -474,7 +468,7 @@ class Notice extends Managed_DataObject // If the original is private to a group, and notice has no group specified, // make it to the same group(s) - if (empty($groups) && ($reply->scope | Notice::GROUP_SCOPE)) { + if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) { $groups = array(); $replyGroups = $reply->getGroups(); foreach ($replyGroups as $group) { @@ -533,20 +527,22 @@ class Notice extends Managed_DataObject // For private streams - $user = $profile->getUser(); + try { + $user = $profile->getUser(); - if (!empty($user)) { if ($user->private_stream && ($notice->scope == Notice::PUBLIC_SCOPE || $notice->scope == Notice::SITE_SCOPE)) { $notice->scope |= Notice::FOLLOWER_SCOPE; } + } catch (NoSuchUserException $e) { + // Cannot handle private streams for remote profiles } // Force the scope for private groups foreach ($groups as $groupId) { - $group = User_group::staticGet('id', $groupId); + $group = User_group::getKV('id', $groupId); if (!empty($group)) { if ($group->force_scope) { $notice->scope |= Notice::GROUP_SCOPE; @@ -653,16 +649,16 @@ class Notice extends Managed_DataObject self::blow('notice:list-ids:repeat_of:%d', $this->repeat_of); } - $original = Notice::staticGet('id', $this->repeat_of); + $original = Notice::getKV('id', $this->repeat_of); if (!empty($original)) { - $originalUser = User::staticGet('id', $original->profile_id); + $originalUser = User::getKV('id', $original->profile_id); if (!empty($originalUser)) { $this->blowStream('user:repeats_of_me:%d', $originalUser->id); } } - $profile = Profile::staticGet($this->profile_id); + $profile = Profile::getKV($this->profile_id); if (!empty($profile)) { $profile->blowNoticeCount(); @@ -729,7 +725,7 @@ class Notice extends Managed_DataObject if ($lastStr !== false) { $window = explode(',', $lastStr); $lastID = $window[0]; - $lastNotice = Notice::staticGet('id', $lastID); + $lastNotice = Notice::getKV('id', $lastID); if (empty($lastNotice) // just weird || strtotime($lastNotice->created) >= strtotime($this->created)) { $c->delete($lastKey); @@ -776,7 +772,7 @@ class Notice extends Managed_DataObject } static function checkDupes($profile_id, $content) { - $profile = Profile::staticGet($profile_id); + $profile = Profile::getKV($profile_id); if (empty($profile)) { return false; } @@ -804,7 +800,7 @@ class Notice extends Managed_DataObject } static function checkEditThrottle($profile_id) { - $profile = Profile::staticGet($profile_id); + $profile = Profile::getKV($profile_id); if (empty($profile)) { return false; } @@ -829,7 +825,7 @@ class Notice extends Managed_DataObject return $this->_attachments; } - $f2ps = Memcached_DataObject::listGet('File_to_post', 'post_id', array($this->id)); + $f2ps = File_to_post::listGet('post_id', array($this->id)); $ids = array(); @@ -837,7 +833,7 @@ class Notice extends Managed_DataObject $ids[] = $f2p->file_id; } - $files = Memcached_DataObject::multiGet('File', 'id', $ids); + $files = File::multiGet('id', $ids); $this->_attachments = $files->fetchAll(); @@ -929,23 +925,26 @@ class Notice extends Managed_DataObject if ($root !== false && $root->inScope($profile)) { return $root; - } else { - $last = $this; + } - do { - $parent = $last->getOriginal(); - if (!empty($parent) && $parent->inScope($profile)) { + $last = $this; + while (true) { + try { + $parent = $last->getParent(); + if ($parent->inScope($profile)) { $last = $parent; continue; - } else { - $root = $last; - break; } - } while (!empty($parent)); - - self::cacheSet($keypart, $root); + } catch (Exception $e) { + // Latest notice has no parent + } + // No parent, or parent out of scope + $root = $last; + break; } + self::cacheSet($keypart, $root); + return $root; } @@ -960,7 +959,7 @@ class Notice extends Managed_DataObject * if left empty, will be loaded from reply records * @return array associating recipient user IDs with an inbox source constant */ - function whoGets($groups=null, $recipients=null) + function whoGets(array $groups=null, array $recipients=null) { $c = self::memcache(); @@ -1024,16 +1023,22 @@ class Notice extends Managed_DataObject $originalProfile = null; if ($this->repeat_of) { // Check blocks against the original notice's poster as well. - $original = Notice::staticGet('id', $this->repeat_of); + $original = Notice::getKV('id', $this->repeat_of); if ($original) { $originalProfile = $original->getProfile(); } } foreach ($ni as $id => $source) { - $user = User::staticGet('id', $id); - if (empty($user) || $user->hasBlocked($profile) || - ($originalProfile && $user->hasBlocked($originalProfile))) { + try { + $user = User::getKV('id', $id); + if (empty($user) || + $user->hasBlocked($profile) || + ($originalProfile && $user->hasBlocked($originalProfile))) { + unset($ni[$id]); + } + } catch (UserNoProfileException $e) { + // User doesn't have a profile; invalid; skip them. unset($ni[$id]); } } @@ -1065,7 +1070,7 @@ class Notice extends Managed_DataObject * @param array $recipient optional list of reply profile ids * if left empty, will be loaded from reply records */ - function addToInboxes($groups=null, $recipients=null) + function addToInboxes(array $groups=null, array $recipients=null) { $ni = $this->whoGets($groups, $recipients); @@ -1145,7 +1150,7 @@ class Notice extends Managed_DataObject $groups = array(); foreach (array_unique($group_ids) as $id) { - $group = User_group::staticGet('id', $id); + $group = User_group::getKV('id', $id); if ($group) { common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname"); $result = $this->addToGroupInbox($group); @@ -1251,15 +1256,15 @@ class Notice extends Managed_DataObject * * Mail notifications etc will be handled later. * - * @param array of unique identifier URIs for recipients + * @param array $uris Array of unique identifier URIs for recipients */ - function saveKnownReplies($uris) + function saveKnownReplies(array $uris) { if (empty($uris)) { return; } - $sender = Profile::staticGet($this->profile_id); + $sender = Profile::getKV($this->profile_id); foreach (array_unique($uris) as $uri) { @@ -1300,22 +1305,20 @@ class Notice extends Managed_DataObject return array(); } - $sender = Profile::staticGet($this->profile_id); + $sender = Profile::getKV($this->profile_id); $replied = array(); // If it's a reply, save for the replied-to author - - if (!empty($this->reply_to)) { - $original = $this->getOriginal(); - if (!empty($original)) { // that'd be weird - $author = $original->getProfile(); - if (!empty($author)) { - $this->saveReply($author->id); - $replied[$author->id] = 1; - self::blow('reply:stream:%d', $author->id); - } + try { + $author = $this->getParent()->getProfile(); + if ($author instanceof Profile) { + $this->saveReply($author->id); + $replied[$author->id] = 1; + self::blow('reply:stream:%d', $author->id); } + } catch (Exception $e) { + // Not a reply, since it has no parent! } // @todo ideally this parser information would only @@ -1338,7 +1341,7 @@ class Notice extends Managed_DataObject // Don't save replies from blocked profile to local user - $mentioned_user = User::staticGet('id', $mentioned->id); + $mentioned_user = User::getKV('id', $mentioned->id); if (!empty($mentioned_user) && $mentioned_user->hasBlocked($sender)) { continue; } @@ -1380,7 +1383,7 @@ class Notice extends Managed_DataObject return $this->_replies; } - $replyMap = Memcached_DataObject::listGet('Reply', 'notice_id', array($this->id)); + $replyMap = Reply::listGet('notice_id', array($this->id)); $ids = array(); @@ -1429,7 +1432,7 @@ class Notice extends Managed_DataObject $recipientIds = $this->getReplies(); foreach ($recipientIds as $recipientId) { - $user = User::staticGet('id', $recipientId); + $user = User::getKV('id', $recipientId); if (!empty($user)) { mail_notify_attn($user, $this); } @@ -1458,7 +1461,7 @@ class Notice extends Managed_DataObject return $this->_groups; } - $gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', array($this->id)); + $gis = Group_inbox::listGet('notice_id', array($this->id)); $ids = array(); @@ -1487,7 +1490,7 @@ class Notice extends Managed_DataObject * @return Activity activity object representing this Notice. */ - function asActivity($cur) + function asActivity($cur=null) { $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id)); @@ -1498,9 +1501,8 @@ class Notice extends Managed_DataObject if (Event::handle('StartNoticeAsActivity', array($this, &$act))) { - $act->id = $this->uri; + $act->id = TagURI::mint("post:".$this->id); $act->time = strtotime($this->created); - $act->link = $this->bestUrl(); $act->content = common_xml_safe_str($this->rendered); $profile = $this->getProfile(); @@ -1511,7 +1513,7 @@ class Notice extends Managed_DataObject $act->verb = $this->verb; if ($this->repeat_of) { - $repeated = Notice::staticGet('id', $this->repeat_of); + $repeated = Notice::getKV('id', $this->repeat_of); if (!empty($repeated)) { $act->objects[] = $repeated->asActivity($cur); } @@ -1547,7 +1549,7 @@ class Notice extends Managed_DataObject $ctx = new ActivityContext(); if (!empty($this->reply_to)) { - $reply = Notice::staticGet('id', $this->reply_to); + $reply = Notice::getKV('id', $this->reply_to); if (!empty($reply)) { $ctx->replyToID = $reply->uri; $ctx->replyToUrl = $reply->bestUrl(); @@ -1559,7 +1561,7 @@ class Notice extends Managed_DataObject $conv = null; if (!empty($this->conversation)) { - $conv = Conversation::staticGet('id', $this->conversation); + $conv = Conversation::getKV('id', $this->conversation); if (!empty($conv)) { $ctx->conversation = $conv->uri; } @@ -1568,7 +1570,7 @@ class Notice extends Managed_DataObject $reply_ids = $this->getReplies(); foreach ($reply_ids as $id) { - $rprofile = Profile::staticGet('id', $id); + $rprofile = Profile::getKV('id', $id); if (!empty($rprofile)) { $ctx->attention[] = $rprofile->getUri(); $ctx->attentionType[$rprofile->getUri()] = ActivityObject::PERSON; @@ -1599,7 +1601,7 @@ class Notice extends Managed_DataObject $repeat = null; if (!empty($this->repeat_of)) { - $repeat = Notice::staticGet('id', $this->repeat_of); + $repeat = Notice::getKV('id', $this->repeat_of); if (!empty($repeat)) { $ctx->forwardID = $repeat->uri; $ctx->forwardUrl = $repeat->bestUrl(); @@ -1641,7 +1643,7 @@ class Notice extends Managed_DataObject $act->source->updated = self::utcDate($notice->created); } - $user = User::staticGet('id', $profile->id); + $user = User::getKV('id', $profile->id); if (!empty($user)) { $act->source->links['license'] = common_config('license', 'url'); @@ -1713,9 +1715,9 @@ class Notice extends Managed_DataObject // favorite and repeated if (!empty($cur)) { - $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false"; $cp = $cur->getProfile(); - $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this->id)) ? "true" : "false"; + $noticeInfoAttr['favorite'] = ($cp->hasFave($this)) ? "true" : "false"; + $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this)) ? "true" : "false"; } if (!empty($this->repeat_of)) { @@ -1785,7 +1787,7 @@ class Notice extends Managed_DataObject // return it if it does if (!empty($reply_to)) { - $reply_notice = Notice::staticGet('id', $reply_to); + $reply_notice = Notice::getKV('id', $reply_to); if (!empty($reply_notice)) { return $reply_notice; } @@ -1810,7 +1812,7 @@ class Notice extends Managed_DataObject // Figure out who that is. - $sender = Profile::staticGet('id', $profile_id); + $sender = Profile::getKV('id', $profile_id); if (empty($sender)) { return null; } @@ -1876,7 +1878,7 @@ class Notice extends Managed_DataObject */ function repeat($repeater_id, $source) { - $author = Profile::staticGet('id', $this->profile_id); + $author = Profile::getKV('id', $this->profile_id); // TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'. // TRANS: %1$s is the repeated user's name, %2$s is the repeated notice. @@ -2110,7 +2112,7 @@ class Notice extends Managed_DataObject // have to wait Event::handle('StartNoticeDistribute', array($this)); - $user = User::staticGet('id', $this->profile_id); + $user = User::getKV('id', $this->profile_id); if (!empty($user)) { Inbox::insertNotice($user->id, $this->id); } @@ -2181,11 +2183,11 @@ class Notice extends Managed_DataObject $ns->code = $this->source; break; default: - $ns = Notice_source::staticGet($this->source); + $ns = Notice_source::getKV($this->source); if (!$ns) { $ns = new Notice_source(); $ns->code = $this->source; - $app = Oauth_application::staticGet('name', $this->source); + $app = Oauth_application::getKV('name', $this->source); if ($app) { $ns->name = $app->name; $ns->url = $app->source_url; @@ -2258,12 +2260,12 @@ class Notice extends Managed_DataObject return false; } - $notice = Notice::staticGet('id', $id); + $notice = Notice::getKV('id', $id); if ($notice) { return $notice->created; } - $deleted = Deleted_notice::staticGet('id', $id); + $deleted = Deleted_notice::getKV('id', $id); if ($deleted) { return $deleted->created; } @@ -2426,11 +2428,8 @@ class Notice extends Managed_DataObject // Only for users on this site - if ($scope & Notice::SITE_SCOPE) { - $user = $profile->getUser(); - if (empty($user)) { - return false; - } + if (($scope & Notice::SITE_SCOPE) && !$profile->isLocal()) { + return false; } // Only for users mentioned in the notice @@ -2535,18 +2534,21 @@ class Notice extends Managed_DataObject return $groups; } - protected $_original = -1; + protected $_parent = -1; - function getOriginal() + public function getParent() { - if (is_int($this->_original) && $this->_original == -1) { - if (empty($this->reply_to)) { - $this->_original = null; - } else { - $this->_original = Notice::staticGet('id', $this->reply_to); - } + if (empty($this->reply_to)) { + // Should this also be NoResultException? I don't think so. + throw new Exception('Notice has no parent'); + } elseif ($this->_parent === -1) { // local object cache + $this->_parent = Notice::getKV('id', $this->reply_to); + } + + if (!($this->_parent instanceof Notice)) { + throw new NoResultException($this->_parent); } - return $this->_original; + return $this->_parent; } /** @@ -2562,7 +2564,7 @@ class Notice extends Managed_DataObject function __sleep() { $vars = parent::__sleep(); - $skip = array('_original', '_profile', '_groups', '_attachments', '_faves', '_replies', '_repeats'); + $skip = array('_parent', '_profile', '_groups', '_attachments', '_faves', '_replies', '_repeats'); return array_diff($vars, $skip); } @@ -2601,14 +2603,14 @@ class Notice extends Managed_DataObject $ids = array_unique($ids); - return Memcached_DataObject::pivotGet('Profile', 'id', $ids); + return Profile::pivotGet('id', $ids); } static function fillGroups(&$notices) { $ids = self::_idsOf($notices); - $gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', $ids); + $gis = Group_inbox::listGet('notice_id', $ids); $gids = array(); @@ -2622,7 +2624,7 @@ class Notice extends Managed_DataObject $gids = array_unique($gids); - $group = Memcached_DataObject::pivotGet('User_group', 'id', $gids); + $group = User_group::pivotGet('id', $gids); foreach ($notices as $notice) { @@ -2649,7 +2651,7 @@ class Notice extends Managed_DataObject { $ids = self::_idsOf($notices); - $f2pMap = Memcached_DataObject::listGet('File_to_post', 'post_id', $ids); + $f2pMap = File_to_post::listGet('post_id', $ids); $fileIds = array(); @@ -2661,7 +2663,7 @@ class Notice extends Managed_DataObject $fileIds = array_unique($fileIds); - $fileMap = Memcached_DataObject::pivotGet('File', 'id', $fileIds); + $fileMap = File::pivotGet('id', $fileIds); foreach ($notices as $notice) { @@ -2687,7 +2689,7 @@ class Notice extends Managed_DataObject if (isset($this->_faves) && is_array($this->_faves)) { return $this->_faves; } - $faveMap = Memcached_DataObject::listGet('Fave', 'notice_id', array($this->id)); + $faveMap = Fave::listGet('notice_id', array($this->id)); $this->_faves = $faveMap[$this->id]; return $this->_faves; } @@ -2700,7 +2702,7 @@ class Notice extends Managed_DataObject static function fillFaves(&$notices) { $ids = self::_idsOf($notices); - $faveMap = Memcached_DataObject::listGet('Fave', 'notice_id', $ids); + $faveMap = Fave::listGet('notice_id', $ids); $cnt = 0; $faved = array(); foreach ($faveMap as $id => $faves) { @@ -2718,7 +2720,7 @@ class Notice extends Managed_DataObject static function fillReplies(&$notices) { $ids = self::_idsOf($notices); - $replyMap = Memcached_DataObject::listGet('Reply', 'notice_id', $ids); + $replyMap = Reply::listGet('notice_id', $ids); foreach ($notices as $notice) { $replies = $replyMap[$notice->id]; $ids = array(); @@ -2736,7 +2738,7 @@ class Notice extends Managed_DataObject if (isset($this->_repeats) && is_array($this->_repeats)) { return $this->_repeats; } - $repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', array($this->id)); + $repeatMap = Notice::listGet('repeat_of', array($this->id)); $this->_repeats = $repeatMap[$this->id]; return $this->_repeats; } @@ -2749,7 +2751,7 @@ class Notice extends Managed_DataObject static function fillRepeats(&$notices) { $ids = self::_idsOf($notices); - $repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', $ids); + $repeatMap = Notice::listGet('repeat_of', $ids); foreach ($notices as $notice) { $repeats = $repeatMap[$notice->id]; $notice->_setRepeats($repeats);