X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=bd1b8a7de3acdc9b015f59386e5a8c8d4736b4cd;hb=2c7518873eddafcd041fe73a509756155f35ac9a;hp=af0bcb8097c5ac0496106becc5199a7e21de136b;hpb=ae6ba61d433bbd7634adc734b277963c3d8522f3;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index af0bcb8097..bd1b8a7de3 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -30,7 +30,20 @@ class ShowstreamAction extends StreamAction { parent::handle($args); - $nickname = common_canonical_nickname($this->arg('nickname')); + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + + # Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url('showstream', $args), 301); + return; + } + $user = User::staticGet('nickname', $nickname); if (!$user) { @@ -58,13 +71,12 @@ class ShowstreamAction extends StreamAction { $this->show_profile($profile); - $this->show_notices($profile); + $this->show_notices($user); common_show_footer(); } function show_top($user) { - $cur = common_current_user(); if ($cur && $cur->id == $user->id) { @@ -72,14 +84,44 @@ class ShowstreamAction extends StreamAction { } $this->views_menu(); + + $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('nickname' => $user->nickname)), + 'type' => 'rss', + 'version' => 'RSS 1.0', + 'item' => 'notices'), + 1=>array('href'=>common_local_url('usertimeline', array('nickname' => $user->nickname)), + 'type' => 'atom', + 'version' => 'Atom 1.0', + 'item' => 'usertimeline'), + + 2=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)), + 'type' => 'rdf', + 'version' => 'FOAF', + 'item' => 'foaf'))); } function show_header($user) { + # Feeds + common_element('link', array('rel' => 'alternate', + 'href' => common_local_url('api', + array('apiaction' => 'statuses', + 'method' => 'user_timeline.rss', + 'argument' => $user->nickname)), + 'type' => 'application/rss+xml', + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); + common_element('link', array('rel' => 'alternate feed', + 'href' => common_local_url('api', + array('apiaction' => 'statuses', + 'method' => 'user_timeline.atom', + 'argument' => $user->nickname)), + 'type' => 'application/atom+xml', + 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); common_element('link', array('rel' => 'alternate', 'href' => common_local_url('userrss', array('nickname' => $user->nickname)), - 'type' => 'application/rss+xml', + 'type' => 'application/rdf+xml', 'title' => sprintf(_('Notice feed for %s'), $user->nickname))); + # FOAF common_element('link', array('rel' => 'meta', 'href' => common_local_url('foaf', array('nickname' => $user->nickname)), @@ -104,6 +146,11 @@ class ShowstreamAction extends StreamAction { 'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl)))); } + # See https://wiki.mozilla.org/Microsummaries + + common_element('link', array('rel' => 'microsummary', + 'href' => common_local_url('microsummary', + array('nickname' => $profile->nickname)))); } function no_such_user() { @@ -112,7 +159,7 @@ class ShowstreamAction extends StreamAction { function show_profile($profile) { - common_element_start('div', array('id' => 'profile')); + common_element_start('div', array('id' => 'profile', 'class' => 'vcard')); $this->show_personal($profile); @@ -130,51 +177,53 @@ class ShowstreamAction extends StreamAction { $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); common_element_start('div', array('id' => 'profile_avatar')); common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE), - 'class' => 'avatar profile', + 'class' => 'avatar profile photo', 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, 'alt' => $profile->nickname)); + + common_element_start('ul', array('id' => 'profile_actions')); + + common_element_start('li', array('id' => 'profile_subscribe')); $cur = common_current_user(); if ($cur) { if ($cur->id != $profile->id) { if ($cur->isSubscribed($profile)) { - $this->show_unsubscribe_form($profile); + common_unsubscribe_form($profile); } else { - $this->show_subscribe_form($profile); + common_subscribe_form($profile); } } } else { $this->show_remote_subscribe_link($profile); } - + common_element_end('li'); + $user = User::staticGet('id', $profile->id); - - if ($cur->id != $user->id && $cur->mutuallySubscribed($user)) { - common_element('a', array('href' => common_local_url('newmessage', array('nickname' => $user->nickname))), - _('Send a message')); - } - + common_profile_new_message_nudge($cur, $user, $profile); + + common_element_end('ul'); + common_element_end('div'); common_element_start('div', array('id' => 'profile_information')); if ($profile->fullname) { - common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')'); + common_element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')'); } else { - common_element('h1', NULL, $profile->nickname); + common_element('h1', array('class' => 'fn nickname'), $profile->nickname); } - if ($profile->location) { common_element('p', 'location', $profile->location); } if ($profile->bio) { - common_element('p', 'description', $profile->bio); + common_element('p', 'description note', $profile->bio); } if ($profile->homepage) { common_element_start('p', 'website'); common_element('a', array('href' => $profile->homepage, - 'rel' => 'me'), + 'rel' => 'me', 'class' => 'url'), $profile->homepage); common_element_end('p'); } @@ -184,20 +233,6 @@ class ShowstreamAction extends StreamAction { common_element_end('div'); } - function show_subscribe_form($profile) { - common_element_start('form', array('id' => 'subscribe', 'method' => 'post', - 'action' => common_local_url('subscribe'))); - common_hidden('token', common_session_token()); - common_element('input', array('id' => 'subscribeto', - 'name' => 'subscribeto', - 'type' => 'hidden', - 'value' => $profile->nickname)); - common_element('input', array('type' => 'submit', - 'class' => 'submit', - 'value' => _('Subscribe'))); - common_element_end('form'); - } - function show_remote_subscribe_link($profile) { $url = common_local_url('remotesubscribe', array('nickname' => $profile->nickname)); @@ -226,7 +261,7 @@ class ShowstreamAction extends StreamAction { $subs = DB_DataObject::factory('subscription'); $subs->subscriber = $profile->id; $subs->whereAdd('subscribed != ' . $profile->id); - + $subs->orderBy('created DESC'); # We ask for an extra one to know if we need to do another page @@ -252,18 +287,23 @@ class ShowstreamAction extends StreamAction { $other = Profile::staticGet($subs->subscribed); - common_element_start('li'); + if (!$other) { + common_log_db_error($subs, 'SELECT', __FILE__); + continue; + } + + common_element_start('li', 'vcard'); common_element_start('a', array('title' => ($other->fullname) ? $other->fullname : $other->nickname, 'href' => $other->profileurl, 'rel' => 'contact', - 'class' => 'subscription')); + 'class' => 'subscription fn url')); $avatar = $other->getAvatar(AVATAR_MINI_SIZE); common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, - 'class' => 'avatar mini', + 'class' => 'avatar mini photo', 'alt' => ($other->fullname) ? $other->fullname : $other->nickname)); @@ -325,40 +365,53 @@ class ShowstreamAction extends StreamAction { common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0'); common_element('dt', 'notices', _('Notices')); common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0'); + # XXX: link these to something + common_element('dt', 'tags', _('Tags')); + common_element_start('dd', 'tags'); + $tags = Profile_tag::getTags($profile->id, $profile->id); + + common_element_start('ul', 'tags xoxo'); + foreach ($tags as $tag) { + common_element_start('li'); + common_element('a', array('rel' => 'bookmark tag', + 'href' => common_local_url('peopletag', + array('tag' => $tag))), + $tag); + common_element_end('li'); + } + common_element_end('ul'); + common_element_end('dd'); + common_element_end('dl'); common_element_end('div'); } - function show_notices($profile) { - - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - - $notice->orderBy('created DESC, notice.id DESC'); + function show_notices($user) { $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); + $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + $cnt = 0; - $cnt = $notice->find(); + if ($notice) { - if ($cnt > 0) { 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, - 'showstream', array('nickname' => $profile->nickname)); + 'showstream', array('nickname' => $user->nickname)); } function show_last_notice($profile) { @@ -387,11 +440,18 @@ class ShowstreamAction extends StreamAction { $user = common_current_user(); # XXX: RDFa - common_element_start('li', array('class' => 'notice_single', + common_element_start('li', array('class' => 'notice_single hentry', 'id' => 'notice-' . $notice->id)); + if ($user) { + if ($user->hasFave($notice)) { + common_disfavor_form($notice); + } else { + common_favor_form($notice); + } + } $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); # FIXME: URL, image, video, audio - common_element_start('p'); + common_element_start('p', 'entry-title'); if ($notice->rendered) { common_raw($notice->rendered); } else { @@ -402,10 +462,14 @@ class ShowstreamAction extends StreamAction { } common_element_end('p'); common_element_start('p', array('class' => 'time')); - common_element('a', array('class' => 'permalink', - 'href' => $noticeurl, - 'title' => common_exact_date($notice->created)), - common_date_string($notice->created)); + common_element_start('a', array('class' => 'permalink', + 'rel' => 'bookmark', + 'href' => $noticeurl)); + common_element('abbr', array('class' => 'published', + 'title' => common_date_iso8601($notice->created)), + common_date_string($notice->created)); + common_element_end('a'); + if ($notice->source) { common_text(_(' from ')); $this->source_link($notice->source); @@ -434,7 +498,8 @@ class ShowstreamAction extends StreamAction { common_raw('×'); common_element_end('a'); } + common_element_end('p'); common_element_end('li'); } -} \ No newline at end of file +}