diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
index a7c5c68153..cdff189633 100644
--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
@@ -1,45 +1,44 @@
 <?php
 
 final class PhabricatorChatLogChannelListController
   extends PhabricatorChatLogController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
 
     $channels = id(new PhabricatorChatLogChannelQuery())
-      ->setViewer($user)
+      ->setViewer($viewer)
       ->execute();
 
     $list = new PHUIObjectItemListView();
     foreach ($channels as $channel) {
         $item = id(new PHUIObjectItemView())
           ->setHeader($channel->getChannelName())
           ->setHref('/chatlog/channel/'.$channel->getID().'/')
           ->addAttribute($channel->getServiceName())
           ->addAttribute($channel->getServiceType());
         $list->addItem($item);
     }
 
     $crumbs = $this
       ->buildApplicationCrumbs()
       ->addTextCrumb(pht('Channel List'), $this->getApplicationURI());
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText('Channel List')
       ->setObjectList($list);
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
       ),
       array(
         'title' => pht('Channel List'),
       ));
   }
 }
diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
index 4281adf421..8084356ced 100644
--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
@@ -1,330 +1,324 @@
 <?php
 
 final class PhabricatorChatLogChannelLogController
   extends PhabricatorChatLogController {
 
-  private $channelID;
-
   public function shouldAllowPublic() {
     return true;
   }
 
-  public function willProcessRequest(array $data) {
-    $this->channelID = $data['channelID'];
-  }
-
-  public function processRequest() {
-    $request = $this->getRequest();
-    $user = $request->getUser();
+  public function handleRequest(AphrontRequest $request) {
+    $viewer = $request->getViewer();
+    $id = $request->getURIData('channelID');
 
     $uri = clone $request->getRequestURI();
     $uri->setQueryParams(array());
 
     $pager = new AphrontCursorPagerView();
     $pager->setURI($uri);
     $pager->setPageSize(250);
 
     $query = id(new PhabricatorChatLogQuery())
-      ->setViewer($user)
-      ->withChannelIDs(array($this->channelID));
+      ->setViewer($viewer)
+      ->withChannelIDs(array($id));
 
     $channel = id(new PhabricatorChatLogChannelQuery())
-      ->setViewer($user)
-      ->withIDs(array($this->channelID))
+      ->setViewer($viewer)
+      ->withIDs(array($id))
       ->executeOne();
 
     if (!$channel) {
       return new Aphront404Response();
     }
 
     list($after, $before, $map) = $this->getPagingParameters($request, $query);
 
     $pager->setAfterID($after);
     $pager->setBeforeID($before);
 
     $logs = $query->executeWithCursorPager($pager);
 
     // Show chat logs oldest-first.
     $logs = array_reverse($logs);
 
 
     // Divide all the logs into blocks, where a block is the same author saying
     // several things in a row. A block ends when another user speaks, or when
     // two minutes pass without the author speaking.
 
     $blocks = array();
     $block = null;
 
     $last_author = null;
     $last_epoch = null;
     foreach ($logs as $log) {
       $this_author = $log->getAuthor();
       $this_epoch  = $log->getEpoch();
 
       // Decide whether we should start a new block or not.
       $new_block = ($this_author !== $last_author) ||
                    ($this_epoch - (60 * 2) > $last_epoch);
 
       if ($new_block) {
         if ($block) {
           $blocks[] = $block;
         }
         $block = array(
           'id'      => $log->getID(),
           'epoch'   => $this_epoch,
           'author'  => $this_author,
           'logs'    => array($log),
         );
       } else {
         $block['logs'][] = $log;
       }
 
       $last_author = $this_author;
       $last_epoch = $this_epoch;
     }
     if ($block) {
       $blocks[] = $block;
     }
 
     // Figure out CSS classes for the blocks. We alternate colors between
     // lines, and highlight the entire block which contains the target ID or
     // date, if applicable.
 
     foreach ($blocks as $key => $block) {
       $classes = array();
       if ($key % 2) {
         $classes[] = 'alternate';
       }
       $ids = mpull($block['logs'], 'getID', 'getID');
       if (array_intersect_key($ids, $map)) {
         $classes[] = 'highlight';
       }
       $blocks[$key]['class'] = $classes ? implode(' ', $classes) : null;
     }
 
 
     require_celerity_resource('phabricator-chatlog-css');
 
     $out = array();
     foreach ($blocks as $block) {
       $author = $block['author'];
       $author = id(new PhutilUTF8StringTruncator())
         ->setMaximumGlyphs(18)
         ->truncateString($author);
       $author = phutil_tag('td', array('class' => 'author'), $author);
 
       $href = $uri->alter('at', $block['id']);
       $timestamp = $block['epoch'];
-      $timestamp = phabricator_datetime($timestamp, $user);
+      $timestamp = phabricator_datetime($timestamp, $viewer);
       $timestamp = phutil_tag(
         'a',
           array(
             'href' => $href,
             'class' => 'timestamp',
           ),
         $timestamp);
 
       $message = mpull($block['logs'], 'getMessage');
       $message = implode("\n", $message);
       $message = phutil_tag(
         'td',
           array(
             'class' => 'message',
           ),
           array(
             $timestamp,
             $message,
           ));
 
       $out[] = phutil_tag(
         'tr',
         array(
           'class' => $block['class'],
         ),
         array(
           $author,
           $message,
         ));
     }
 
     $links = array();
 
     $first_uri = $pager->getFirstPageURI();
     if ($first_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $first_uri,
         ),
         "\xC2\xAB ".pht('Newest'));
     }
 
     $prev_uri = $pager->getPrevPageURI();
     if ($prev_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $prev_uri,
         ),
         "\xE2\x80\xB9 ".pht('Newer'));
     }
 
     $next_uri = $pager->getNextPageURI();
     if ($next_uri) {
       $links[] = phutil_tag(
         'a',
         array(
           'href' => $next_uri,
         ),
         pht('Older')." \xE2\x80\xBA");
     }
 
     $pager_bottom = phutil_tag(
       'div',
       array('class' => 'phabricator-chat-log-pager-bottom'),
       $links);
 
     $crumbs = $this
       ->buildApplicationCrumbs()
       ->addTextCrumb($channel->getChannelName(), $uri);
 
     $form = id(new AphrontFormView())
-      ->setUser($user)
+      ->setUser($viewer)
       ->setMethod('GET')
       ->setAction($uri)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Date'))
           ->setName('date')
           ->setValue($request->getStr('date')))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Jump')));
 
     $table = phutil_tag(
       'table',
         array(
           'class' => 'phabricator-chat-log',
         ),
       $out);
 
     $log = phutil_tag(
       'div',
         array(
           'class' => 'phabricator-chat-log-panel',
         ),
         $table);
 
     $jump_link = id(new PHUIButtonView())
       ->setTag('a')
       ->setHref('#latest')
       ->setText(pht('Jump to Bottom'))
       ->setIconFont('fa-arrow-circle-down');
 
     $jump_target = phutil_tag(
       'div',
         array(
           'id' => 'latest',
         ));
 
     $content = phutil_tag(
       'div',
         array(
           'class' => 'phabricator-chat-log-wrap',
         ),
         array(
           $log,
           $jump_target,
           $pager_bottom,
         ));
 
     $header = id(new PHUIHeaderView())
       ->setHeader($channel->getChannelName())
       ->setSubHeader($channel->getServiceName())
       ->addActionLink($jump_link);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
       ->setCollapsed(true)
       ->appendChild($content);
 
     $box->setShowHide(
       pht('Search Dates'),
       pht('Hide Dates'),
       $form,
       '#');
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
       ),
       array(
         'title' => pht('Channel Log'),
       ));
   }
 
   /**
    * From request parameters, figure out where we should jump to in the log.
    * We jump to either a date or log ID, but load a few lines of context before
    * it so the user can see the nearby conversation.
    */
   private function getPagingParameters(
     AphrontRequest $request,
     PhabricatorChatLogQuery $query) {
 
-    $user = $request->getUser();
+    $viewer = $request->getViewer();
 
     $at_id = $request->getInt('at');
     $at_date = $request->getStr('date');
 
     $context_log = null;
     $map = array();
 
     $query = clone $query;
     $query->setLimit(8);
 
     if ($at_id) {
       // Jump to the log in question, and load a few lines of context before
       // it.
       $context_logs = $query
         ->setAfterID($at_id)
         ->execute();
 
       $context_log = last($context_logs);
 
       $map = array(
         $at_id => true,
       );
 
     } else if ($at_date) {
-      $timestamp = PhabricatorTime::parseLocalTime($at_date, $user);
+      $timestamp = PhabricatorTime::parseLocalTime($at_date, $viewer);
 
       if ($timestamp) {
         $context_logs = $query
           ->withMaximumEpoch($timestamp)
           ->execute();
 
         $context_log = last($context_logs);
 
         $target_log = head($context_logs);
         if ($target_log) {
           $map = array(
             $target_log->getID() => true,
           );
         }
       }
     }
 
     if ($context_log) {
       $after = null;
       $before = $context_log->getID() - 1;
     } else {
       $after = $request->getInt('after');
       $before = $request->getInt('before');
     }
 
     return array($after, $before, $map);
   }
 
 }