diff options
| -rw-r--r-- | actions/tag.php | 38 | ||||
| -rw-r--r-- | actions/twitapistatuses.php | 27 |
2 files changed, 17 insertions, 48 deletions
diff --git a/actions/tag.php b/actions/tag.php index 132d76517..8a3b8eaeb 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -109,43 +109,17 @@ class TagAction extends StreamAction { $tw[$tags->tag] = $tags->weight; $sum += $tags->weight; } - common_element_end('ul'); - } - common_pagination($page > 1, $cnt > TAGS_PER_PAGE, - $page, 'tags'); - } + foreach ($tw as $tag => $weight) { + $this->show_tag($tag, $weight, $weight/$sum); + } - private static function show_tag($tag) { - common_element_start('li', array('class' => 'notice_single')); - common_element_start('a', array( - 'class' => 'nickname', - 'href' => common_local_url('tag', array('tag' => $tag->tag)), - 'title' => sprintf(_("Notices tagged with %s"), $tag->tag))); - common_text('#' . $tag->tag); - common_element_end('a'); - common_text(sprintf(_('%s Notices recently tagged with %s'), $tag->num, $tag->tag)); - - $notice = Notice::staticGet($tag->last_notice_id); - if ($notice) { - $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); - common_element_start('p', 'time'); - common_text(_('Last message posted: ')); - common_element('a', array('class' => 'permalink', - 'href' => $noticeurl, - 'title' => common_exact_date($notice->created)), - common_date_string($notice->created)); - - common_text(_(' by ')); - $profile = $notice->getProfile(); - common_element('a', array('href' => $profile->profileurl), - $profile->nickname); common_element_end('p'); } } function show_tag($tag, $weight, $relative) { - + # XXX: these should probably tune to the size of the site if ($relative > 0.1) { $cls = 'largest'; @@ -162,13 +136,13 @@ class TagAction extends StreamAction { } else { $cls = 'smallest'; } - + common_element('a', array('class' => "$cls weight-$weight relative-$relative", 'href' => common_local_url('tag', array('tag' => $tag))), $tag); common_text(' '); } - + function show_notices($tag) { $tags = DB_DataObject::factory('Notice_tag'); diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index b7d4c7e7e..b2bbb16f0 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -371,21 +371,19 @@ class TwitapistatusesAction extends TwitterapiAction { } function update($args, $apidata) { - + parent::handle($args); $user = $apidata['user']; - - $this->is_readonly(); - - - $notice = DB_DataObject::factory('notice'); - - $notice->profile_id = $user->id; # user id *is* profile id - $notice->created = DB_DataObject_Cast::dateTime(); - $notice->content = $this->trimmed('status'); - - if (!$notice->content) { + + $status = $this->trimmed('status'); + $source = $this->trimmed('source'); + + if (!$source) { + $source = 'api'; + } + + if (!$status) { // XXX: Note: In this case, Twitter simply returns '200 OK' // No error is given, but the status is not posted to the @@ -404,9 +402,6 @@ class TwitapistatusesAction extends TwitterapiAction { exit(); } - $notice->rendered = common_render_content($notice->content, $notice); - $notice->is_local = 1; - $notice = Notice::saveNew($user->id, $status, $source); if (is_string($notice)) { @@ -415,7 +410,7 @@ class TwitapistatusesAction extends TwitterapiAction { } common_broadcast_notice($notice); - + // FIXME: Bad Hack // I should be able to just sent this notice off for display, // but $notice->created does not contain a string at this |