No OneTemporary
Actions

Size

10 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
	index 5c5a813288..5c873ac414 100644
	--- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
	+++ b/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
	@@ -1,41 +1,41 @@
	<?php

	final class PhabricatorApplicationChatLog extends PhabricatorApplication {

	public function getBaseURI() {
	return '/chatlog/';
	}

	public function getShortDescription() {
	- return 'Chat Log';
	+ return pht('Chat Log');
	}

	public function getIconName() {
	return 'chatlog';
	}

	public function isBeta() {
	return true;
	}

	public function getTitleGlyph() {
	return "\xE0\xBC\x84";
	}

	public function getApplicationGroup() {
	return self::GROUP_COMMUNICATION;
	}

	public function getRoutes() {
	return array(
	'/chatlog/' => array(
	'' => 'PhabricatorChatLogChannelListController',
	'channel/(?P<channelID>[^/]+)/' =>
	'PhabricatorChatLogChannelLogController',
	),

	);
	}

	}

	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
	index 5db5cd0bee..a33cdd6450 100644
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
	@@ -1,68 +1,68 @@
	<?php

	final class PhabricatorChatLogChannelListController
	extends PhabricatorChatLogController {

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$channels = id(new PhabricatorChatLogChannelQuery())
	->setViewer($user)
	->execute();

	$rows = array();
	foreach ($channels as $channel) {
	$rows[] = array(
	phutil_tag(
	'a',
	array(
	'href' =>
	'/chatlog/channel/'.$channel->getID().'/',
	),
	$channel->getChannelName()),
	$channel->getServiceName(),
	$channel->getServiceType());
	}

	$table = new AphrontTableView($rows);
	$table->setHeaders(
	array(
	- 'Channel',
	- 'Service Name',
	- 'Service Type',
	+ pht('Channel'),
	+ pht('Service Name'),
	+ pht('Service Type'),
	));
	$table->setColumnClasses(
	array(
	'',
	'',
	'',
	));

	$title = pht('Channel List');

	$header = id(new PhabricatorHeaderView())
	->setHeader($title);

	$panel = id(new AphrontPanelView())
	->appendChild($table)
	->setNoBackground(true);

	$crumbs = $this
	->buildApplicationCrumbs()
	->addCrumb(
	id(new PhabricatorCrumbView())
	->setName(pht('Channel List'))
	->setHref($this->getApplicationURI()));

	return $this->buildStandardPageResponse(
	array(
	$crumbs,
	$header,
	$panel,
	),
	array(
	- 'title' => 'Channel List',
	+ 'title' => pht('Channel List'),
	));
	}
	}
	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	index 1e98428f96..5629f88029 100644
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	@@ -1,237 +1,237 @@
	<?php

	final class PhabricatorChatLogChannelLogController
	extends PhabricatorChatLogController {

	private $channelID;

	public function willProcessRequest(array $data) {
	$this->channelID = $data['channelID'];
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$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));

	$channel = id(new PhabricatorChatLogChannelQuery())
	->setViewer($user)
	->withIDs(array($this->channelID))
	->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 = phutil_utf8_shorten($author, 18);
	$author = phutil_tag('td', array('class' => 'author'), $author);

	$message = mpull($block['logs'], 'getMessage');
	$message = implode("\n", $message);
	$message = phutil_tag('td', array('class' => 'message'), $message);

	$href = $uri->alter('at', $block['id']);
	$timestamp = $block['epoch'];
	$timestamp = phabricator_datetime($timestamp, $user);
	$timestamp = phutil_tag('a', array('href' => $href), $timestamp);
	$timestamp = phutil_tag(
	'td',
	array(
	'class' => 'timestamp',
	),
	$timestamp);

	$out[] = phutil_tag(
	'tr',
	array(
	'class' => $block['class'],
	),
	array($author, $message, $timestamp));
	}

	$crumbs = $this
	->buildApplicationCrumbs()
	->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($channel->getChannelName())
	->setHref($uri));

	$form = id(new AphrontFormView())
	->setUser($user)
	->setMethod('GET')
	->setAction($uri)
	->appendChild(
	id(new AphrontFormTextControl())
	- ->setLabel('Date')
	+ ->setLabel(pht('Date'))
	->setName('date')
	->setValue($request->getStr('date')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Jump'));
	+ ->setValue(pht('Jump')));


	return $this->buildStandardPageResponse(
	array(
	$crumbs,
	hsprintf(
	'<div class="phabricator-chat-log-panel">%s<br />%s%s</div>',
	$form->render(),
	phutil_tag('table', array('class' => 'phabricator-chat-log'), $out),
	$pager->render()),
	),
	array(
	- 'title' => 'Channel Log',
	+ '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();

	$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) {
	$timezone = new DateTimeZone($user->getTimezoneIdentifier());
	try {
	$date = new DateTime($at_date, $timezone);
	$timestamp = $date->format('U');
	} catch (Exception $e) {
	$timestamp = null;
	}

	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);
	}

	}
	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogController.php
	index ef9a195fbf..b7f12ab97c 100644
	--- a/src/applications/chatlog/controller/PhabricatorChatLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogController.php
	@@ -1,18 +1,18 @@
	<?php

	abstract class PhabricatorChatLogController extends PhabricatorController {

	public function buildStandardPageResponse($view, array $data) {
	$page = $this->buildStandardPageView();

	- $page->setApplicationName('Chat Log');
	+ $page->setApplicationName(pht('Chat Log'));
	$page->setBaseURI('/chatlog/');
	$page->setTitle(idx($data, 'title'));
	$page->setGlyph('#');
	$page->appendChild($view);

	$response = new AphrontWebpageResponse();
	return $response->setContent($page->render());
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 18:55 (1 d, 7 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127603
Default Alt Text: (10 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions