New public tabs - Public, Recent tags, Featured, and Favorited

darcs-hash:20081120071930-7b5ce-a15d7308bde085f03aa335c98ecd0aaa3833bc35.gz

5 files changed, 296 insertions, 13 deletions

diff --git a/actions/favorited.php b/actions/favorited.php
new file mode 100644
index 000000000..ba41cbc3d
--- /dev/null
+++ b/actions/favorited.php
@@ -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
index 000000000..4661f4821
--- /dev/null
+++ b/actions/favoritedrss.php
@@ -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
index 000000000..01071912d
--- /dev/null
+++ b/actions/featured.php
@@ -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
diff --git a/actions/public.php b/actions/public.php
index 43beaffc6..b7a14d8dc 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -45,6 +45,8 @@ class PublicAction extends StreamAction {
 		if (common_logged_in()) {
 			common_notice_form('public');
 		}
+		
+		$this->public_views_menu();
 	}
 
 	function show_header() {
diff --git a/actions/tag.php b/actions/tag.php
index dab462eae..553810ccc 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -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()