fix service discovery (I think)

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

diff --git a/lib/stream.php b/lib/stream.php
index 2b8361a7351a50bbce191157d80c254bd395cdab..ac683367f166aec509ec9a7246dc8ad6a6d36b4c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -1,22 +1,22 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * 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
  * 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/>.
  */
-  
+
 if (!defined('LACONICA')) { exit(1); }
 
 define('NOTICES_PER_PAGE', 20);
@@ -27,30 +27,33 @@ class StreamAction extends Action {
                parent::handle($args);
        }
 
-       # XXX: for 'showstream' repeats same avatar over and over
        function show_notice($notice) {
+               global $config;
                $profile = $notice->getProfile();
                # XXX: RDFa
-               common_start_element('div', array('class' => 'notice'));
+               common_element_start('div', array('class' => 'notice',
+                                                                                 'id' => 'notice-' . $notice->id));
                $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-               common_start_element('a', array('href' => $profile->profileurl));
-               common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR,
+               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 : 
+                                                                       'alt' =>
+                                                                       ($profile->fullname) ? $profile->fullname :
                                                                        $profile->nickname));
-               common_end_element('a');
+               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);
+               common_element_start('span', array('class' => 'content'));
+               common_raw(common_render_content($notice->content, $notice));
+               common_element_end('span');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element('a', array('class' => 'notice',
                                                                  'href' => $noticeurl),
                                           common_date_string($notice->created));
-               common_end_element('div');
+               common_element_end('div');
        }
 }