X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=031b3ec84f4c7f26d16a671648136a5c1232ddd2;hb=c3f2d195f934c4deff91d30640ec703cb576e55d;hp=59d4385c6d261440e8f97ff5e0f13b6dfdc0e7f1;hpb=faa3933fbb54d0fc4a12145bd0aefa899db30dea;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 59d4385c6d..031b3ec84f 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -58,13 +58,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 +71,47 @@ 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)), @@ -94,10 +126,25 @@ class ShowstreamAction extends StreamAction { common_element('meta', array('name' => 'description', 'content' => $profile->bio)); } + + if ($user->emailmicroid && $user->email && $profile->profileurl) { + common_element('meta', array('name' => 'microid', + 'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl)))); + } + if ($user->jabbermicroid && $user->jabber && $profile->profileurl) { + common_element('meta', array('name' => 'microid', + '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() { - common_user_error(_('No such user.')); + $this->client_error(_('No such user.'), 404); } function show_profile($profile) { @@ -124,18 +171,29 @@ class ShowstreamAction extends StreamAction { '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); + common_profile_new_message_nudge($cur, $user, $profile); + + common_element_end('ul'); + common_element_end('div'); common_element_start('div', array('id' => 'profile_information')); @@ -166,19 +224,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_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)); @@ -190,6 +235,7 @@ class ShowstreamAction extends StreamAction { function show_unsubscribe_form($profile) { common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post', 'action' => common_local_url('unsubscribe'))); + common_hidden('token', common_session_token()); common_element('input', array('id' => 'unsubscribeto', 'name' => 'unsubscribeto', 'type' => 'hidden', @@ -232,11 +278,17 @@ class ShowstreamAction extends StreamAction { $other = Profile::staticGet($subs->subscribed); + if (!$other) { + common_log_db_error($subs, 'SELECT', __FILE__); + continue; + } + common_element_start('li'); common_element_start('a', array('title' => ($other->fullname) ? $other->fullname : $other->nickname, 'href' => $other->profileurl, + 'rel' => 'contact', 'class' => 'subscription')); $avatar = $other->getAvatar(AVATAR_MINI_SIZE); common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)), @@ -304,40 +356,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); - - $cnt = $notice->find(); + $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + $cnt = 0; - if ($cnt > 0) { + if ($notice) { + 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) { @@ -363,13 +428,18 @@ class ShowstreamAction extends StreamAction { function show_notice($notice) { $profile = $notice->getProfile(); - if (common_logged_in()) { - $user = common_current_user(); - $user_profile = $user->getProfile(); - } + $user = common_current_user(); + # XXX: RDFa common_element_start('li', array('class' => 'notice_single', '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'); @@ -387,6 +457,10 @@ class ShowstreamAction extends StreamAction { 'href' => $noticeurl, 'title' => common_exact_date($notice->created)), common_date_string($notice->created)); + if ($notice->source) { + common_text(_(' from ')); + $this->source_link($notice->source); + } if ($notice->reply_to) { $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); common_text(' ('); @@ -403,13 +477,16 @@ class ShowstreamAction extends StreamAction { 'class' => 'replybutton')); common_raw('→'); common_element_end('a'); + if ($user && $notice->profile_id == $user->id) { + $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); + common_element_start('a', array('class' => 'deletenotice', + 'href' => $deleteurl, + 'title' => _('delete'))); + common_raw('×'); + common_element_end('a'); + } + common_element_end('p'); - if ($notice->profile_id == $user_profile->id) { - $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); - common_element('a', array('class' => 'deletenotice', - 'href' => $deleteurl), - _('delete')); - } common_element_end('li'); } -} \ No newline at end of file +}