$subscriptions = $this->getSubscriptions();
$subscribers = $this->getSubscribers();
$groups = $this->getGroups();
- $messagesFrom = $this->getMessagesFrom();
- $messagesTo = $this->getMessagesTo();
- $objs = array_merge($subscriptions, $subscribers, $groups, $notices, $messagesFrom, $messagesTo);
+ $objs = array_merge($subscriptions, $subscribers, $groups, $notices);
Event::handle('AppendUserActivityStreamObjects', array($this, &$objs));
$notices = $this->getNoticesBetween($start, $end);
foreach ($notices as $noticeAct) {
try {
- $nact = $noticeAct->asActivity($this->user);
+ $nact = $noticeAct->asActivity($this->user->getProfile());
if ($format == Feed::ATOM) {
$nact->outputTo($this, false, false);
} else {
}
foreach ($notices as $noticeAct) {
try {
- $nact = $noticeAct->asActivity($this->user);
+ $nact = $noticeAct->asActivity($this->user->getProfile());
if ($format == Feed::ATOM) {
$nact->outputTo($this, false, false);
} else {
return $groups;
}
- function getMessagesTo()
- {
- $msgMap = Message::listGet('to_profile', array($this->user->id));
-
- $messages = $msgMap[$this->user->id];
-
- if (!empty($this->after)) {
- $messages = array_filter($messages, array($this, 'createdAfter'));
- }
-
- return $messages;
- }
-
- function getMessagesFrom()
- {
- $msgMap = Message::listGet('from_profile', array($this->user->id));
-
- $messages = $msgMap[$this->user->id];
-
- if (!empty($this->after)) {
- $messages = array_filter($messages, array($this, 'createdAfter'));
- }
-
- return $messages;
- }
-
function createdAfter($item) {
$created = strtotime((empty($item->created)) ? $item->modified : $item->created);
return ($created >= $this->after);