Merge branch 'master' of /var/www/trunk

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

diff --git a/lib/stream.php b/lib/stream.php
index 4b7d6ed24ec72ddd22582541e3566e4d7b8d36eb..0cb9e0bf4f749002ca8e8003ee50ec7980f90168 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -10,48 +10,23 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
+require_once(INSTALLDIR.'/lib/personal.php');
+require_once(INSTALLDIR.'/lib/noticelist.php');
 
-class StreamAction extends Action {
-
-       function handle($args) {
-               parent::handle($args);
-       }
-
-       function show_notice($notice) {
-               global $config;
-               $profile = $notice->getProfile();
-               # XXX: RDFa
-               common_element_start('div', array('class' => 'notice',
-                                                                                 'id' => 'notice-' . $notice->id));
-               $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-               common_element_start('a', array('href' => $profile->profileurl));
-               common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE),
-                                                                       'class' => 'avatar stream',
-                                                                       'width' => AVATAR_STREAM_SIZE,
-                                                                       'height' => AVATAR_STREAM_SIZE,
-                                                                       'alt' =>
-                                                                       ($profile->fullname) ? $profile->fullname :
-                                                                       $profile->nickname));
-               common_element_end('a');
-               common_element('a', array('href' => $profile->profileurl,
-                                                                 'class' => 'nickname'),
-                                          $profile->nickname);
-               # FIXME: URL, image, video, audio
-               common_element('span', array('class' => 'content'), $notice->content);
-               $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-               common_element('a', array('class' => 'notice',
-                                                                 'href' => $noticeurl),
-                                          common_date_string($notice->created));
-               common_element_end('div');
-       }
+class StreamAction extends PersonalAction
+{
+    function show_notice_list($notice)
+    {
+        $nl = new NoticeList($notice);
+        return $nl->show();
+    }
 }