[CORE][ROUTER] Fix wrong parameter in all/:tag by XRevan86

[quix0rs-gnu-social.git] / lib / useractivitystream.php

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 21dfff1db5be88ec3635143c63832c316b979570..cc0e4297e6626c2c5ed8c7d65bbdcbf4707dac20 100644 (file)
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -75,10 +75,8 @@ class UserActivityStream extends AtomUserNoticeFeed
         $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));
 
@@ -110,6 +108,8 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $end = time() + 1;
         foreach ($this->objs as $obj) {
+            set_time_limit(10);
+
             try {
                 $act = $obj->asActivity();
             } catch (Exception $e) {
@@ -126,7 +126,7 @@ class UserActivityStream extends AtomUserNoticeFeed
                     $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 {
@@ -182,7 +182,7 @@ class UserActivityStream extends AtomUserNoticeFeed
                 }
                 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 {
@@ -219,7 +219,6 @@ class UserActivityStream extends AtomUserNoticeFeed
                 }
             } catch (Exception $e) {
                 common_log(LOG_ERR, $e->getMessage());
-                continue;
             }
         }
     }
@@ -353,32 +352,6 @@ class UserActivityStream extends AtomUserNoticeFeed
         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);