X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=92d4b88329187cc44406b88dfc15e37a028ba8f1;hb=67340ce11c773287a4807ddc4567add775a3fcd7;hp=04ac6d7d4e5ae38613fd8fe6438b7e11a0200b9a;hpb=bf661a5e840f0910cd999b9cc4c0a25036e3ee8b;p=quix0rs-gnu-social.git diff --git a/classes/Notice.php b/classes/Notice.php index 04ac6d7d4e..92d4b88329 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -29,7 +29,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; define('NOTICE_CACHE_WINDOW', 61); -class Notice extends Memcached_DataObject +class Notice extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -54,22 +54,23 @@ class Notice extends Memcached_DataObject ###END_AUTOCODE function getProfile() { - return Profile::staticGet($this->profile_id); + return Profile::staticGet('id', $this->profile_id); } function delete() { $this->blowCaches(); $this->blowFavesCache(); + $this->blowInboxes(); parent::delete(); } - + function saveTags() { /* extract all #hastags */ $count = preg_match_all('/(?:^|\s)#([A-Za-z0-9_\-\.]{1,64})/', strtolower($this->content), $match); if (!$count) { return true; } - + /* elide characters we don't want in the tag */ $match[1] = str_replace(array('-', '_', '.'), '', $match[1]); @@ -91,7 +92,7 @@ class Notice extends Memcached_DataObject } static function saveNew($profile_id, $content, $source=NULL, $is_local=1, $reply_to=NULL, $uri=NULL) { - + $notice = new Notice(); $notice->profile_id = $profile_id; $notice->is_local = $is_local; @@ -101,7 +102,7 @@ class Notice extends Memcached_DataObject $notice->rendered = common_render_content($notice->content, $notice); $notice->source = $source; $notice->uri = $uri; - + $id = $notice->insert(); if (!$id) { @@ -121,17 +122,18 @@ class Notice extends Memcached_DataObject } # XXX: do we need to change this for remote users? - + common_save_replies($notice); $notice->saveTags(); # Clear the cache for subscribed users, so they'll update at next request # XXX: someone clever could prepend instead of clearing the cache - + if (common_config('memcached', 'enabled')) { $notice->blowCaches(); } - + + $notice->addToInboxes(); return $notice; } @@ -157,20 +159,20 @@ class Notice extends Memcached_DataObject unset($tag); } } - + function blowSubsCache() { $cache = common_memcache(); if ($cache) { $user = new User(); - + $user->query('SELECT id ' . 'FROM user JOIN subscription ON user.id = subscription.subscriber ' . 'WHERE subscription.subscribed = ' . $this->profile_id); - + while ($user->fetch()) { $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); } - + $user->free(); unset($user); } @@ -223,22 +225,68 @@ class Notice extends Memcached_DataObject unset($fave); } } + + # XXX: too many args; we need to move to named params or even a separate + # class for notice streams - static function getStream($qry, $cachekey, $offset=0, $limit=20) { - + static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=NULL) { + if (common_config('memcached', 'enabled')) { - return Notice::getCachedStream($qry, $cachekey, $offset, $limit); - } else { - return Notice::getStreamDirect($qry, $offset, $limit); + + # Skip the cache if this is a since_id or before_id qry + if ($since_id > 0 || $before_id > 0) { + return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order); + } else { + return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order); + } } - + + return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order); } - static function getStreamDirect($qry, $offset, $limit) { - - $qry .= ' ORDER BY notice.created DESC, notice.id DESC '; + static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order) { + + $needAnd = FALSE; + $needWhere = TRUE; + + if (preg_match('/\bWHERE\b/i', $qry)) { + $needWhere = FALSE; + $needAnd = TRUE; + } + + if ($since_id > 0) { + + if ($needWhere) { + $qry .= ' WHERE '; + $needWhere = FALSE; + } else { + $qry .= ' AND '; + } + + $qry .= ' notice.id > ' . $since_id; + } + + if ($before_id > 0) { + + if ($needWhere) { + $qry .= ' WHERE '; + $needWhere = FALSE; + } else { + $qry .= ' AND '; + } + + $qry .= ' notice.id < ' . $before_id; + } + + # Allow ORDER override - if(common_config('db','type')=='pgsql') { + if ($order) { + $qry .= $order; + } else { + $qry .= ' ORDER BY notice.created DESC, notice.id DESC '; + } + + if (common_config('db','type') == 'pgsql') { $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; } else { $qry .= ' LIMIT ' . $offset . ', ' . $limit; @@ -247,33 +295,32 @@ class Notice extends Memcached_DataObject $notice = new Notice(); $notice->query($qry); - + return $notice; } - - static function getCachedStream($qry, $cachekey, $offset, $limit) { + + static function getCachedStream($qry, $cachekey, $offset, $limit, $order) { # If outside our cache window, just go to the DB - + if ($offset + $limit > NOTICE_CACHE_WINDOW) { - return Notice::getStreamDirect($qry, $offset, $limit); + return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order); } # Get the cache; if we can't, just go to the DB - + $cache = common_memcache(); - if (!$cache) { - return Notice::getStreamDirect($qry, $offset, $limit); + return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order); } # Get the notices out of the cache - + $notices = $cache->get(common_cache_key($cachekey)); - + # On a cache hit, return a DB-object-like wrapper - + if ($notices !== FALSE) { $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit)); return $wrapper; @@ -281,16 +328,16 @@ class Notice extends Memcached_DataObject # Otherwise, get the full cache window out of the DB - $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW); - + $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, NULL, NULL, $order); + # If there are no hits, just return the value - + if (!$notice) { return $notice; } # Pack results into an array - + $notices = array(); while ($notice->fetch()) { @@ -298,26 +345,65 @@ class Notice extends Memcached_DataObject } # Store the array in the cache for next time - + $result = $cache->set(common_cache_key($cachekey), $notices); # return a wrapper of the array for use now - + $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit)); - + return $wrapper; } - - function publicStream($offset=0, $limit=20) { - + + function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0) { + + $needAnd = FALSE; + $needWhere = TRUE; + $qry = 'SELECT * FROM notice '; if (common_config('public', 'localonly')) { $qry .= ' WHERE is_local = 1 '; + $needWhere = FALSE; + $needAnd = TRUE; } return Notice::getStream($qry, 'public', - $offset, $limit); + $offset, $limit, $since_id, $before_id); + } + + function addToInboxes() { + $enabled = common_config('inboxes', 'enabled'); + + if ($enabled === true || $enabled === 'transitional') { + $inbox = new Notice_inbox(); + $qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' . + 'SELECT user.id, ' . $this->id . ', "' . $this->created . '" ' . + 'FROM user JOIN subscription ON user.id = subscription.subscriber ' . + 'WHERE subscription.subscribed = ' . $this->profile_id; + if ($enabled === 'transitional') { + $qry .= ' AND user.inboxed = 1'; + } + $inbox->query($qry); + } + return; } + + # Delete from inboxes if we're deleted. + + function blowInboxes() { + + $enabled = common_config('inboxes', 'enabled'); + + if ($enabled === true || $enabled === 'transitional') { + $inbox = new Notice_inbox(); + $inbox->notice_id = $this->id; + $inbox->delete(); + } + + return; + } + } +