eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Public 'Featured' tab now shows profiles instead of notices!

Browse Source 
darcs-hash:20081121005338-7b5ce-1e2b30a5f7de6900cdc865246c1ed65d0dfe29f6.gz
This commit is contained in:
Zach Copley
2008-11-20 19:53:38 -05:00
parent e69f16d4b6
commit dac0314e0a
2 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/favorited.php
View File

@@ -89,7 +89,7 @@ class FavoritedAction extends StreamAction {
$notice = new Notice(); $notice = new Notice();
$notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)', $notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)',
implode($notice_list, ','))); implode(',', $notice_list)));
$cnt = 0; $cnt = 0;

74
actions/featured.php
View File

@@ -20,6 +20,7 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/stream.php'); require_once(INSTALLDIR.'/lib/stream.php');
require_once(INSTALLDIR.'/lib/profilelist.php');
class FeaturedAction extends StreamAction { class FeaturedAction extends StreamAction {
@@ -46,61 +47,58 @@ class FeaturedAction extends StreamAction {
$this->public_views_menu(); $this->public_views_menu();
} }
function show_header() {
}
function get_instructions() { function get_instructions() {
return _('Featured users'); return _('Featured users');
} }
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) { function show_notices($page) {
$featured = common_config('nickname', 'featured'); // XXX: Note I'm doing it this two-stage way because a raw query
// with a JOIN was *not* working. --Zach
if (count($featured) > 0) { $featured_nicks = common_config('nickname', 'featured');
$id_list = array(); if (count($featured_nicks) > 0) {
foreach($featured as $featuree) { $quoted = array();
$profile = Profile::staticGet('nickname', trim($featuree));
array_push($id_list, $profile->id); foreach ($featured_nicks as $nick) {
$quoted[] = "'$nick'";
} }
// XXX: Show a list of users (people list) instead of shit crap $user = new User;
$user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
$user->limit(($page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
$user->orderBy('user.nickname ASC');
$qry = $user->find();
'SELECT * ' .
'FROM notice ' .
'WHERE profile_id IN (%s) ';
$cnt = 0; $profile_ids = array();
$notice = Notice::getStream(sprintf($qry, implode($id_list, ',')), while ($user->fetch()) {
'featured_stream', ($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); $profile_ids[] = $user->id;
common_debug("id = $user->id");
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, $profile = new Profile;
$page, 'featured'); $profile->whereAdd(sprintf('profile.id IN (%s)', implode(',', $profile_ids)));
$profile->orderBy('nickname ASC');
$cnt = $profile->find();
common_debug("count = $cnt");
if ($cnt > 0) {
$featured = new ProfileList($profile);
$featured->show_list();
}
$profile->free();
common_pagination($page > 1, $cnt > PROFILES_PER_PAGE, $page, 'featured');
} }
} }