From f0a30cc89ddf82e3c774800d24f0ea3664065d9c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 8 May 2008 22:16:04 -0400 Subject: [PATCH] read-only stuff darcs-hash:20080509021604-84dde-f785fc09dd435fc12741b3a75184e2425721d03d.gz --- URLS.txt | 6 +- action.php | 21 ++++ actions/all.php | 32 ++++++ actions/public.php | 39 ++++++++ actions/shownotice.php | 45 +++++++++ actions/showstream.php | 199 ++++++++++++++++++++++++++++++++------ actions/subscribed.php | 80 +++++++++++++++ actions/subscriptions.php | 77 +++++++++++++++ classes/Notice.php | 10 ++ common.php | 46 +++++++++ stream.php | 25 +++++ 11 files changed, 546 insertions(+), 34 deletions(-) create mode 100644 action.php create mode 100644 actions/all.php create mode 100644 actions/public.php create mode 100644 actions/shownotice.php create mode 100644 actions/subscribed.php create mode 100644 actions/subscriptions.php create mode 100644 stream.php diff --git a/URLS.txt b/URLS.txt index 1c2f85b5f6..b544bd0369 100644 --- a/URLS.txt +++ b/URLS.txt @@ -2,10 +2,10 @@ /public public stream / profile and update feed -/?page=2 update feed +/?page=2 profile and update feed // individual notice -//subscriptions people subscribed to -//subscribed people subscribing +//subscriptions people user subscribes to +//subscribed people subscribing to user //avatar avatar //all self and friends diff --git a/action.php b/action.php new file mode 100644 index 0000000000..539077bc3f --- /dev/null +++ b/action.php @@ -0,0 +1,21 @@ +args, $key)) { + return $this->args[$key]; + } else { + return NULL; + } + } + + function handle($args) { + $this->args = copy($argarray); + } +} diff --git a/actions/all.php b/actions/all.php new file mode 100644 index 0000000000..fa1be8c962 --- /dev/null +++ b/actions/all.php @@ -0,0 +1,32 @@ +whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = {$profile->id})', 'OR'); + $notice->whereAdd('profile_id = {$profile->id}', 'OR'); + + $notice->orderBy('created DESC'); + + $page = $this->arg('page') || 1; + + $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE); + + $notice->find(); + + common_start_element('div', 'notices'); + + while ($notice->fetch()) { + $this->show_notice($notice); + } + + common_end_element('div'); + } +} diff --git a/actions/public.php b/actions/public.php new file mode 100644 index 0000000000..e52ec12dec --- /dev/null +++ b/actions/public.php @@ -0,0 +1,39 @@ +arg('page') || 1; + + common_show_header(_t('Public timeline')); + + # XXX: Public sidebar here? + + $this->show_notices($page); + + common_show_footer(); + } + + function show_notices($page) { + + $notice = DB_DataObject::factory('notice'); + + # XXX: filter out private notifications + + $notice->orderBy('created DESC'); + $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE); + + $notice->find(); + + common_start_element('div', 'notices'); + + while ($notice->fetch()) { + $this->show_notice($notice); + } + + common_end_element('div'); + } +} + diff --git a/actions/shownotice.php b/actions/shownotice.php new file mode 100644 index 0000000000..4d4876122c --- /dev/null +++ b/actions/shownotice.php @@ -0,0 +1,45 @@ +arg('notice'); + $notice = Notice::staticGet($id); + + if (!$notice) { + $this->no_such_notice(); + } + + if (!$notice->getProfile()) { + $this->no_such_notice(); + } + + # Looks like we're good; show the header + + common_show_header($profile->nickname); + + $this->show_notice($notice); + + common_show_footer(); + } + + function no_such_notice() { + common_user_error('No such notice.'); + } + + function show_notice($notice) { + $profile = $notice->getProfile(); + # XXX: RDFa + common_start_element('div', array('class' => 'notice')); + # FIXME: add the avatar + common_start_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('span', array('class' => 'date'), + common_date_string($notice->created)); + common_end_element('div'); + } +} diff --git a/actions/showstream.php b/actions/showstream.php index d3352e77d8..1eb060fdc9 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -1,45 +1,182 @@ arg('profile'); + $profile = Profile::staticGet('nickname', strtolower($nickname)); - if (!$profile) { - showstream_no_such_user(); - } + if (!$profile) { + $this->no_such_user(); + } + + $user = User::staticGet($profile->id); + + if (!$user) { + // remote profile + $this->no_such_user(); + } + + # Looks like we're good; show the header + + common_show_header($profile->nickname); + + if ($profile->id == current_user()->id) { + $this->notice_form(); + } - $user = User::staticGet($profile->id); + $this->show_profile($profile); - if (!$user) { - // remote profile - showstream_no_such_user(); + $this->show_last_notice($profile); + + $this->show_statistics($profile); + + $this->show_subscriptions($profile); + + $this->show_notices($profile); + + common_show_footer(); } - - if ($profile->id == current_user()->id) { - showstream_notice_form(); + + function no_such_user() { + common_user_error('No such user'); } - showstream_show_profile($profile); - - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - $notice->limit(1, 10); + function notice_form() { + common_start_element('form', array('id' => 'newnotice', 'method' => 'POST', + 'action' => common_local_url('newnotice'))); + common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content')); + common_element('input', array('type' => 'submit'), 'Send'); + common_end_element('form'); + } - $notice->find(); + function show_profile($profile) { + common_start_element('div', 'profile'); + common_element('span', 'nickname', $profile->nickname); + if ($profile->fullname) { + if ($profile->homepage) { + common_element('a', array('href' => $profile->homepage, + 'class' => 'fullname'), + $profile->fullname); + } else { + common_element('span', 'fullname', $profile->fullname); + } + } + if ($profile->location) { + common_element('span', 'location', $profile->location); + } + if ($profile->bio) { + common_element('div', 'bio', $profile->bio); + } + } - while ($notice->fetch()) { - showstream_show_notice($notice); + function show_subscriptions($profile) { + + # XXX: add a limit + + $subs = $profile->getLink('id', 'subscription', 'subscriber'); + + common_start_element('div', 'subscriptions'); + + $cnt = 0; + + while ($subs->fetch()) { + $cnt++; + if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { + common_start_element('div', 'row'); + } + + common_start_element('a', array('title' => $subs->fullname || + $subs->nickname, + 'href' => $subs->profileurl, + 'class' => 'subscription')); + common_element('img', array('src' => $subs->avatar, + 'class' => 'avatar')); + common_end_element('a'); + + if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { + common_end_element('div'); + } + + if ($cnt == SUBSCRIPTIONS) { + break; + } + } + + common_element('a', array('href' => common_local_url('subscriptions', + array('profile' => $profile->nickname)) + 'class' => 'moresubscriptions'), + _t('All subscriptions')); + + common_end_element('div'); } -} -function showstream_no_such_user() { - common_user_error('No such user'); -} + function show_statistics($profile) { -function showstream_notice_form() { - // print notice form -} + // XXX: WORM cache this + $subs = DB_DataObject::factory('subscription'); + $subs->subscriber = $profile->id; + $subs_count = $subs->count(); + + $subbed = DB_DataObject::factory('subscription'); + $subbed->subscribed = $profile->id; + $subbed_count = $subbed->count(); + + $notices = DB_DataObject::factory('notice'); + $notice->profile_id = $profile->id; + $notice_count = $notice->count(); + + # Other stats...? + common_start_element('dl', 'statistics'); + common_element('dt', _t('Subscriptions')); + common_element('dd', $subs_count); + common_element('dt', _t('Subscribers')); + common_element('dd', $subbed_count); + common_element('dt', _t('Notices')); + common_element('dd', $notice_count); + common_end_element('dl'); + } + + function show_notices($profile) { -function showstream_show_profile($profile) { -} \ No newline at end of file + $notice = DB_DataObject::factory('notice'); + $notice->profile_id = $profile->id; + + $notice->orderBy('created DESC'); + + $page = $this->arg('page') || 1; + + $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE); + + $notice->find(); + + common_start_element('div', 'notices'); + + while ($notice->fetch()) { + $this->show_notice($notice); + } + + common_end_element('div'); + } + + function show_last_notice($profile) { + $notice = DB_DataObject::factory('notice'); + $notice->profile_id = $profile->id; + $notice->orderBy('created DESC'); + $notice->limit(1, 1); + $notice->find(); + + while ($notice->fetch()) { + # FIXME: URL, image, video, audio + common_element('span', array('class' => 'content'), $notice->content); + common_element('span', array('class' => 'date'), + common_date_string($notice->created)); + } + } +} diff --git a/actions/subscribed.php b/actions/subscribed.php new file mode 100644 index 0000000000..6ba452eb92 --- /dev/null +++ b/actions/subscribed.php @@ -0,0 +1,80 @@ +arg('nickname'); + $profile = Profile::staticGet('nickname', $nickname); + if (!$profile) { + $this->no_such_user(); + } + $user = User::staticGet($profile->id); + if (!$user) { + $this->no_such_user(); + } + + $page = $this->arg('page') || 1; + $this->show_subscribed($profile, $page); + } + + function show_subscribed($profile, $page) { + + $sub = DB_DataObject::factory('subscriptions'); + $sub->subscribed = $profile->id; + + # We ask for an extra one to know if we need to do another page + + $sub->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE)+1, SUBSCRIPTIONS_PER_PAGE + 1); + + $subs_count = $subs->find(); + + common_start_element('div', 'subscriptions'); + + $idx = 0; + + while ($subs->fetch()) { + $idx++; + if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { + common_start_element('div', 'row'); + } + + common_start_element('a', array('title' => $subs->fullname || + $subs->nickname, + 'href' => $subs->profileurl, + 'class' => 'subscription')); + common_element('img', array('src' => $subs->avatar, + 'class' => 'avatar')); + common_end_element('a'); + + if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { + common_end_element('div'); + } + + if ($idx == SUBSCRIPTIONS_PER_PAGE) { + break; + } + } + + if ($page > 1) { + common_element('a', array('href' => + common_local_url('subscriptions', + array('nickname' => $profile->nickname, + 'page' => $page - 1)), + 'class' => 'prev'), + _t('Previous')); + } + + if ($subs_count > SUBSCRIPTIONS_PER_PAGE) { + common_element('a', array('href' => + common_local_url('subscriptions', + array('nickname' => $profile->nickname, + 'page' => $page + 1)), + 'class' => 'next'), + _t('Next')); + } + common_end_element('div'); + } +} \ No newline at end of file diff --git a/actions/subscriptions.php b/actions/subscriptions.php new file mode 100644 index 0000000000..88e12f5d56 --- /dev/null +++ b/actions/subscriptions.php @@ -0,0 +1,77 @@ +arg('nickname'); + $profile = Profile::staticGet('nickname', $nickname); + if (!$profile) { + $this->no_such_user(); + } + $user = User::staticGet($profile->id); + if (!$user) { + $this->no_such_user(); + } + $page = $this->arg('page') || 1; + $this->show_subscriptions($profile, $page); + } + + function show_subscriptions($profile, $page) { + + $sub = DB_DataObject::factory('subscriptions'); + $sub->subscriber = $profile->id; + + # We ask for an extra one to know if we need to do another page + + $sub->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE)+1, SUBSCRIPTIONS_PER_PAGE + 1); + + $subs_count = $subs->find(); + + common_start_element('div', 'subscriptions'); + + $idx = 0; + + while ($subs->fetch()) { + $idx++; + if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { + common_start_element('div', 'row'); + } + + common_start_element('a', array('title' => $subs->fullname || + $subs->nickname, + 'href' => $subs->profileurl, + 'class' => 'subscription')); + common_element('img', array('src' => $subs->avatar, + 'class' => 'avatar')); + common_end_element('a'); + + if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { + common_end_element('div'); + } + + if ($idx == SUBSCRIPTIONS_PER_PAGE) { + break; + } + } + + if ($page > 1) { + common_element('a', array('href' => + common_local_url('subscriptions', + array('nickname' => $profile->nickname, + 'page' => $page - 1)), + 'class' => 'prev'), + _t('Previous')); + } + + if ($subs_count > SUBSCRIPTIONS_PER_PAGE) { + common_element('a', array('href' => + common_local_url('subscriptions', + array('nickname' => $profile->nickname, + 'page' => $page + 1)), + 'class' => 'next'), + _t('Next')); + } + common_end_element('div'); + } +} \ No newline at end of file diff --git a/classes/Notice.php b/classes/Notice.php index 6fe2f67556..f990675fba 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -23,4 +23,14 @@ class Notice extends DB_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + // XXX: if profile_id changes, this goes invalid. To be fair, that's a very edge case + static $profile; + + function getProfile() { + if (!$this->profile) { + $this->profile = Profile::staticGet($this->profile_id); + } + return $this->profile; + } } diff --git a/common.php b/common.php index 499eafe479..a6061920d4 100644 --- a/common.php +++ b/common.php @@ -42,3 +42,49 @@ function common_server_error($msg) { print $msg; exit(); } + +function common_user_error($msg) { + common_show_header('Error'); + common_element('div', array('class' => 'error'), $msg); + common_show_footer(); +} + +function common_element_start($tag, $attrs=NULL) { + print "<$tag"; + if (is_array($attrs)) { + foreach ($attrs as $name => $value) { + print " $name='$value'"; + } + } else if (is_string($attrs)) { + print " class='$attrs'"; + } + print '>'; +} + +function common_element_end($tag) { + print ""; +} + +function common_element($tag, $attrs=NULL, $content=NULL) { + common_element_start($tag, $attrs); + if ($content) print $content; + common_element_end($tag); +} + +function common_show_header($pagetitle) { + global $config; + common_element_start('html'); + common_element_start('head'); + common_element('title', NULL, $pagetitle . " - " . $config['site']['name']); + common_element_end('head'); + common_element_start('body'); +} + +function common_show_footer() { + common_element_end('body'); + common_element_end('html'); +} + +// TODO: set up gettext + +function _t($str) { $str } diff --git a/stream.php b/stream.php new file mode 100644 index 0000000000..d30ee013c4 --- /dev/null +++ b/stream.php @@ -0,0 +1,25 @@ +getProfile(); + # XXX: RDFa + common_start_element('div', array('class' => 'notice')); + # FIXME: add the avatar + common_start_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('span', array('class' => 'date'), + common_date_string($notice->created)); + common_end_element('div'); + } +} -- 2.39.5