X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fuseractivitystream.php;h=a94fee21393e6414228e52abdd1528909a5f181e;hb=c6b1b3e5e3ad1c47c7bd25b5bcfb0a8cb1cb2bb5;hp=82f0be05045fca177e52e320b5d9fbaae7d1e11e;hpb=1c1bcd7cc64541859fe33624c1182e429785628c;p=quix0rs-gnu-social.git diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php index 82f0be0504..a94fee2139 100644 --- a/lib/useractivitystream.php +++ b/lib/useractivitystream.php @@ -20,7 +20,7 @@ /** * Class for activity streams * - * Includes faves, notices, and subscriptions. + * Includes objects like notices, subscriptions and from plugins. * * We extend atomusernoticefeed since it does some nice setup for us. * @@ -28,6 +28,7 @@ class UserActivityStream extends AtomUserNoticeFeed { public $activities = array(); + public $after = null; const OUTPUT_STRING = 1; const OUTPUT_RAW = 2; @@ -42,11 +43,12 @@ class UserActivityStream extends AtomUserNoticeFeed * Raw output mode will attempt to stream, keeping less * data in memory but will leave $this->activities incomplete. */ - function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING) + function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING, $after = null) { parent::__construct($user, null, $indent); $this->outputMode = $outputMode; + if ($this->outputMode == self::OUTPUT_STRING) { // String buffering? Grab all the notices now. $notices = $this->getNotices(); @@ -65,25 +67,26 @@ class UserActivityStream extends AtomUserNoticeFeed throw new Exception('Invalid outputMode provided to ' . __METHOD__); } + $this->after = $after; + // Assume that everything but notices is feasible // to pull at once and work with in memory... $subscriptions = $this->getSubscriptions(); $subscribers = $this->getSubscribers(); $groups = $this->getGroups(); - $faves = $this->getFaves(); - $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices); + $objs = array_merge($subscriptions, $subscribers, $groups, $notices); + + Event::handle('AppendUserActivityStreamObjects', array($this, &$objs)); $subscriptions = null; $subscribers = null; $groups = null; - $faves = null; unset($subscriptions); unset($subscribers); unset($groups); - unset($faves); // Sort by create date @@ -96,11 +99,13 @@ class UserActivityStream extends AtomUserNoticeFeed } /** - * Interleave the pre-sorted subs/groups/faves with the user's + * Interleave the pre-sorted objects with the user's * notices, all in reverse chron order. */ function renderEntries($format=Feed::ATOM, $handle=null) { + $haveOne = false; + $end = time() + 1; foreach ($this->objs as $obj) { try { @@ -119,11 +124,15 @@ class UserActivityStream extends AtomUserNoticeFeed $notices = $this->getNoticesBetween($start, $end); foreach ($notices as $noticeAct) { try { - $nact = $noticeAct->asActivity(); + $nact = $noticeAct->asActivity($this->user); if ($format == Feed::ATOM) { $nact->outputTo($this, false, false); } else { + if ($haveOne) { + fwrite($handle, ","); + } fwrite($handle, json_encode($nact->asArray())); + $haveOne = true; } } catch (Exception $e) { common_log(LOG_ERR, $e->getMessage()); @@ -143,9 +152,13 @@ class UserActivityStream extends AtomUserNoticeFeed try { if ($format == Feed::ATOM) { // Only show the author sub-element if it's different from default user - $act->outputTo($this, false, ($act->actor->id != $this->user->uri)); + $act->outputTo($this, false, ($act->actor->id != $this->user->getUri())); } else { + if ($haveOne) { + fwrite($handle, ","); + } fwrite($handle, json_encode($act->asArray())); + $haveOne = true; } } catch (Exception $e) { common_log(LOG_ERR, $e->getMessage()); @@ -160,14 +173,22 @@ class UserActivityStream extends AtomUserNoticeFeed if ($this->outputMode == self::OUTPUT_RAW) { // Grab anything after the last pre-sorted activity. try { - $notices = $this->getNoticesBetween(0, $end); + if (!empty($this->after)) { + $notices = $this->getNoticesBetween($this->after, $end); + } else { + $notices = $this->getNoticesBetween(0, $end); + } foreach ($notices as $noticeAct) { try { - $nact = $noticeAct->asActivity(); + $nact = $noticeAct->asActivity($this->user); if ($format == Feed::ATOM) { $nact->outputTo($this, false, false); } else { + if ($haveOne) { + fwrite($handle, ","); + } fwrite($handle, json_encode($nact->asArray())); + $haveOne = true; } } catch (Exception $e) { common_log(LOG_ERR, $e->getMessage()); @@ -178,6 +199,27 @@ class UserActivityStream extends AtomUserNoticeFeed common_log(LOG_ERR, $e->getMessage()); } } + + if (empty($this->after) || strtotime($this->user->created) > $this->after) { + // We always add the registration activity at the end, even if + // they have older activities (from restored backups) in their stream. + + try { + $ract = $this->user->registrationActivity(); + if ($format == Feed::ATOM) { + $ract->outputTo($this, false, false); + } else { + if ($haveOne) { + fwrite($handle, ","); + } + fwrite($handle, json_encode($ract->asArray())); + $haveOne = true; + } + } catch (Exception $e) { + common_log(LOG_ERR, $e->getMessage()); + continue; + } + } } function compareObject($a, $b) @@ -196,6 +238,10 @@ class UserActivityStream extends AtomUserNoticeFeed $sub->subscriber = $this->user->id; + if (!empty($this->after)) { + $sub->whereAdd("created > '" . common_sql_date($this->after) . "'"); + } + if ($sub->find()) { while ($sub->fetch()) { if ($sub->subscribed != $this->user->id) { @@ -215,6 +261,10 @@ class UserActivityStream extends AtomUserNoticeFeed $sub->subscribed = $this->user->id; + if (!empty($this->after)) { + $sub->whereAdd("created > '" . common_sql_date($this->after) . "'"); + } + if ($sub->find()) { while ($sub->fetch()) { if ($sub->subscriber != $this->user->id) { @@ -226,23 +276,6 @@ class UserActivityStream extends AtomUserNoticeFeed return $subs; } - function getFaves() - { - $faves = array(); - - $fave = new Fave(); - - $fave->user_id = $this->user->id; - - if ($fave->find()) { - while ($fave->fetch()) { - $faves[] = clone($fave); - } - } - - return $faves; - } - /** * * @param int $start unix timestamp for earliest @@ -257,6 +290,17 @@ class UserActivityStream extends AtomUserNoticeFeed $notice->profile_id = $this->user->id; + // Only stuff after $this->after + + if (!empty($this->after)) { + if ($start) { + $start = max($start, $this->after); + } + if ($end) { + $end = max($end, $this->after); + } + } + if ($start) { $tsstart = common_sql_date($start); $notice->whereAdd("created >= '$tsstart'"); @@ -279,7 +323,11 @@ class UserActivityStream extends AtomUserNoticeFeed function getNotices() { - return $this->getNoticesBetween(); + if (!empty($this->after)) { + return $this->getNoticesBetween($this->after); + } else { + return $this->getNoticesBetween(); + } } function getGroups() @@ -290,6 +338,10 @@ class UserActivityStream extends AtomUserNoticeFeed $gm->profile_id = $this->user->id; + if (!empty($this->after)) { + $gm->whereAdd("created > '" . common_sql_date($this->after) . "'"); + } + if ($gm->find()) { while ($gm->fetch()) { $groups[] = clone($gm); @@ -299,11 +351,16 @@ class UserActivityStream extends AtomUserNoticeFeed return $groups; } + function createdAfter($item) { + $created = strtotime((empty($item->created)) ? $item->modified : $item->created); + return ($created >= $this->after); + } + function writeJSON($handle) { require_once INSTALLDIR.'/lib/activitystreamjsondocument.php'; fwrite($handle, '{"items": ['); $this->renderEntries(Feed::JSON, $handle); - fwrite($handle, ']'); + fwrite($handle, ']}'); } }