/**
* 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.
*
class UserActivityStream extends AtomUserNoticeFeed
{
public $activities = array();
+ public $after = null;
const OUTPUT_STRING = 1;
const OUTPUT_RAW = 2;
* 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();
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();
- $messagesFrom = $this->getMessagesFrom();
- $messagesTo = $this->getMessagesTo();
- $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices, $messagesFrom, $messagesTo);
+ $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
}
/**
- * 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)
$notices = $this->getNoticesBetween($start, $end);
foreach ($notices as $noticeAct) {
try {
- $nact = $noticeAct->asActivity();
+ $nact = $noticeAct->asActivity($this->user->getProfile());
if ($format == Feed::ATOM) {
$nact->outputTo($this, false, false);
} else {
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, ",");
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->getProfile());
if ($format == Feed::ATOM) {
$nact->outputTo($this, false, false);
} else {
}
}
- // We always add the registration activity at the end, even if
- // they have older activities (from restored backups) in their stream.
+ 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, ",");
+ 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;
}
- fwrite($handle, json_encode($ract->asArray()));
- $haveOne = true;
+ } catch (Exception $e) {
+ common_log(LOG_ERR, $e->getMessage());
+ continue;
}
- } catch (Exception $e) {
- common_log(LOG_ERR, $e->getMessage());
- continue;
}
}
$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) {
$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) {
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
$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'");
function getNotices()
{
- return $this->getNoticesBetween();
+ if (!empty($this->after)) {
+ return $this->getNoticesBetween($this->after);
+ } else {
+ return $this->getNoticesBetween();
+ }
}
function getGroups()
$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);
return $groups;
}
- function getMessagesTo()
- {
- $msgMap = Memcached_DataObject::listGet('Message', 'to_profile', array($this->user->id));
-
- return $msgMap[$this->user->id];
- }
-
- function getMessagesFrom()
- {
- $msgMap = Memcached_DataObject::listGet('Message', 'from_profile', array($this->user->id));
-
- return $msgMap[$this->user->id];
+ function createdAfter($item) {
+ $created = strtotime((empty($item->created)) ? $item->modified : $item->created);
+ return ($created >= $this->after);
}
function writeJSON($handle)
projects / quix0rs-gnu-social.git / blobdiff