add inboxed and regenerate data objects

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index 23d9f039788749d2b45a9528fc3d9f1b8a8464f8..43beaffc6a6074790fbc42e186f0eeb099afb026 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -29,9 +29,9 @@ class PublicAction extends StreamAction {
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
                header('X-XRDS-Location: '. common_local_url('publicxrds'));
-               
-               common_show_header(_t('Public timeline'), 
-                                                  array($this, 'show_header'), NULL,  
+
+               common_show_header(_('Public timeline'),
+                                                  array($this, 'show_header'), NULL,
                                                   array($this, 'show_top'));
 
                # XXX: Public sidebar here?
@@ -46,48 +46,36 @@ class PublicAction extends StreamAction {
                        common_notice_form('public');
                }
        }
-       
+
        function show_header() {
                common_element('link', array('rel' => 'alternate',
                                                                         'href' => common_local_url('publicrss'),
                                                                         'type' => 'application/rss+xml',
-                                                                        'title' => _t('Public Stream Feed')));
+                                                                        'title' => _('Public Stream Feed')));
                # for client side of OpenID authentication
                common_element('meta', array('http-equiv' => 'X-XRDS-Location',
                                                                         'content' => common_local_url('publicxrds')));
        }
-       
-       function show_notices($page) {
 
-               $notice = DB_DataObject::factory('notice');
-
-               # FIXME: bad performance
-               
-               $notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
+       function show_notices($page) {
 
-               $notice->orderBy('created DESC');
+               $cnt = 0;
+               $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+                                                                          NOTICES_PER_PAGE + 1);
                
-               # We fetch one extra, to see if we need an "older" link
-               
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-               $cnt = $notice->find();
-
-               if ($cnt > 0) {
+               if ($notice) {
                        common_element_start('ul', array('id' => 'notices'));
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($notice->fetch()) {
-                                       $this->show_notice($notice);
-                               } else {
-                                       // shouldn't happen!
+                       while ($notice->fetch()) {
+                               $cnt++;
+                               if ($cnt > NOTICES_PER_PAGE) {
                                        break;
                                }
+                               $this->show_notice($notice);
                        }
                        common_element_end('ul');
                }
-               
+
                common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                                                  $page, 'public');
        }
-}
-
+}
\ No newline at end of file