]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
New public tabs - Public, Recent tags, Featured, and Favorited
authorZach Copley <zach@controlyourself.ca>
Thu, 20 Nov 2008 07:19:30 +0000 (02:19 -0500)
committerZach Copley <zach@controlyourself.ca>
Thu, 20 Nov 2008 07:19:30 +0000 (02:19 -0500)
darcs-hash:20081120071930-7b5ce-a15d7308bde085f03aa335c98ecd0aaa3833bc35.gz

actions/favorited.php [new file with mode: 0644]
actions/favoritedrss.php [new file with mode: 0644]
actions/featured.php [new file with mode: 0644]
actions/public.php
actions/tag.php
config.php.sample
htaccess.sample
lib/common.php
lib/stream.php
lib/util.php

diff --git a/actions/favorited.php b/actions/favorited.php
new file mode 100644 (file)
index 0000000..ba41cbc
--- /dev/null
@@ -0,0 +1,108 @@
+<?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); }
+
+require_once(INSTALLDIR.'/lib/stream.php');
+
+class FavoritedAction extends StreamAction {
+
+       function handle($args) {
+               parent::handle($args);
+
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+               common_show_header(_('Favorited timeline'),
+                                                  array($this, 'show_header'), NULL,
+                                                  array($this, 'show_top'));
+
+               $this->show_notices($page);
+
+               common_show_footer();
+       }
+
+       function show_top() {
+               if (common_logged_in()) {
+                       common_notice_form('public');
+               }
+
+               $this->public_views_menu();
+       }
+
+       // XXX Need to make RSS stream
+
+       function show_header() {
+               common_element('link', array('rel' => 'alternate',
+                                                                        'href' => common_local_url('favoritedrss'),
+                                                                        'type' => 'application/rss+xml',
+                                                                        'title' => _('Favorited Stream Feed')));
+       }
+
+       function show_notices($page) {
+
+               // XXX: Make dropoff configurable like tags?
+
+               $qry =
+                       'SELECT notice_id, sum(exp(-(now() - modified)/864000)) as weight ' .
+                       'FROM fave GROUP BY notice_id ' .
+                       'ORDER BY weight DESC';
+
+               $offset = ($page - 1) * NOTICES_PER_PAGE;
+               $limit = NOTICES_PER_PAGE + 1;
+
+               if (common_config('db','type') == 'pgsql') {
+                       $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+               } else {
+                       $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+               }
+
+               // XXX: Figure out how to cache these queries.
+
+               $fave = new Fave;
+               $fave->query($qry);
+
+               $notice_list = array();
+
+               while ($fave->fetch()) {
+                 array_push($notice_list, $fave->notice_id);
+               }
+
+               $notice = new Notice();
+
+               $notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)',
+                       implode($notice_list, ',')));
+
+               $cnt = 0;
+
+               if ($notice) {
+                       common_element_start('ul', array('id' => 'notices'));
+                       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, 'favorited');
+       }
+}
\ No newline at end of file
diff --git a/actions/favoritedrss.php b/actions/favoritedrss.php
new file mode 100644 (file)
index 0000000..4661f48
--- /dev/null
@@ -0,0 +1,83 @@
+<?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); }
+
+require_once(INSTALLDIR.'/lib/rssaction.php');
+
+// Formatting of RSS handled by Rss10Action
+
+class FavoritedrssAction extends Rss10Action {
+
+       function init() {
+               return true;
+       }
+
+       function get_notices($limit=0) {
+
+               $qry =
+                       'SELECT notice_id, sum(exp(-(now() - modified)/864000)) as weight ' .
+                       'FROM fave GROUP BY notice_id ' .
+                       'ORDER BY weight DESC';
+
+               $offset = 0;
+               $total = ($limit == 0) ? 48 : $limit;
+
+               if (common_config('db','type') == 'pgsql') {
+                       $qry .= ' LIMIT ' . $total . ' OFFSET ' . $offset;
+               } else {
+                       $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+               }
+
+               $fave = new Fave;
+               $fave->query($qry);
+
+               $notice_list = array();
+
+               while ($fave->fetch()) {
+                 array_push($notice_list, $fave->notice_id);
+               }
+
+               $notice = new Notice();
+
+               $notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)',
+                       implode($notice_list, ',')));
+
+               $notices = array();
+
+               while ($notice->fetch()) {
+                       $notices[] = clone($notice);
+               }
+
+               return $notices;
+       }
+
+       function get_channel() {
+               global $config;
+               $c = array('url' => common_local_url('favoritedrss'),
+                                  'title' => sprintf(_('%s Most Favorited Stream'), $config['site']['name']),
+                                  'link' => common_local_url('favorited'),
+                                  'description' => sprintf(_('Most favorited updates for %s'), $config['site']['name']));
+               return $c;
+       }
+
+       function get_image() {
+               return NULL;
+       }
+}
\ No newline at end of file
diff --git a/actions/featured.php b/actions/featured.php
new file mode 100644 (file)
index 0000000..0107191
--- /dev/null
@@ -0,0 +1,102 @@
+<?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); }
+
+require_once(INSTALLDIR.'/lib/stream.php');
+
+class FeaturedAction extends StreamAction {
+
+       function handle($args) {
+               parent::handle($args);
+
+               $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+               common_show_header(_('Featured timeline'),
+                                                  array($this, 'show_header'), NULL,
+                                                  array($this, 'show_top'));
+
+               $this->show_notices($page);
+
+               common_show_footer();
+       }
+
+       function show_top() {
+               if (common_logged_in()) {
+                       common_notice_form('public');
+               }
+
+               $this->public_views_menu();
+       }
+
+       function show_header() {
+
+               // XXX need to make the RSS feed for this
+
+               //common_element('link', array('rel' => 'alternate',
+               //                                                       'href' => common_local_url('featuredrss'),
+               //                                                       'type' => 'application/rss+xml',
+               //                                                       'title' => _('Featured Stream Feed')));
+
+       }
+
+       function show_notices($page) {
+
+               $featured = common_config('nickname', 'featured');
+
+               if (count($featured) > 0) {
+
+                       $id_list = array();
+
+                       foreach($featured as $featuree) {
+                               $profile = Profile::staticGet('nickname', trim($featuree));
+                               array_push($id_list, $profile->id);
+                       }
+
+                       // XXX: Show a list of users (people list) instead of shit crap
+
+                       $qry =
+                               'SELECT * ' .
+                               'FROM notice ' .
+                               'WHERE profile_id IN (%s) ';
+
+                       $cnt = 0;
+
+                       $notice = Notice::getStream(sprintf($qry, implode($id_list, ',')),
+                               'featured_stream', ($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+                       if ($notice) {
+                               common_element_start('ul', array('id' => 'notices'));
+                               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, 'featured');
+
+               }
+       }
+
+}
\ No newline at end of file
index 43beaffc6a6074790fbc42e186f0eeb099afb026..b7a14d8dce8302d18c4bff4d29b5308fe79b81d0 100644 (file)
@@ -45,6 +45,8 @@ class PublicAction extends StreamAction {
                if (common_logged_in()) {
                        common_notice_form('public');
                }
+               
+               $this->public_views_menu();
        }
 
        function show_header() {
index dab462eae2f595a179722c79e55f69b2cb9185c5..553810cccdfb753b5331d3e35b2aa0f652d63bb2 100644 (file)
@@ -69,19 +69,7 @@ class TagAction extends StreamAction {
                        common_element_end('div');
                }
 
-               common_element_start('ul', array('id' => 'nav_views'));
-
-               common_menu_item(common_local_url('tags'),
-                                                _('Recent Tags'),
-                                                _('Recent Tags'),
-                                                !$tag);
-               if ($tag) {
-                       common_menu_item(common_local_url('tag', array('tag' => $tag)),
-                                                        '#' . $tag,
-                                                        sprintf(_("Notices tagged with %s"), $tag),
-                                                        true);
-               }
-               common_element_end('ul');
+               $this->public_views_menu();
        }
 
        function show_tags()
index 17a7763af7c1c2589b6063131ff97af12a31ada2..87c8b76c5154d611a3aad6684e10ffa788da230f 100644 (file)
@@ -56,6 +56,9 @@ $config['db']['database'] = 'mysql://laconica:microblog@localhost/laconica';
 #Add your own here. Note: empty array by default
 #$config['nickname']['blacklist'][] = 'scobleizer';
 
+# Users to populate the 'Featured' tab
+#$config['nickname']['featured'][] = 'scobleizer';
+
 # xmpp
 #$config['xmpp']['enabled'] = false;
 #$config['xmpp']['server'] = 'server.example.net';
index 1a833048842a4aa6633d69544b8d4ffca7d57bd1..3ef108c2b88219f66ba6c0959e4bdebd8efe3a8b 100644 (file)
@@ -7,6 +7,8 @@ RewriteBase /mublog/
 RewriteRule ^$ index.php?action=public [L,QSA]
 RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
 RewriteRule ^xrds$ index.php?action=publicxrds [L,QSA]
+RewriteRule ^featuredrss$ index.php?action=featuredrss [L,QSA]
+RewriteRule ^favoritedrss$ index.php?action=favoritedrss [L,QSA]
 RewriteRule ^opensearch/people$ index.php?action=opensearch&type=people [L,QSA]
 RewriteRule ^opensearch/notice$ index.php?action=opensearch&type=notice [L,QSA]
 
@@ -66,6 +68,9 @@ RewriteRule ^tags/?$ index.php?action=tag [L,QSA]
 RewriteRule ^tag/([a-zA-Z0-9]+)/rss$ index.php?action=tagrss&tag=$1 [L,QSA]
 RewriteRule ^tag(/(.*))?$ index.php?action=tag&tag=$2 [L,QSA]
 
+RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
+RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
+
 RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA]
 RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA]
index aac54b547c9b05af3b1f415ce5df7aa93ea7f96e..def18337535830adb6bfdf1bf706c15a347d2b1f 100644 (file)
@@ -82,7 +82,8 @@ $config =
                array('backend' => 'mail',
                          'params' => NULL),
                'nickname' =>
-               array('blacklist' => array()),
+               array('blacklist' => array(),
+                         'featured' => array()),
                'avatar' =>
                array('server' => NULL),
                'public' =>
index ea452096cc937a42b0f14a862b977295b558b221..b19bf7c0faeaa60214b2b4115dfd203e6deb4856 100644 (file)
  *
  * 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); }
@@ -23,6 +23,31 @@ require_once(INSTALLDIR.'/lib/personal.php');
 
 class StreamAction extends PersonalAction {
 
+
+       function public_views_menu() {
+
+               $action = $this->trimmed('action');
+
+               common_debug("action = $action");
+
+               common_element_start('ul', array('id' => 'nav_views'));
+
+               common_menu_item(common_local_url('public'), _('Public'),
+                       _('Public timeline'), $action == 'public');
+
+               common_menu_item(common_local_url('tag'), _('Recent tags'),
+                       _('Recent tags'), $action == 'tag');
+
+               common_menu_item(common_local_url('featured'), _('Featured'),
+                       _('Notices from featured Users'), $action == 'featured');
+
+               common_menu_item(common_local_url('favorited'), _('Favorited'),
+                       _("Most favorited notices"), $action == 'favorited');
+
+               common_element_end('ul');
+
+       }
+
        function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
index 68644e9164c650501ec4f1beeb2276062e693fc2..c8ccf63fff14471745291455cfd5275386f63b74 100644 (file)
@@ -317,7 +317,6 @@ function common_nav_menu() {
                                                 _('Home'));
        }
        common_menu_item(common_local_url('peoplesearch'), _('Search'));
-       common_menu_item(common_local_url('tags'), _('Tags'));
        if ($user) {
                common_menu_item(common_local_url('profilesettings'),
                                                 _('Settings'));
@@ -948,10 +947,26 @@ function common_fancy_url($action, $args=NULL) {
                } else {
                        return common_path('');
                }
+        case 'featured':
+               if ($args && isset($args['page'])) {
+                       return common_path('featured?page=' . $args['page']);
+               } else {
+                       return common_path('featured');
+               }
+        case 'favorited':
+               if ($args && isset($args['page'])) {
+                       return common_path('favorited?page=' . $args['page']);
+               } else {
+                       return common_path('favorited');
+               }
         case 'publicrss':
                return common_path('rss');
         case 'publicxrds':
                return common_path('xrds');
+        case 'featuredrss':
+               return common_path('featuredrss');
+        case 'favoritedrss':
+               return common_path('favoritedrss');
         case 'opensearch':
                 if ($args && $args['type']) {
                         return common_path('opensearch/'.$args['type']);
@@ -1098,11 +1113,11 @@ function common_fancy_url($action, $args=NULL) {
                        switch (strtolower($args['method'])) {
                         case 'user_timeline.rss':
                                return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
-                        case 'user_timeline.atom':                             
+                        case 'user_timeline.atom':
                                return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
                         case 'user_timeline.rss':
                                return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
-                        case 'user_timeline.atom':                             
+                        case 'user_timeline.atom':
                                return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss');
                         default: return common_simple_url($action, $args);
                        }
@@ -1110,7 +1125,7 @@ function common_fancy_url($action, $args=NULL) {
                }
         case 'sup':
                if ($args && isset($args['seconds'])) {
-                       return common_path('main/sup?seconds='.$args['seconds']);                       
+                       return common_path('main/sup?seconds='.$args['seconds']);
                } else {
                        return common_path('main/sup');
                }