No OneTemporary
Actions

Size

190 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
	index 11bee4d5fa..e4c6356de5 100644
	--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
	+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
	@@ -1,226 +1,227 @@
	<?php

	final class PhabricatorCalendarEventSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Calendar Events');
	}

	public function getApplicationClassName() {
	return 'PhabricatorCalendarApplication';
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter(
	'rangeStart',
	$this->readDateFromRequest($request, 'rangeStart'));

	$saved->setParameter(
	'rangeEnd',
	$this->readDateFromRequest($request, 'rangeEnd'));

	$saved->setParameter(
	'upcoming',
	$this->readBoolFromRequest($request, 'upcoming'));

	$saved->setParameter(
	'invitedPHIDs',
	$this->readUsersFromRequest($request, 'invited'));

	$saved->setParameter(
	'creatorPHIDs',
	$this->readUsersFromRequest($request, 'creators'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new PhabricatorCalendarEventQuery());

	$min_range = null;
	$max_range = null;

	if ($saved->getParameter('rangeStart')) {
	$min_range = $saved->getParameter('rangeStart');
	}

	if ($saved->getParameter('rangeEnd')) {
	$max_range = $saved->getParameter('rangeEnd');
	}

	if ($saved->getParameter('upcoming')) {
	if ($min_range) {
	$min_range = max(time(), $min_range);
	} else {
	$min_range = time();
	}
	}

	if ($min_range \|\| $max_range) {
	$query->withDateRange($min_range, $max_range);
	}

	$invited_phids = $saved->getParameter('invitedPHIDs');
	if ($invited_phids) {
	$query->withInvitedPHIDs($invited_phids);
	}

	$creator_phids = $saved->getParameter('creatorPHIDs');
	if ($creator_phids) {
	$query->withCreatorPHIDs($creator_phids);
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved) {

	$range_start = $saved->getParameter('rangeStart');
	$range_end = $saved->getParameter('rangeEnd');
	$upcoming = $saved->getParameter('upcoming');

	$invited_phids = $saved->getParameter('invitedPHIDs', array());
	$creator_phids = $saved->getParameter('creatorPHIDs', array());

	$all_phids = array_merge(
	$invited_phids,
	$creator_phids);

	if ($all_phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	->withPHIDs($all_phids)
	->execute();
	} else {
	$handles = array();
	}

	$invited_handles = array_select_keys($handles, $invited_phids);
	$creator_handles = array_select_keys($handles, $creator_phids);

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('creators')
	->setLabel(pht('Created By'))
	->setValue($creator_handles))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('invited')
	->setLabel(pht('Invited'))
	->setValue($invited_handles))
	->appendChild(
	id(new AphrontFormDateControl())
	->setLabel(pht('Occurs After'))
	->setUser($this->requireViewer())
	->setName('rangeStart')
	->setAllowNull(true)
	->setValue($range_start))
	->appendChild(
	id(new AphrontFormDateControl())
	->setLabel(pht('Occurs Before'))
	->setUser($this->requireViewer())
	->setName('rangeEnd')
	->setAllowNull(true)
	->setValue($range_end))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'upcoming',
	1,
	pht('Show only upcoming events.'),
	$upcoming));
	}

	protected function getURI($path) {
	return '/calendar/event/'.$path;
	}

	public function getBuiltinQueryNames() {
	$names = array(
	'upcoming' => pht('Upcoming Events'),
	'all' => pht('All Events'),
	);

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'upcoming':
	return $query->setParameter('upcoming', true);
	case 'all':
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $objects,
	PhabricatorSavedQuery $query) {
	$phids = array();
	foreach ($objects as $event) {
	$phids[$event->getUserPHID()] = 1;
	}
	return array_keys($phids);
	}

	protected function renderResultList(
	array $events,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($events, 'PhabricatorCalendarEvent');

	$viewer = $this->requireViewer();

	$list = new PHUIObjectItemListView();
	foreach ($events as $event) {
	if ($event->getUserPHID() == $viewer->getPHID()) {
	$href = $this->getApplicationURI('/event/edit/'.$event->getID().'/');
	} else {
	$from = $event->getDateFrom();
	$month = phabricator_format_local_time($from, $viewer, 'm');
	$year = phabricator_format_local_time($from, $viewer, 'Y');
	$uri = new PhutilURI($this->getApplicationURI());
	$uri->setQueryParams(
	array(
	'month' => $month,
	'year' => $year,
	));
	$href = (string) $uri;
	}
	$from = phabricator_datetime($event->getDateFrom(), $viewer);
	$to = phabricator_datetime($event->getDateTo(), $viewer);
	$creator_handle = $handles[$event->getUserPHID()];

	$color = ($event->getStatus() == PhabricatorCalendarEvent::STATUS_AWAY)
	? 'red'
	: 'yellow';

	$item = id(new PHUIObjectItemView())
	->setHeader($event->getTerseSummary($viewer))
	->setHref($href)
	->setBarColor($color)
	->addByline(pht('Creator: %s', $creator_handle->renderLink()))
	->addAttribute(pht('From %s to %s', $from, $to))
	- ->addAttribute(
	- phutil_utf8_shorten($event->getDescription(), 64));
	+ ->addAttribute(id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(64)
	+ ->truncateString($event->getDescription()));

	$list->addItem($item);
	}

	return $list;
	}

	}
	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	index 1b13b15cd2..58f9af658e 100644
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	@@ -1,329 +1,331 @@
	<?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();

	$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 = 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 = 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_top = phutil_tag(
	'div',
	array('class' => 'phabricator-chat-log-pager-top'),
	$links);

	$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)
	->setMethod('GET')
	->setAction($uri)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Date'))
	->setName('date')
	->setValue($request->getStr('date')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Jump')));

	$filter = new AphrontListFilterView();
	$filter->appendChild($form);

	$table = phutil_tag(
	'table',
	array(
	'class' => 'phabricator-chat-log'
	),
	$out);

	$log = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-panel'
	),
	$table);

	$jump_link = phutil_tag(
	'a',
	array(
	'href' => '#latest'
	),
	pht('Jump to Bottom')." \xE2\x96\xBE");

	$jump = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-jump'
	),
	$jump_link);

	$jump_target = phutil_tag(
	'div',
	array(
	'id' => 'latest'
	));

	$content = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-wrap'
	),
	array(
	$jump,
	$pager_top,
	$log,
	$jump_target,
	$pager_bottom,
	));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$filter,
	$content,
	),
	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();

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

	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/conduit/method/ConduitConnectConduitAPIMethod.php b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	index 58150d8b82..cf005eae0d 100644
	--- a/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	+++ b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	@@ -1,159 +1,159 @@
	<?php

	final class ConduitConnectConduitAPIMethod extends ConduitAPIMethod {

	public function getAPIMethodName() {
	return 'conduit.connect';
	}

	public function shouldRequireAuthentication() {
	return false;
	}

	public function shouldAllowUnguardedWrites() {
	return true;
	}

	public function getMethodDescription() {
	return 'Connect a session-based client.';
	}

	public function defineParamTypes() {
	return array(
	'client' => 'required string',
	'clientVersion' => 'required int',
	'clientDescription' => 'optional string',
	'user' => 'optional string',
	'authToken' => 'optional int',
	'authSignature' => 'optional string',
	'host' => 'deprecated',
	);
	}

	public function defineReturnType() {
	return 'dict<string, any>';
	}

	public function defineErrorTypes() {
	return array(
	'ERR-BAD-VERSION' =>
	'Client/server version mismatch. Upgrade your server or downgrade '.
	'your client.',
	'NEW-ARC-VERSION' =>
	'Client/server version mismatch. Upgrade your client.',
	'ERR-UNKNOWN-CLIENT' =>
	'Client is unknown.',
	'ERR-INVALID-USER' =>
	'The username you are attempting to authenticate with is not valid.',
	'ERR-INVALID-CERTIFICATE' =>
	'Your authentication certificate for this server is invalid.',
	'ERR-INVALID-TOKEN' =>
	"The challenge token you are authenticating with is outside of the ".
	"allowed time range. Either your system clock is out of whack or ".
	"you're executing a replay attack.",
	'ERR-NO-CERTIFICATE' => 'This server requires authentication.',
	);
	}

	protected function execute(ConduitAPIRequest $request) {
	$client = $request->getValue('client');
	$client_version = (int)$request->getValue('clientVersion');
	$client_description = (string)$request->getValue('clientDescription');
	- // TODO: This should be character-oriented, not display-oriented.
	- // See T3307.
	- $client_description = phutil_utf8_shorten($client_description, 255);
	+ $client_description = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumCodepoints(255)
	+ ->truncateString($client_description);
	$username = (string)$request->getValue('user');

	// Log the connection, regardless of the outcome of checks below.
	$connection = new PhabricatorConduitConnectionLog();
	$connection->setClient($client);
	$connection->setClientVersion($client_version);
	$connection->setClientDescription($client_description);
	$connection->setUsername($username);
	$connection->save();

	switch ($client) {
	case 'arc':
	$server_version = 6;
	$supported_versions = array(
	$server_version => true,
	// Client version 5 introduced "user.query" call
	4 => true,
	// Client version 6 introduced "diffusion.getlintmessages" call
	5 => true,
	);

	if (empty($supported_versions[$client_version])) {
	if ($server_version < $client_version) {
	$ex = new ConduitException('ERR-BAD-VERSION');
	$ex->setErrorDescription(
	"Your 'arc' client version is '{$client_version}', which ".
	"is newer than the server version, '{$server_version}'. ".
	"Upgrade your Phabricator install.");
	} else {
	$ex = new ConduitException('NEW-ARC-VERSION');
	$ex->setErrorDescription(
	"A new version of arc is available! You need to upgrade ".
	"to connect to this server (you are running version ".
	"{$client_version}, the server is running version ".
	"{$server_version}).");
	}
	throw $ex;
	}
	break;
	default:
	// Allow new clients by default.
	break;
	}

	$token = $request->getValue('authToken');
	$signature = $request->getValue('authSignature');

	$user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username);
	if (!$user) {
	throw new ConduitException('ERR-INVALID-USER');
	}

	$session_key = null;
	if ($token && $signature) {
	$threshold = 60 * 15;
	$now = time();
	if (abs($token - $now) > $threshold) {
	throw id(new ConduitException('ERR-INVALID-TOKEN'))
	->setErrorDescription(
	pht(
	'The request you submitted is signed with a timestamp, but that '.
	'timestamp is not within %s of the current time. The '.
	'signed timestamp is %s (%s), and the current server time is '.
	'%s (%s). This is a difference of %s seconds, but the '.
	'timestamp must differ from the server time by no more than '.
	'%s seconds. Your client or server clock may not be set '.
	'correctly.',
	phutil_format_relative_time($threshold),
	$token,
	date('r', $token),
	$now,
	date('r', $now),
	($token - $now),
	$threshold));
	}
	$valid = sha1($token.$user->getConduitCertificate());
	if ($valid != $signature) {
	throw new ConduitException('ERR-INVALID-CERTIFICATE');
	}
	$session_key = id(new PhabricatorAuthSessionEngine())->establishSession(
	PhabricatorAuthSession::TYPE_CONDUIT,
	$user->getPHID(),
	$partial = false);
	} else {
	throw new ConduitException('ERR-NO-CERTIFICATE');
	}

	return array(
	'connectionID' => $connection->getID(),
	'sessionKey' => $session_key,
	'userPHID' => $user->getPHID(),
	);
	}

	}
	diff --git a/src/applications/conpherence/view/ConpherenceFileWidgetView.php b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	index 40d11da5e3..277202065c 100644
	--- a/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	+++ b/src/applications/conpherence/view/ConpherenceFileWidgetView.php
	@@ -1,74 +1,76 @@
	<?php

	final class ConpherenceFileWidgetView extends ConpherenceWidgetView {

	public function render() {
	require_celerity_resource('sprite-docs-css');
	$conpherence = $this->getConpherence();
	$widget_data = $conpherence->getWidgetData();
	$files = $widget_data['files'];
	$files_authors = $widget_data['files_authors'];
	$files_html = array();

	foreach ($files as $file) {
	$icon_class = $file->getDisplayIconForMimeType();
	$icon_view = phutil_tag(
	'div',
	array(
	'class' => 'file-icon sprite-docs '.$icon_class
	),
	'');
	$file_view = id(new PhabricatorFileLinkView())
	->setFilePHID($file->getPHID())
	- ->setFileName(phutil_utf8_shorten($file->getName(), 28))
	+ ->setFileName(id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(28)
	+ ->truncateString($file->getName()))
	->setFileViewable($file->isViewableImage())
	->setFileViewURI($file->getBestURI())
	->setCustomClass('file-title');

	$who_done_it_text = '';
	// system generated files don't have authors
	if ($file->getAuthorPHID()) {
	$who_done_it_text = pht(
	'By %s ',
	$files_authors[$file->getPHID()]->renderLink());
	}
	$date_text = phabricator_relative_date(
	$file->getDateCreated(),
	$this->getUser());

	$who_done_it = phutil_tag(
	'div',
	array(
	'class' => 'file-uploaded-by'
	),
	pht('%s%s.', $who_done_it_text, $date_text));

	$files_html[] = phutil_tag(
	'div',
	array(
	'class' => 'file-entry'
	),
	array(
	$icon_view,
	$file_view,
	$who_done_it
	));
	}

	if (empty($files)) {
	$files_html[] = javelin_tag(
	'div',
	array(
	'class' => 'no-files',
	'sigil' => 'no-files'),
	pht('No files.'));
	}

	return phutil_tag(
	'div',
	array('class' => 'file-list'),
	$files_html);

	}

	}
	diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
	index ca5c82b992..9bb61cff3b 100644
	--- a/src/applications/differential/controller/DifferentialDiffViewController.php
	+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
	@@ -1,148 +1,150 @@
	<?php

	final class DifferentialDiffViewController extends DifferentialController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

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

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

	$diff = id(new DifferentialDiffQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if (!$diff) {
	return new Aphront404Response();
	}

	$error_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	if ($diff->getRevisionID()) {
	$error_view->appendChild(
	pht(
	'This diff belongs to revision %s.',
	phutil_tag(
	'a',
	array(
	'href' => '/D'.$diff->getRevisionID(),
	),
	'D'.$diff->getRevisionID())));
	} else {
	// TODO: implement optgroup support in AphrontFormSelectControl?
	$select = array();
	$select[] = hsprintf('<optgroup label="%s">', pht('Create New Revision'));
	$select[] = phutil_tag(
	'option',
	array('value' => ''),
	pht('Create a new Revision...'));
	$select[] = hsprintf('</optgroup>');

	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withAuthors(array($viewer->getPHID()))
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->execute();

	if ($revisions) {
	$select[] = hsprintf(
	'<optgroup label="%s">',
	pht('Update Existing Revision'));
	foreach ($revisions as $revision) {
	$select[] = phutil_tag(
	'option',
	array(
	'value' => $revision->getID(),
	),
	- phutil_utf8_shorten(
	- 'D'.$revision->getID().' '.$revision->getTitle(), 128));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(128)
	+ ->truncateString(
	+ 'D'.$revision->getID().' '.$revision->getTitle()));
	}
	$select[] = hsprintf('</optgroup>');
	}

	$select = phutil_tag(
	'select',
	array('name' => 'revisionID'),
	$select);

	$form = id(new AphrontFormView())
	->setUser($request->getUser())
	->setAction('/differential/revision/edit/')
	->addHiddenInput('diffID', $diff->getID())
	->addHiddenInput('viaDiffView', 1)
	->appendRemarkupInstructions(
	pht(
	'Review the diff for correctness. When you are satisfied, either '.
	'create a new revision or update an existing revision.'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Attach To'))
	->setValue($select))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Continue')));

	$error_view->appendChild($form);
	}

	$props = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$diff->getID());
	$props = mpull($props, 'getData', 'getName');

	$property_head = id(new PHUIHeaderView())
	->setHeader(pht('Properties'));

	$property_view = new PHUIPropertyListView();

	$changesets = $diff->loadChangesets();
	$changesets = msort($changesets, 'getSortKey');

	$table_of_contents = id(new DifferentialDiffTableOfContentsView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setUnitTestData(idx($props, 'arc:unit', array()));

	$refs = array();
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}

	$details = id(new DifferentialChangesetListView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setRenderingReferences($refs)
	->setStandaloneURI('/differential/changeset/')
	->setDiff($diff)
	->setTitle(pht('Diff %d', $diff->getID()))
	->setUser($request->getUser());

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Diff %d', $diff->getID()));

	$prop_box = id(new PHUIObjectBoxView())
	->setHeader($property_head)
	->addPropertyList($property_view)
	->setErrorView($error_view);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$prop_box,
	$table_of_contents,
	$details,
	),
	array(
	'title' => pht('Diff View'),
	));
	}

	}
	diff --git a/src/applications/differential/event/DifferentialHovercardEventListener.php b/src/applications/differential/event/DifferentialHovercardEventListener.php
	index 06b5cfde96..5e7556cbc3 100644
	--- a/src/applications/differential/event/DifferentialHovercardEventListener.php
	+++ b/src/applications/differential/event/DifferentialHovercardEventListener.php
	@@ -1,81 +1,83 @@
	<?php

	final class DifferentialHovercardEventListener
	extends PhabricatorEventListener {

	public function register() {
	$this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	}

	public function handleEvent(PhutilEvent $event) {
	switch ($event->getType()) {
	case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	$this->handleHovercardEvent($event);
	break;
	}
	}

	private function handleHovercardEvent($event) {
	$viewer = $event->getUser();
	$hovercard = $event->getValue('hovercard');
	$object_handle = $event->getValue('handle');
	$phid = $object_handle->getPHID();
	$rev = $event->getValue('object');

	if (!($rev instanceof DifferentialRevision)) {
	return;
	}

	$rev->loadRelationships();
	$reviewer_phids = $rev->getReviewers();
	$e_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;
	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($phid))
	->withEdgeTypes(
	array(
	$e_task,
	));
	$edge_query->execute();
	$tasks = $edge_query->getDestinationPHIDs();

	$phids = array_merge(
	array(
	$rev->getAuthorPHID(),
	),
	$reviewer_phids,
	$tasks);

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($phids)
	->execute();

	$hovercard->setTitle('D'.$rev->getID());
	$hovercard->setDetail($rev->getTitle());

	$hovercard->addField(pht('Author'),
	$handles[$rev->getAuthorPHID()]->renderLink());

	$hovercard->addField(pht('Date'),
	phabricator_datetime($rev->getDateModified(), $viewer));

	$hovercard->addField(pht('Reviewers'),
	implode_selected_handle_links(', ', $handles, $reviewer_phids));

	if ($tasks) {
	$hovercard->addField(pht('Task(s)', count($tasks)),
	implode_selected_handle_links(', ', $handles, $tasks));
	}

	if ($rev->getSummary()) {
	$hovercard->addField(pht('Summary'),
	- phutil_utf8_shorten($rev->getSummary(), 120));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(120)
	+ ->truncateString($rev->getSummary()));
	}

	$hovercard->addTag(
	DifferentialRevisionDetailView::renderTagForRevision($rev));

	$event->setValue('hovercard', $hovercard);
	}

	}
	diff --git a/src/applications/differential/parser/DifferentialCommitMessageParser.php b/src/applications/differential/parser/DifferentialCommitMessageParser.php
	index adb5fd2d76..18aa1ceb98 100644
	--- a/src/applications/differential/parser/DifferentialCommitMessageParser.php
	+++ b/src/applications/differential/parser/DifferentialCommitMessageParser.php
	@@ -1,210 +1,214 @@
	<?php

	/**
	* Parses commit messages (containing relatively freeform text with textual
	* field labels) into a dictionary of fields.
	*
	* $parser = id(new DifferentialCommitMessageParser())
	* ->setLabelMap($label_map)
	* ->setTitleKey($key_title)
	* ->setSummaryKey($key_summary);
	*
	* $fields = $parser->parseCorpus($corpus);
	* $errors = $parser->getErrors();
	*
	* This is used by Differential to parse messages entered from the command line.
	*
	* @task config Configuring the Parser
	* @task parse Parsing Messages
	* @task support Support Methods
	* @task internal Internals
	*/
	final class DifferentialCommitMessageParser {

	private $labelMap;
	private $titleKey;
	private $summaryKey;
	private $errors;


	/* -( Configuring the Parser )--------------------------------------------- */


	/**
	* @task config
	*/
	public function setLabelMap(array $label_map) {
	$this->labelMap = $label_map;
	return $this;
	}


	/**
	* @task config
	*/
	public function setTitleKey($title_key) {
	$this->titleKey = $title_key;
	return $this;
	}


	/**
	* @task config
	*/
	public function setSummaryKey($summary_key) {
	$this->summaryKey = $summary_key;
	return $this;
	}


	/* -( Parsing Messages )--------------------------------------------------- */


	/**
	* @task parse
	*/
	public function parseCorpus($corpus) {
	$this->errors = array();

	$label_map = $this->labelMap;
	$key_title = $this->titleKey;
	$key_summary = $this->summaryKey;

	if (!$key_title \|\| !$key_summary \|\| ($label_map === null)) {
	throw new Exception(
	pht(
	'Expected labelMap, summaryKey and titleKey to be set before '.
	'parsing a corpus.'));
	}

	$label_regexp = $this->buildLabelRegexp($label_map);

	// NOTE: We're special casing things here to make the "Title:" label
	// optional in the message.
	$field = $key_title;

	$seen = array();
	$lines = explode("\n", trim($corpus));
	$field_map = array();
	foreach ($lines as $key => $line) {
	$match = null;
	if (preg_match($label_regexp, $line, $match)) {
	$lines[$key] = trim($match['text']);
	$field = $label_map[self::normalizeFieldLabel($match['field'])];
	if (!empty($seen[$field])) {
	$this->errors[] = pht(
	'Field "%s" occurs twice in commit message!',
	$field);
	}
	$seen[$field] = true;
	}
	$field_map[$key] = $field;
	}

	$fields = array();
	foreach ($lines as $key => $line) {
	$fields[$field_map[$key]][] = $line;
	}

	// This is a piece of special-cased magic which allows you to omit the
	// field labels for "title" and "summary". If the user enters a large block
	// of text at the beginning of the commit message with an empty line in it,
	// treat everything before the blank line as "title" and everything after
	// as "summary".
	if (isset($fields[$key_title]) && empty($fields[$key_summary])) {
	$lines = $fields[$key_title];
	for ($ii = 0; $ii < count($lines); $ii++) {
	if (strlen(trim($lines[$ii])) == 0) {
	break;
	}
	}
	if ($ii != count($lines)) {
	$fields[$key_title] = array_slice($lines, 0, $ii);
	$summary = array_slice($lines, $ii);
	if (strlen(trim(implode("\n", $summary)))) {
	$fields[$key_summary] = $summary;
	}
	}
	}

	// Implode all the lines back into chunks of text.
	foreach ($fields as $name => $lines) {
	$data = rtrim(implode("\n", $lines));
	$data = ltrim($data, "\n");
	$fields[$name] = $data;
	}

	// This is another piece of special-cased magic which allows you to
	// enter a ridiculously long title, or just type a big block of stream
	// of consciousness text, and have some sort of reasonable result conjured
	// from it.
	if (isset($fields[$key_title])) {
	$terminal = '...';
	$title = $fields[$key_title];
	- $short = phutil_utf8_shorten($title, 250, $terminal);
	+ $short = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(250)
	+ ->setTerminator($terminal)
	+ ->truncateString($title);
	+
	if ($short != $title) {

	// If we shortened the title, split the rest into the summary, so
	// we end up with a title like:
	//
	// Title title tile title title...
	//
	// ...and a summary like:
	//
	// ...title title title.
	//
	// Summary summary summary summary.

	$summary = idx($fields, $key_summary, '');
	$offset = strlen($short) - strlen($terminal);
	$remainder = ltrim(substr($fields[$key_title], $offset));
	$summary = '...'.$remainder."\n\n".$summary;
	$summary = rtrim($summary, "\n");

	$fields[$key_title] = $short;
	$fields[$key_summary] = $summary;
	}
	}

	return $fields;
	}


	/**
	* @task parse
	*/
	public function getErrors() {
	return $this->errors;
	}


	/* -( Support Methods )---------------------------------------------------- */


	/**
	* @task support
	*/
	public static function normalizeFieldLabel($label) {
	return phutil_utf8_strtolower($label);
	}


	/* -( Internals )---------------------------------------------------------- */


	/**
	* @task internal
	*/
	private function buildLabelRegexp(array $label_map) {
	$field_labels = array_keys($label_map);
	foreach ($field_labels as $key => $label) {
	$field_labels[$key] = preg_quote($label, '/');
	}
	$field_labels = implode('\|', $field_labels);

	$field_pattern = '/^(?P<field>'.$field_labels.'):(?P<text>.*)$/i';

	return $field_pattern;
	}

	}
	diff --git a/src/applications/differential/view/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php
	index aa965af340..8082d05ab4 100644
	--- a/src/applications/differential/view/DifferentialLocalCommitsView.php
	+++ b/src/applications/differential/view/DifferentialLocalCommitsView.php
	@@ -1,153 +1,155 @@
	<?php

	final class DifferentialLocalCommitsView extends AphrontView {

	private $localCommits;
	private $commitsForLinks = array();

	public function setLocalCommits($local_commits) {
	$this->localCommits = $local_commits;
	return $this;
	}

	public function setCommitsForLinks(array $commits) {
	assert_instances_of($commits, 'PhabricatorRepositoryCommit');
	$this->commitsForLinks = $commits;
	return $this;
	}

	public function render() {
	$user = $this->user;
	if (!$user) {
	throw new Exception('Call setUser() before render()-ing this view.');
	}

	$local = $this->localCommits;
	if (!$local) {
	return null;
	}

	$has_tree = false;
	$has_local = false;

	foreach ($local as $commit) {
	if (idx($commit, 'tree')) {
	$has_tree = true;
	}
	if (idx($commit, 'local')) {
	$has_local = true;
	}
	}

	$rows = array();
	foreach ($local as $commit) {
	$row = array();
	if (idx($commit, 'commit')) {
	$commit_link = $this->buildCommitLink($commit['commit']);
	} else if (isset($commit['rev'])) {
	$commit_link = $this->buildCommitLink($commit['rev']);
	} else {
	$commit_link = null;
	}
	$row[] = $commit_link;

	if ($has_tree) {
	$row[] = $this->buildCommitLink($commit['tree']);
	}

	if ($has_local) {
	$row[] = $this->buildCommitLink($commit['local']);
	}

	$parents = idx($commit, 'parents', array());
	foreach ($parents as $k => $parent) {
	if (is_array($parent)) {
	$parent = idx($parent, 'rev');
	}
	$parents[$k] = $this->buildCommitLink($parent);
	}
	$parents = phutil_implode_html(phutil_tag('br'), $parents);
	$row[] = $parents;

	$author = nonempty(
	idx($commit, 'user'),
	idx($commit, 'author'));
	$row[] = $author;

	$message = idx($commit, 'message');

	$summary = idx($commit, 'summary');
	- $summary = phutil_utf8_shorten($summary, 80);
	+ $summary = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(80)
	+ ->truncateString($summary);

	$view = new AphrontMoreView();
	$view->setSome($summary);

	if ($message && (trim($summary) != trim($message))) {
	$view->setMore(phutil_escape_html_newlines($message));
	}

	$row[] = $view->render();

	$date = nonempty(
	idx($commit, 'date'),
	idx($commit, 'time'));
	if ($date) {
	$date = phabricator_datetime($date, $user);
	}
	$row[] = $date;

	$rows[] = $row;
	}

	$column_classes = array('');
	if ($has_tree) {
	$column_classes[] = '';
	}
	if ($has_local) {
	$column_classes[] = '';
	}
	$column_classes[] = '';
	$column_classes[] = '';
	$column_classes[] = 'wide';
	$column_classes[] = 'date';
	$table = id(new AphrontTableView($rows))
	->setColumnClasses($column_classes);
	$headers = array();
	$headers[] = pht('Commit');
	if ($has_tree) {
	$headers[] = pht('Tree');
	}
	if ($has_local) {
	$headers[] = pht('Local');
	}
	$headers[] = pht('Parents');
	$headers[] = pht('Author');
	$headers[] = pht('Summary');
	$headers[] = pht('Date');
	$table->setHeaders($headers);

	return id(new PHUIObjectBoxView())
	->setHeaderText(pht('Local Commits'))
	->appendChild($table);
	}

	private static function formatCommit($commit) {
	return substr($commit, 0, 12);
	}

	private function buildCommitLink($hash) {
	$commit_for_link = idx($this->commitsForLinks, $hash);
	$commit_hash = self::formatCommit($hash);
	if ($commit_for_link) {
	$link = phutil_tag(
	'a',
	array(
	'href' => $commit_for_link->getURI()),
	$commit_hash);
	} else {
	$link = $commit_hash;
	}
	return $link;
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	index ac459a99a9..5c208d929d 100644
	--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	@@ -1,1091 +1,1094 @@
	<?php

	final class DiffusionBrowseFileController extends DiffusionBrowseController {

	private $lintCommit;
	private $lintMessages;
	private $coverage;

	public function processRequest() {
	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();
	$viewer = $request->getUser();

	$before = $request->getStr('before');
	if ($before) {
	return $this->buildBeforeResponse($before);
	}

	$path = $drequest->getPath();

	$preferences = $viewer->loadPreferences();

	$show_blame = $request->getBool(
	'blame',
	$preferences->getPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_BLAME,
	false));
	$show_color = $request->getBool(
	'color',
	$preferences->getPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_COLOR,
	true));

	$view = $request->getStr('view');
	if ($request->isFormPost() && $view != 'raw' && $viewer->isLoggedIn()) {
	$preferences->setPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_BLAME,
	$show_blame);
	$preferences->setPreference(
	PhabricatorUserPreferences::PREFERENCE_DIFFUSION_COLOR,
	$show_color);
	$preferences->save();

	$uri = $request->getRequestURI()
	->alter('blame', null)
	->alter('color', null);

	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	// We need the blame information if blame is on and we're building plain
	// text, or blame is on and this is an Ajax request. If blame is on and
	// this is a colorized request, we don't show blame at first (we ajax it
	// in afterward) so we don't need to query for it.
	$needs_blame = ($show_blame && !$show_color) \|\|
	($show_blame && $request->isAjax());

	$file_content = DiffusionFileContent::newFromConduit(
	$this->callConduitWithDiffusionRequest(
	'diffusion.filecontentquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'needsBlame' => $needs_blame,
	)));
	$data = $file_content->getCorpus();

	if ($view === 'raw') {
	return $this->buildRawResponse($path, $data);
	}

	$this->loadLintMessages();
	$this->coverage = $drequest->loadCoverage();

	$binary_uri = null;
	if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
	$file = $this->loadFileForData($path, $data);
	$file_uri = $file->getBestURI();

	if ($file->isViewableImage()) {
	$corpus = $this->buildImageCorpus($file_uri);
	} else {
	$corpus = $this->buildBinaryCorpus($file_uri, $data);
	$binary_uri = $file_uri;
	}
	} else {
	// Build the content of the file.
	$corpus = $this->buildCorpus(
	$show_blame,
	$show_color,
	$file_content,
	$needs_blame,
	$drequest,
	$path,
	$data);
	}

	if ($request->isAjax()) {
	return id(new AphrontAjaxResponse())->setContent($corpus);
	}

	require_celerity_resource('diffusion-source-css');

	// Render the page.
	$view = $this->buildActionView($drequest);
	$action_list = $this->enrichActionView(
	$view,
	$drequest,
	$show_blame,
	$show_color);

	$properties = $this->buildPropertyView($drequest, $action_list);
	$object_box = id(new PHUIObjectBoxView())
	->setHeader($this->buildHeaderView($drequest))
	->addPropertyList($properties);

	$content = array();
	$content[] = $object_box;

	$follow = $request->getStr('follow');
	if ($follow) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$notice->setTitle(pht('Unable to Continue'));
	switch ($follow) {
	case 'first':
	$notice->appendChild(
	pht('Unable to continue tracing the history of this file because '.
	'this commit is the first commit in the repository.'));
	break;
	case 'created':
	$notice->appendChild(
	pht('Unable to continue tracing the history of this file because '.
	'this commit created the file.'));
	break;
	}
	$content[] = $notice;
	}

	$renamed = $request->getStr('renamed');
	if ($renamed) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle(pht('File Renamed'));
	$notice->appendChild(
	pht("File history passes through a rename from '%s' to '%s'.",
	$drequest->getPath(), $renamed));
	$content[] = $notice;
	}

	$content[] = $corpus;
	$content[] = $this->buildOpenRevisions();

	$crumbs = $this->buildCrumbs(
	array(
	'branch' => true,
	'path' => true,
	'view' => 'browse',
	));

	$basename = basename($this->getDiffusionRequest()->getPath());

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$content,
	),
	array(
	'title' => $basename,
	'device' => false,
	));
	}

	private function loadLintMessages() {
	$drequest = $this->getDiffusionRequest();
	$branch = $drequest->loadBranch();

	if (!$branch \|\| !$branch->getLintCommit()) {
	return;
	}

	$this->lintCommit = $branch->getLintCommit();

	$conn = id(new PhabricatorRepository())->establishConnection('r');

	$where = '';
	if ($drequest->getLint()) {
	$where = qsprintf(
	$conn,
	'AND code = %s',
	$drequest->getLint());
	}

	$this->lintMessages = queryfx_all(
	$conn,
	'SELECT * FROM %T WHERE branchID = %d %Q AND path = %s',
	PhabricatorRepository::TABLE_LINTMESSAGE,
	$branch->getID(),
	$where,
	'/'.$drequest->getPath());
	}

	private function buildCorpus(
	$show_blame,
	$show_color,
	DiffusionFileContent $file_content,
	$needs_blame,
	DiffusionRequest $drequest,
	$path,
	$data) {

	if (!$show_color) {
	$style =
	'border: none; width: 100%; height: 80em; font-family: monospace';
	if (!$show_blame) {
	$corpus = phutil_tag(
	'textarea',
	array(
	'style' => $style,
	),
	$file_content->getCorpus());
	} else {
	$text_list = $file_content->getTextList();
	$rev_list = $file_content->getRevList();
	$blame_dict = $file_content->getBlameDict();

	$rows = array();
	foreach ($text_list as $k => $line) {
	$rev = $rev_list[$k];
	$author = $blame_dict[$rev]['author'];
	$rows[] =
	sprintf('%-10s %-20s %s', substr($rev, 0, 7), $author, $line);
	}

	$corpus = phutil_tag(
	'textarea',
	array(
	'style' => $style,
	),
	implode("\n", $rows));
	}
	} else {
	require_celerity_resource('syntax-highlighting-css');
	$text_list = $file_content->getTextList();
	$rev_list = $file_content->getRevList();
	$blame_dict = $file_content->getBlameDict();

	$text_list = implode("\n", $text_list);
	$text_list = PhabricatorSyntaxHighlighter::highlightWithFilename(
	$path,
	$text_list);
	$text_list = explode("\n", $text_list);

	$rows = $this->buildDisplayRows($text_list, $rev_list, $blame_dict,
	$needs_blame, $drequest, $show_blame, $show_color);

	$corpus_table = javelin_tag(
	'table',
	array(
	'class' => 'diffusion-source remarkup-code PhabricatorMonospaced',
	'sigil' => 'phabricator-source',
	),
	$rows);

	if ($this->getRequest()->isAjax()) {
	return $corpus_table;
	}

	$id = celerity_generate_unique_node_id();

	$projects = $drequest->loadArcanistProjects();
	$langs = array();
	foreach ($projects as $project) {
	$ls = $project->getSymbolIndexLanguages();
	if (!$ls) {
	continue;
	}
	$dep_projects = $project->getSymbolIndexProjects();
	$dep_projects[] = $project->getPHID();
	foreach ($ls as $lang) {
	if (!isset($langs[$lang])) {
	$langs[$lang] = array();
	}
	$langs[$lang] += $dep_projects + array($project);
	}
	}

	$lang = last(explode('.', $drequest->getPath()));

	if (isset($langs[$lang])) {
	Javelin::initBehavior(
	'repository-crossreference',
	array(
	'container' => $id,
	'lang' => $lang,
	'projects' => $langs[$lang],
	));
	}

	$corpus = phutil_tag(
	'div',
	array(
	'id' => $id,
	),
	$corpus_table);

	Javelin::initBehavior('load-blame', array('id' => $id));
	}

	$edit = $this->renderEditButton();
	$file = $this->renderFileButton();
	$header = id(new PHUIHeaderView())
	->setHeader(pht('File Contents'))
	->addActionLink($edit)
	->addActionLink($file);

	$corpus = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($corpus);

	return $corpus;
	}

	private function enrichActionView(
	PhabricatorActionListView $view,
	DiffusionRequest $drequest,
	$show_blame,
	$show_color) {

	$viewer = $this->getRequest()->getUser();
	$base_uri = $this->getRequest()->getRequestURI();

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Show Last Change'))
	->setHref(
	$drequest->generateURI(
	array(
	'action' => 'change',
	)))
	->setIcon('fa-backward'));

	if ($show_blame) {
	$blame_text = pht('Disable Blame');
	$blame_icon = 'fa-exclamation-circle lightgreytext';
	$blame_value = 0;
	} else {
	$blame_text = pht('Enable Blame');
	$blame_icon = 'fa-exclamation-circle';
	$blame_value = 1;
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($blame_text)
	->setHref($base_uri->alter('blame', $blame_value))
	->setIcon($blame_icon)
	->setUser($viewer)
	->setRenderAsForm($viewer->isLoggedIn()));

	if ($show_color) {
	$highlight_text = pht('Disable Highlighting');
	$highlight_icon = 'fa-star-o grey';
	$highlight_value = 0;
	} else {
	$highlight_text = pht('Enable Highlighting');
	$highlight_icon = 'fa-star';
	$highlight_value = 1;
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($highlight_text)
	->setHref($base_uri->alter('color', $highlight_value))
	->setIcon($highlight_icon)
	->setUser($viewer)
	->setRenderAsForm($viewer->isLoggedIn()));

	$href = null;
	if ($this->getRequest()->getStr('lint') !== null) {
	$lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages));
	$href = $base_uri->alter('lint', null);

	} else if ($this->lintCommit === null) {
	$lint_text = pht('Lint not Available');
	} else {
	$lint_text = pht(
	'Show %d Lint Message(s)',
	count($this->lintMessages));
	$href = $this->getDiffusionRequest()->generateURI(array(
	'action' => 'browse',
	'commit' => $this->lintCommit,
	))->alter('lint', '');
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($lint_text)
	->setHref($href)
	->setIcon('fa-exclamation-triangle')
	->setDisabled(!$href));

	return $view;
	}

	private function renderEditButton() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$drequest = $this->getDiffusionRequest();

	$repository = $drequest->getRepository();
	$path = $drequest->getPath();
	$line = nonempty((int)$drequest->getLine(), 1);

	$callsign = $repository->getCallsign();
	$editor_link = $user->loadEditorLink($path, $line, $callsign);
	$template = $user->loadEditorLink($path, '%l', $callsign);

	$icon_edit = id(new PHUIIconView())
	->setIconFont('fa-pencil');
	$button = id(new PHUIButtonView())
	->setTag('a')
	->setText(pht('Open in Editor'))
	->setHref($editor_link)
	->setIcon($icon_edit)
	->setID('editor_link')
	->setMetadata(array('link_template' => $template))
	->setDisabled(!$editor_link);

	return $button;
	}

	private function renderFileButton($file_uri = null) {

	$base_uri = $this->getRequest()->getRequestURI();

	if ($file_uri) {
	$text = pht('Download Raw File');
	$href = $file_uri;
	$icon = 'fa-download';
	} else {
	$text = pht('View Raw File');
	$href = $base_uri->alter('view', 'raw');
	$icon = 'fa-file-text';
	}

	$iconview = id(new PHUIIconView())
	->setIconFont($icon);
	$button = id(new PHUIButtonView())
	->setTag('a')
	->setText($text)
	->setHref($href)
	->setIcon($iconview);

	return $button;
	}


	private function buildDisplayRows(
	array $text_list,
	array $rev_list,
	array $blame_dict,
	$needs_blame,
	DiffusionRequest $drequest,
	$show_blame,
	$show_color) {

	$handles = array();
	if ($blame_dict) {
	$epoch_list = ipull(ifilter($blame_dict, 'epoch'), 'epoch');
	$epoch_min = min($epoch_list);
	$epoch_max = max($epoch_list);
	$epoch_range = ($epoch_max - $epoch_min) + 1;

	$author_phids = ipull(ifilter($blame_dict, 'authorPHID'), 'authorPHID');
	$handles = $this->loadViewerHandles($author_phids);
	}

	$line_arr = array();
	$line_str = $drequest->getLine();
	$ranges = explode(',', $line_str);
	foreach ($ranges as $range) {
	if (strpos($range, '-') !== false) {
	list($min, $max) = explode('-', $range, 2);
	$line_arr[] = array(
	'min' => min($min, $max),
	'max' => max($min, $max),
	);
	} else if (strlen($range)) {
	$line_arr[] = array(
	'min' => $range,
	'max' => $range,
	);
	}
	}

	$display = array();

	$line_number = 1;
	$last_rev = null;
	$color = null;
	foreach ($text_list as $k => $line) {
	$display_line = array(
	'epoch' => null,
	'commit' => null,
	'author' => null,
	'target' => null,
	'highlighted' => null,
	'line' => $line_number,
	'data' => $line,
	);

	if ($show_blame) {
	// If the line's rev is same as the line above, show empty content
	// with same color; otherwise generate blame info. The newer a change
	// is, the more saturated the color.

	$rev = idx($rev_list, $k, $last_rev);

	if ($last_rev == $rev) {
	$display_line['color'] = $color;
	} else {
	$blame = $blame_dict[$rev];

	if (!isset($blame['epoch'])) {
	$color = '#ffd'; // Render as warning.
	} else {
	$color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
	$color_value = 0xE6 * (1.0 - $color_ratio);
	$color = sprintf(
	'#%02x%02x%02x',
	$color_value,
	0xF6,
	$color_value);
	}

	$display_line['epoch'] = idx($blame, 'epoch');
	$display_line['color'] = $color;
	$display_line['commit'] = $rev;

	$author_phid = idx($blame, 'authorPHID');
	if ($author_phid && $handles[$author_phid]) {
	$author_link = $handles[$author_phid]->renderLink();
	} else {
	$author_link = $blame['author'];
	}
	$display_line['author'] = $author_link;

	$last_rev = $rev;
	}
	}

	if ($line_arr) {
	if ($line_number == $line_arr[0]['min']) {
	$display_line['target'] = true;
	}
	foreach ($line_arr as $range) {
	if ($line_number >= $range['min'] &&
	$line_number <= $range['max']) {
	$display_line['highlighted'] = true;
	}
	}
	}

	$display[] = $display_line;
	++$line_number;
	}

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$commits = array_filter(ipull($display, 'commit'));
	if ($commits) {
	$commits = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withRepository($drequest->getRepository())
	->withIdentifiers($commits)
	->execute();
	$commits = mpull($commits, null, 'getCommitIdentifier');
	}

	$revision_ids = id(new DifferentialRevision())
	->loadIDsByCommitPHIDs(mpull($commits, 'getPHID'));
	$revisions = array();
	if ($revision_ids) {
	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withIDs($revision_ids)
	->execute();
	}

	$phids = array();
	foreach ($commits as $commit) {
	if ($commit->getAuthorPHID()) {
	$phids[] = $commit->getAuthorPHID();
	}
	}
	foreach ($revisions as $revision) {
	if ($revision->getAuthorPHID()) {
	$phids[] = $revision->getAuthorPHID();
	}
	}
	$handles = $this->loadViewerHandles($phids);

	Javelin::initBehavior('phabricator-oncopy', array());

	$engine = null;
	$inlines = array();
	if ($this->getRequest()->getStr('lint') !== null && $this->lintMessages) {
	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($viewer);

	foreach ($this->lintMessages as $message) {
	$inline = id(new PhabricatorAuditInlineComment())
	->setSyntheticAuthor(
	ArcanistLintSeverity::getStringForSeverity($message['severity']).
	' '.$message['code'].' ('.$message['name'].')')
	->setLineNumber($message['line'])
	->setContent($message['description']);
	$inlines[$message['line']][] = $inline;

	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	}

	$engine->process();
	require_celerity_resource('differential-changeset-view-css');
	}

	$rows = $this->renderInlines(
	idx($inlines, 0, array()),
	$show_blame,
	(bool)$this->coverage,
	$engine);

	foreach ($display as $line) {

	$line_href = $drequest->generateURI(
	array(
	'action' => 'browse',
	'line' => $line['line'],
	'stable' => true,
	));

	$blame = array();
	$style = null;
	if (array_key_exists('color', $line)) {
	if ($line['color']) {
	$style = 'background: '.$line['color'].';';
	}

	$before_link = null;
	$commit_link = null;
	$revision_link = null;
	if (idx($line, 'commit')) {
	$commit = $line['commit'];

	if (idx($commits, $commit)) {
	$tooltip = $this->renderCommitTooltip(
	$commits[$commit],
	$handles,
	$line['author']);
	} else {
	$tooltip = null;
	}

	Javelin::initBehavior('phabricator-tooltips', array());
	require_celerity_resource('aphront-tooltip-css');

	$commit_link = javelin_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $line['commit'],
	)),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	- phutil_utf8_shorten($line['commit'], 9, ''));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(9)
	+ ->setTerminator('')
	+ ->truncateString($line['commit']));

	$revision_id = null;
	if (idx($commits, $commit)) {
	$revision_id = idx($revision_ids, $commits[$commit]->getPHID());
	}

	if ($revision_id) {
	$revision = idx($revisions, $revision_id);
	if ($revision) {
	$tooltip = $this->renderRevisionTooltip($revision, $handles);
	$revision_link = javelin_tag(
	'a',
	array(
	'href' => '/D'.$revision->getID(),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	'D'.$revision->getID());
	}
	}

	$uri = $line_href->alter('before', $commit);
	$before_link = javelin_tag(
	'a',
	array(
	'href' => $uri->setQueryParam('view', 'blame'),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Skip Past This Commit'),
	'align' => 'E',
	'size' => 300,
	),
	),
	"\xC2\xAB");
	}

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-blame-link',
	),
	$before_link);

	$object_links = array();
	$object_links[] = $commit_link;
	if ($revision_link) {
	$object_links[] = phutil_tag('span', array(), '/');
	$object_links[] = $revision_link;
	}

	$blame[] = phutil_tag(
	'th',
	array(
	'class' => 'diffusion-rev-link',
	),
	$object_links);
	}

	$line_link = phutil_tag(
	'a',
	array(
	'href' => $line_href,
	'style' => $style,
	),
	$line['line']);

	$blame[] = javelin_tag(
	'th',
	array(
	'class' => 'diffusion-line-link',
	'sigil' => 'phabricator-source-line',
	'style' => $style,
	),
	$line_link);

	Javelin::initBehavior('phabricator-line-linker');

	if ($line['target']) {
	Javelin::initBehavior(
	'diffusion-jump-to',
	array(
	'target' => 'scroll_target',
	));
	$anchor_text = phutil_tag(
	'a',
	array(
	'id' => 'scroll_target',
	),
	'');
	} else {
	$anchor_text = null;
	}

	$blame[] = phutil_tag(
	'td',
	array(
	),
	array(
	$anchor_text,

	// NOTE: See phabricator-oncopy behavior.
	"\xE2\x80\x8B",

	// TODO: [HTML] Not ideal.
	phutil_safe_html(str_replace("\t", ' ', $line['data'])),
	));

	if ($this->coverage) {
	require_celerity_resource('differential-changeset-view-css');
	$cov_index = $line['line'] - 1;

	if (isset($this->coverage[$cov_index])) {
	$cov_class = $this->coverage[$cov_index];
	} else {
	$cov_class = 'N';
	}

	$blame[] = phutil_tag(
	'td',
	array(
	'class' => 'cov cov-'.$cov_class,
	),
	'');
	}

	$rows[] = phutil_tag(
	'tr',
	array(
	'class' => ($line['highlighted'] ?
	'phabricator-source-highlight' :
	null),
	),
	$blame);

	$cur_inlines = $this->renderInlines(
	idx($inlines, $line['line'], array()),
	$show_blame,
	$this->coverage,
	$engine);
	foreach ($cur_inlines as $cur_inline) {
	$rows[] = $cur_inline;
	}
	}

	return $rows;
	}

	private function renderInlines(
	array $inlines,
	$needs_blame,
	$has_coverage,
	$engine) {

	$rows = array();
	foreach ($inlines as $inline) {
	$inline_view = id(new DifferentialInlineCommentView())
	->setMarkupEngine($engine)
	->setInlineComment($inline)
	->render();

	$row = array_fill(0, ($needs_blame ? 3 : 1), phutil_tag('th'));

	$row[] = phutil_tag('td', array(), $inline_view);

	if ($has_coverage) {
	$row[] = phutil_tag(
	'td',
	array(
	'class' => 'cov cov-I',
	));
	}

	$rows[] = phutil_tag('tr', array('class' => 'inline'), $row);
	}

	return $rows;
	}

	private function loadFileForData($path, $data) {
	$file = PhabricatorFile::buildFromFileDataOrHash(
	$data,
	array(
	'name' => basename($path),
	'ttl' => time() + 60 * 60 * 24,
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject(
	$this->getRequest()->getUser(),
	$this->getDiffusionRequest()->getRepository()->getPHID());
	unset($unguarded);

	return $file;
	}

	private function buildRawResponse($path, $data) {
	$file = $this->loadFileForData($path, $data);
	return $file->getRedirectResponse();
	}

	private function buildImageCorpus($file_uri) {
	$properties = new PHUIPropertyListView();

	$properties->addImageContent(
	phutil_tag(
	'img',
	array(
	'src' => $file_uri,
	)));

	$file = $this->renderFileButton($file_uri);
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Image'))
	->addActionLink($file);

	return id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);
	}

	private function buildBinaryCorpus($file_uri, $data) {

	$size = new PhutilNumber(strlen($data));
	$text = pht('This is a binary file. It is %s byte(s) in length.', $size);
	$text = id(new PHUIBoxView())
	->addPadding(PHUI::PADDING_LARGE)
	->appendChild($text);

	$file = $this->renderFileButton($file_uri);
	$header = id(new PHUIHeaderView())
	->setHeader(pht('Details'))
	->addActionLink($file);

	$box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($text);

	return $box;
	}

	private function buildBeforeResponse($before) {
	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();

	// NOTE: We need to get the grandparent so we can capture filename changes
	// in the parent.

	$parent = $this->loadParentCommitOf($before);
	$old_filename = null;
	$was_created = false;
	if ($parent) {
	$grandparent = $this->loadParentCommitOf($parent);

	if ($grandparent) {
	$rename_query = new DiffusionRenameHistoryQuery();
	$rename_query->setRequest($drequest);
	$rename_query->setOldCommit($grandparent);
	$rename_query->setViewer($request->getUser());
	$old_filename = $rename_query->loadOldFilename();
	$was_created = $rename_query->getWasCreated();
	}
	}

	$follow = null;
	if ($was_created) {
	// If the file was created in history, that means older commits won't
	// have it. Since we know it existed at 'before', it must have been
	// created then; jump there.
	$target_commit = $before;
	$follow = 'created';
	} else if ($parent) {
	// If we found a parent, jump to it. This is the normal case.
	$target_commit = $parent;
	} else {
	// If there's no parent, this was probably created in the initial commit?
	// And the "was_created" check will fail because we can't identify the
	// grandparent. Keep the user at 'before'.
	$target_commit = $before;
	$follow = 'first';
	}

	$path = $drequest->getPath();
	$renamed = null;
	if ($old_filename !== null &&
	$old_filename !== '/'.$path) {
	$renamed = $path;
	$path = $old_filename;
	}

	$line = null;
	// If there's a follow error, drop the line so the user sees the message.
	if (!$follow) {
	$line = $this->getBeforeLineNumber($target_commit);
	}

	$before_uri = $drequest->generateURI(
	array(
	'action' => 'browse',
	'commit' => $target_commit,
	'line' => $line,
	'path' => $path,
	));

	$before_uri->setQueryParams($request->getRequestURI()->getQueryParams());
	$before_uri = $before_uri->alter('before', null);
	$before_uri = $before_uri->alter('renamed', $renamed);
	$before_uri = $before_uri->alter('follow', $follow);

	return id(new AphrontRedirectResponse())->setURI($before_uri);
	}

	private function getBeforeLineNumber($target_commit) {
	$drequest = $this->getDiffusionRequest();

	$line = $drequest->getLine();
	if (!$line) {
	return null;
	}

	$raw_diff = $this->callConduitWithDiffusionRequest(
	'diffusion.rawdiffquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	'againstCommit' => $target_commit));
	$old_line = 0;
	$new_line = 0;

	foreach (explode("\n", $raw_diff) as $text) {
	if ($text[0] == '-' \|\| $text[0] == ' ') {
	$old_line++;
	}
	if ($text[0] == '+' \|\| $text[0] == ' ') {
	$new_line++;
	}
	if ($new_line == $line) {
	return $old_line;
	}
	}

	// We didn't find the target line.
	return $line;
	}

	private function loadParentCommitOf($commit) {
	$drequest = $this->getDiffusionRequest();
	$user = $this->getRequest()->getUser();

	$before_req = DiffusionRequest::newFromDictionary(
	array(
	'user' => $user,
	'repository' => $drequest->getRepository(),
	'commit' => $commit,
	));

	$parents = DiffusionQuery::callConduitWithDiffusionRequest(
	$user,
	$before_req,
	'diffusion.commitparentsquery',
	array(
	'commit' => $commit,
	));

	return head($parents);
	}

	private function renderRevisionTooltip(
	DifferentialRevision $revision,
	array $handles) {
	$viewer = $this->getRequest()->getUser();

	$date = phabricator_date($revision->getDateModified(), $viewer);
	$id = $revision->getID();
	$title = $revision->getTitle();
	$header = "D{$id} {$title}";

	$author = $handles[$revision->getAuthorPHID()]->getName();

	return "{$header}\n{$date} \xC2\xB7 {$author}";
	}

	private function renderCommitTooltip(
	PhabricatorRepositoryCommit $commit,
	array $handles,
	$author) {

	$viewer = $this->getRequest()->getUser();

	$date = phabricator_date($commit->getEpoch(), $viewer);
	$summary = trim($commit->getSummary());

	if ($commit->getAuthorPHID()) {
	$author = $handles[$commit->getAuthorPHID()]->getName();
	}

	return "{$summary}\n{$date} \xC2\xB7 {$author}";
	}

	}
	diff --git a/src/applications/feed/story/PhabricatorFeedStory.php b/src/applications/feed/story/PhabricatorFeedStory.php
	index 04d5b7fd75..c38c05faa3 100644
	--- a/src/applications/feed/story/PhabricatorFeedStory.php
	+++ b/src/applications/feed/story/PhabricatorFeedStory.php
	@@ -1,500 +1,502 @@
	<?php

	/**
	* Manages rendering and aggregation of a story. A story is an event (like a
	* user adding a comment) which may be represented in different forms on
	* different channels (like feed, notifications and realtime alerts).
	*
	* @task load Loading Stories
	* @task policy Policy Implementation
	*/
	abstract class PhabricatorFeedStory
	implements
	PhabricatorPolicyInterface,
	PhabricatorMarkupInterface {

	private $data;
	private $hasViewed;
	private $framed;
	private $hovercard = false;
	private $renderingTarget = PhabricatorApplicationTransaction::TARGET_HTML;

	private $handles = array();
	private $objects = array();
	private $projectPHIDs = array();
	private $markupFieldOutput = array();

	/* -( Loading Stories )---------------------------------------------------- */


	/**
	* Given @{class:PhabricatorFeedStoryData} rows, load them into objects and
	* construct appropriate @{class:PhabricatorFeedStory} wrappers for each
	* data row.
	*
	* @param list<dict> List of @{class:PhabricatorFeedStoryData} rows from the
	* database.
	* @return list<PhabricatorFeedStory> List of @{class:PhabricatorFeedStory}
	* objects.
	* @task load
	*/
	public static function loadAllFromRows(array $rows, PhabricatorUser $viewer) {
	$stories = array();

	$data = id(new PhabricatorFeedStoryData())->loadAllFromArray($rows);
	foreach ($data as $story_data) {
	$class = $story_data->getStoryType();

	try {
	$ok =
	class_exists($class) &&
	is_subclass_of($class, 'PhabricatorFeedStory');
	} catch (PhutilMissingSymbolException $ex) {
	$ok = false;
	}

	// If the story type isn't a valid class or isn't a subclass of
	// PhabricatorFeedStory, decline to load it.
	if (!$ok) {
	continue;
	}

	$key = $story_data->getChronologicalKey();
	$stories[$key] = newv($class, array($story_data));
	}

	$object_phids = array();
	$key_phids = array();
	foreach ($stories as $key => $story) {
	$phids = array();
	foreach ($story->getRequiredObjectPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	if ($story->getPrimaryObjectPHID()) {
	$phids[$story->getPrimaryObjectPHID()] = true;
	}
	$key_phids[$key] = $phids;
	$object_phids += $phids;
	}

	$objects = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	->withPHIDs(array_keys($object_phids))
	->execute();

	foreach ($key_phids as $key => $phids) {
	if (!$phids) {
	continue;
	}
	$story_objects = array_select_keys($objects, array_keys($phids));
	if (count($story_objects) != count($phids)) {
	// An object this story requires either does not exist or is not visible
	// to the user. Decline to render the story.
	unset($stories[$key]);
	unset($key_phids[$key]);
	continue;
	}

	$stories[$key]->setObjects($story_objects);
	}

	// If stories are about PhabricatorProjectInterface objects, load the
	// projects the objects are a part of so we can render project tags
	// on the stories.

	$project_phids = array();
	foreach ($objects as $object) {
	if ($object instanceof PhabricatorProjectInterface) {
	$project_phids[$object->getPHID()] = array();
	}
	}

	if ($project_phids) {
	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array_keys($project_phids))
	->withEdgeTypes(
	array(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	));
	$edge_query->execute();
	foreach ($project_phids as $phid => $ignored) {
	$project_phids[$phid] = $edge_query->getDestinationPHIDs(array($phid));
	}
	}

	$handle_phids = array();
	foreach ($stories as $key => $story) {
	foreach ($story->getRequiredHandlePHIDs() as $phid) {
	$key_phids[$key][$phid] = true;
	}
	if ($story->getAuthorPHID()) {
	$key_phids[$key][$story->getAuthorPHID()] = true;
	}

	$object_phid = $story->getPrimaryObjectPHID();
	$object_project_phids = idx($project_phids, $object_phid, array());
	$story->setProjectPHIDs($object_project_phids);
	foreach ($object_project_phids as $dst) {
	$key_phids[$key][$dst] = true;
	}

	$handle_phids += $key_phids[$key];
	}

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs(array_keys($handle_phids))
	->execute();

	foreach ($key_phids as $key => $phids) {
	if (!$phids) {
	continue;
	}
	$story_handles = array_select_keys($handles, array_keys($phids));
	$stories[$key]->setHandles($story_handles);
	}

	// Load and process story markup blocks.

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($viewer);
	foreach ($stories as $story) {
	foreach ($story->getFieldStoryMarkupFields() as $field) {
	$engine->addObject($story, $field);
	}
	}

	$engine->process();

	foreach ($stories as $story) {
	foreach ($story->getFieldStoryMarkupFields() as $field) {
	$story->setMarkupFieldOutput(
	$field,
	$engine->getOutput($story, $field));
	}
	}

	return $stories;
	}

	public function setMarkupFieldOutput($field, $output) {
	$this->markupFieldOutput[$field] = $output;
	return $this;
	}

	public function getMarkupFieldOutput($field) {
	if (!array_key_exists($field, $this->markupFieldOutput)) {
	throw new Exception(
	pht(
	'Trying to retrieve markup field key "%s", but this feed story '.
	'did not request it be rendered.',
	$field));
	}

	return $this->markupFieldOutput[$field];
	}

	public function setHovercard($hover) {
	$this->hovercard = $hover;
	return $this;
	}

	public function setRenderingTarget($target) {
	$this->validateRenderingTarget($target);
	$this->renderingTarget = $target;
	return $this;
	}

	public function getRenderingTarget() {
	return $this->renderingTarget;
	}

	private function validateRenderingTarget($target) {
	switch ($target) {
	case PhabricatorApplicationTransaction::TARGET_HTML:
	case PhabricatorApplicationTransaction::TARGET_TEXT:
	break;
	default:
	throw new Exception('Unknown rendering target: '.$target);
	break;
	}
	}

	public function setObjects(array $objects) {
	$this->objects = $objects;
	return $this;
	}

	public function getObject($phid) {
	$object = idx($this->objects, $phid);
	if (!$object) {
	throw new Exception(
	"Story is asking for an object it did not request ('{$phid}')!");
	}
	return $object;
	}

	public function getPrimaryObject() {
	$phid = $this->getPrimaryObjectPHID();
	if (!$phid) {
	throw new Exception('Story has no primary object!');
	}
	return $this->getObject($phid);
	}

	public function getPrimaryObjectPHID() {
	return null;
	}

	final public function __construct(PhabricatorFeedStoryData $data) {
	$this->data = $data;
	}

	abstract public function renderView();

	public function getRequiredHandlePHIDs() {
	return array();
	}

	public function getRequiredObjectPHIDs() {
	return array();
	}

	public function setHasViewed($has_viewed) {
	$this->hasViewed = $has_viewed;
	return $this;
	}

	public function getHasViewed() {
	return $this->hasViewed;
	}

	final public function setFramed($framed) {
	$this->framed = $framed;
	return $this;
	}

	final public function setHandles(array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	$this->handles = $handles;
	return $this;
	}

	final protected function getObjects() {
	return $this->objects;
	}

	final protected function getHandles() {
	return $this->handles;
	}

	final protected function getHandle($phid) {
	if (isset($this->handles[$phid])) {
	if ($this->handles[$phid] instanceof PhabricatorObjectHandle) {
	return $this->handles[$phid];
	}
	}

	$handle = new PhabricatorObjectHandle();
	$handle->setPHID($phid);
	$handle->setName("Unloaded Object '{$phid}'");

	return $handle;
	}

	final public function getStoryData() {
	return $this->data;
	}

	final public function getEpoch() {
	return $this->getStoryData()->getEpoch();
	}

	final public function getChronologicalKey() {
	return $this->getStoryData()->getChronologicalKey();
	}

	final public function getValue($key, $default = null) {
	return $this->getStoryData()->getValue($key, $default);
	}

	final public function getAuthorPHID() {
	return $this->getStoryData()->getAuthorPHID();
	}

	final protected function renderHandleList(array $phids) {
	$items = array();
	foreach ($phids as $phid) {
	$items[] = $this->linkTo($phid);
	}
	$list = null;
	switch ($this->getRenderingTarget()) {
	case PhabricatorApplicationTransaction::TARGET_TEXT:
	$list = implode(', ', $items);
	break;
	case PhabricatorApplicationTransaction::TARGET_HTML:
	$list = phutil_implode_html(', ', $items);
	break;
	}
	return $list;
	}

	final protected function linkTo($phid) {
	$handle = $this->getHandle($phid);

	switch ($this->getRenderingTarget()) {
	case PhabricatorApplicationTransaction::TARGET_TEXT:
	return $handle->getLinkName();
	}

	// NOTE: We render our own link here to customize the styling and add
	// the '_top' target for framed feeds.

	$class = null;
	if ($handle->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
	$class = 'phui-link-person';
	}

	return javelin_tag(
	'a',
	array(
	'href' => $handle->getURI(),
	'target' => $this->framed ? '_top' : null,
	'sigil' => $this->hovercard ? 'hovercard' : null,
	'meta' => $this->hovercard ? array('hoverPHID' => $phid) : null,
	'class' => $class,
	),
	$handle->getLinkName());
	}

	final protected function renderString($str) {
	switch ($this->getRenderingTarget()) {
	case PhabricatorApplicationTransaction::TARGET_TEXT:
	return $str;
	case PhabricatorApplicationTransaction::TARGET_HTML:
	return phutil_tag('strong', array(), $str);
	}
	}

	final protected function renderSummary($text, $len = 128) {
	if ($len) {
	- $text = phutil_utf8_shorten($text, $len);
	+ $text = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs($len)
	+ ->truncateString($text);
	}
	switch ($this->getRenderingTarget()) {
	case PhabricatorApplicationTransaction::TARGET_HTML:
	$text = phutil_escape_html_newlines($text);
	break;
	}
	return $text;
	}

	public function getNotificationAggregations() {
	return array();
	}

	protected function newStoryView() {
	$view = id(new PHUIFeedStoryView())
	->setChronologicalKey($this->getChronologicalKey())
	->setEpoch($this->getEpoch())
	->setViewed($this->getHasViewed());

	$project_phids = $this->getProjectPHIDs();
	if ($project_phids) {
	$view->setTags($this->renderHandleList($project_phids));
	}

	return $view;
	}

	public function setProjectPHIDs(array $phids) {
	$this->projectPHIDs = $phids;
	return $this;
	}

	public function getProjectPHIDs() {
	return $this->projectPHIDs;
	}

	public function getFieldStoryMarkupFields() {
	return array();
	}


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */

	public function getPHID() {
	return null;
	}

	/**
	* @task policy
	*/
	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	);
	}


	/**
	* @task policy
	*/
	public function getPolicy($capability) {
	// If this story's primary object is a policy-aware object, use its policy
	// to control story visiblity.

	$primary_phid = $this->getPrimaryObjectPHID();
	if (isset($this->objects[$primary_phid])) {
	$object = $this->objects[$primary_phid];
	if ($object instanceof PhabricatorPolicyInterface) {
	return $object->getPolicy($capability);
	}
	}

	// TODO: Remove this once all objects are policy-aware. For now, keep
	// respecting the `feed.public` setting.
	return PhabricatorEnv::getEnvConfig('feed.public')
	? PhabricatorPolicies::POLICY_PUBLIC
	: PhabricatorPolicies::POLICY_USER;
	}


	/**
	* @task policy
	*/
	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return false;
	}

	public function describeAutomaticCapability($capability) {
	return null;
	}


	/* -( PhabricatorMarkupInterface Implementation )--------------------------- */


	public function getMarkupFieldKey($field) {
	return 'feed:'.$this->getChronologicalKey().':'.$field;
	}

	public function newMarkupEngine($field) {
	return PhabricatorMarkupEngine::newMarkupEngine(array());
	}

	public function getMarkupText($field) {
	throw new PhutilMethodNotImplementedException();
	}

	public function didMarkupText(
	$field,
	$output,
	PhutilMarkupEngine $engine) {
	return $output;
	}

	public function shouldUseMarkupCache($field) {
	return true;
	}

	}
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	index 2c4b4f9bab..4c2215a93a 100644
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	@@ -1,412 +1,414 @@
	<?php

	final class HarbormasterBuild extends HarbormasterDAO
	implements PhabricatorPolicyInterface {

	protected $buildablePHID;
	protected $buildPlanPHID;
	protected $buildStatus;
	protected $buildGeneration;

	private $buildable = self::ATTACHABLE;
	private $buildPlan = self::ATTACHABLE;
	private $buildTargets = self::ATTACHABLE;
	private $unprocessedCommands = self::ATTACHABLE;

	/**
	* Not currently being built.
	*/
	const STATUS_INACTIVE = 'inactive';

	/**
	* Pending pick up by the Harbormaster daemon.
	*/
	const STATUS_PENDING = 'pending';

	/**
	* Current building the buildable.
	*/
	const STATUS_BUILDING = 'building';

	/**
	* The build has passed.
	*/
	const STATUS_PASSED = 'passed';

	/**
	* The build has failed.
	*/
	const STATUS_FAILED = 'failed';

	/**
	* The build encountered an unexpected error.
	*/
	const STATUS_ERROR = 'error';

	/**
	* The build has been stopped.
	*/
	const STATUS_STOPPED = 'stopped';

	/**
	* The build has been deadlocked.
	*/
	const STATUS_DEADLOCKED = 'deadlocked';


	/**
	* Get a human readable name for a build status constant.
	*
	* @param const Build status constant.
	* @return string Human-readable name.
	*/
	public static function getBuildStatusName($status) {
	switch ($status) {
	case self::STATUS_INACTIVE:
	return pht('Inactive');
	case self::STATUS_PENDING:
	return pht('Pending');
	case self::STATUS_BUILDING:
	return pht('Building');
	case self::STATUS_PASSED:
	return pht('Passed');
	case self::STATUS_FAILED:
	return pht('Failed');
	case self::STATUS_ERROR:
	return pht('Unexpected Error');
	case self::STATUS_STOPPED:
	return pht('Paused');
	case self::STATUS_DEADLOCKED:
	return pht('Deadlocked');
	default:
	return pht('Unknown');
	}
	}

	public static function getBuildStatusIcon($status) {
	switch ($status) {
	case self::STATUS_INACTIVE:
	case self::STATUS_PENDING:
	return PHUIStatusItemView::ICON_OPEN;
	case self::STATUS_BUILDING:
	return PHUIStatusItemView::ICON_RIGHT;
	case self::STATUS_PASSED:
	return PHUIStatusItemView::ICON_ACCEPT;
	case self::STATUS_FAILED:
	return PHUIStatusItemView::ICON_REJECT;
	case self::STATUS_ERROR:
	return PHUIStatusItemView::ICON_MINUS;
	case self::STATUS_STOPPED:
	return PHUIStatusItemView::ICON_MINUS;
	case self::STATUS_DEADLOCKED:
	return PHUIStatusItemView::ICON_WARNING;
	default:
	return PHUIStatusItemView::ICON_QUESTION;
	}
	}

	public static function getBuildStatusColor($status) {
	switch ($status) {
	case self::STATUS_INACTIVE:
	return 'dark';
	case self::STATUS_PENDING:
	case self::STATUS_BUILDING:
	return 'blue';
	case self::STATUS_PASSED:
	return 'green';
	case self::STATUS_FAILED:
	case self::STATUS_ERROR:
	case self::STATUS_DEADLOCKED:
	return 'red';
	case self::STATUS_STOPPED:
	return 'dark';
	default:
	return 'bluegrey';
	}
	}

	public static function initializeNewBuild(PhabricatorUser $actor) {
	return id(new HarbormasterBuild())
	->setBuildStatus(self::STATUS_INACTIVE)
	->setBuildGeneration(0);
	}

	public function delete() {
	$this->openTransaction();
	$this->deleteUnprocessedCommands();
	$result = parent::delete();
	$this->saveTransaction();

	return $result;
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	HarbormasterBuildPHIDType::TYPECONST);
	}

	public function attachBuildable(HarbormasterBuildable $buildable) {
	$this->buildable = $buildable;
	return $this;
	}

	public function getBuildable() {
	return $this->assertAttached($this->buildable);
	}

	public function getName() {
	if ($this->getBuildPlan()) {
	return $this->getBuildPlan()->getName();
	}
	return pht('Build');
	}

	public function attachBuildPlan(
	HarbormasterBuildPlan $build_plan = null) {
	$this->buildPlan = $build_plan;
	return $this;
	}

	public function getBuildPlan() {
	return $this->assertAttached($this->buildPlan);
	}

	public function getBuildTargets() {
	return $this->assertAttached($this->buildTargets);
	}

	public function attachBuildTargets(array $targets) {
	$this->buildTargets = $targets;
	return $this;
	}

	public function isBuilding() {
	return $this->getBuildStatus() === self::STATUS_PENDING \|\|
	$this->getBuildStatus() === self::STATUS_BUILDING;
	}

	public function createLog(
	HarbormasterBuildTarget $build_target,
	$log_source,
	$log_type) {

	- $log_source = phutil_utf8_shorten($log_source, 250);
	+ $log_source = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumCodepoints(250)
	+ ->truncateString($log_source);

	$log = HarbormasterBuildLog::initializeNewBuildLog($build_target)
	->setLogSource($log_source)
	->setLogType($log_type)
	->save();

	return $log;
	}

	public function createArtifact(
	HarbormasterBuildTarget $build_target,
	$artifact_key,
	$artifact_type) {

	$artifact =
	HarbormasterBuildArtifact::initializeNewBuildArtifact($build_target);
	$artifact->setArtifactKey(
	$this->getPHID(),
	$this->getBuildGeneration(),
	$artifact_key);
	$artifact->setArtifactType($artifact_type);
	$artifact->save();
	return $artifact;
	}

	public function loadArtifact($name) {
	$artifact = id(new HarbormasterBuildArtifactQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withArtifactKeys(
	$this->getPHID(),
	$this->getBuildGeneration(),
	array($name))
	->executeOne();
	if ($artifact === null) {
	throw new Exception('Artifact not found!');
	}
	return $artifact;
	}

	public function retrieveVariablesFromBuild() {
	$results = array(
	'buildable.diff' => null,
	'buildable.revision' => null,
	'buildable.commit' => null,
	'repository.callsign' => null,
	'repository.vcs' => null,
	'repository.uri' => null,
	'step.timestamp' => null,
	'build.id' => null,
	);

	$buildable = $this->getBuildable();
	$object = $buildable->getBuildableObject();

	$object_variables = $object->getBuildVariables();

	$results = $object_variables + $results;

	$results['step.timestamp'] = time();
	$results['build.id'] = $this->getID();

	return $results;
	}

	public static function getAvailableBuildVariables() {
	$objects = id(new PhutilSymbolLoader())
	->setAncestorClass('HarbormasterBuildableInterface')
	->loadObjects();

	$variables = array();
	$variables[] = array(
	'step.timestamp' => pht('The current UNIX timestamp.'),
	'build.id' => pht('The ID of the current build.'),
	'target.phid' => pht('The PHID of the current build target.'),
	);

	foreach ($objects as $object) {
	$variables[] = $object->getAvailableBuildVariables();
	}

	$variables = array_mergev($variables);
	return $variables;
	}

	public function isComplete() {
	switch ($this->getBuildStatus()) {
	case self::STATUS_PASSED:
	case self::STATUS_FAILED:
	case self::STATUS_ERROR:
	case self::STATUS_STOPPED:
	return true;
	}

	return false;
	}

	public function isStopped() {
	return ($this->getBuildStatus() == self::STATUS_STOPPED);
	}


	/* -( Build Commands )----------------------------------------------------- */


	private function getUnprocessedCommands() {
	return $this->assertAttached($this->unprocessedCommands);
	}

	public function attachUnprocessedCommands(array $commands) {
	$this->unprocessedCommands = $commands;
	return $this;
	}

	public function canRestartBuild() {
	return !$this->isRestarting();
	}

	public function canStopBuild() {
	return !$this->isComplete() &&
	!$this->isStopped() &&
	!$this->isStopping();
	}

	public function canResumeBuild() {
	return $this->isStopped() &&
	!$this->isResuming();
	}

	public function isStopping() {
	$is_stopping = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_STOP:
	$is_stopping = true;
	break;
	case HarbormasterBuildCommand::COMMAND_RESUME:
	case HarbormasterBuildCommand::COMMAND_RESTART:
	$is_stopping = false;
	break;
	}
	}

	return $is_stopping;
	}

	public function isResuming() {
	$is_resuming = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_RESTART:
	case HarbormasterBuildCommand::COMMAND_RESUME:
	$is_resuming = true;
	break;
	case HarbormasterBuildCommand::COMMAND_STOP:
	$is_resuming = false;
	break;
	}
	}

	return $is_resuming;
	}

	public function isRestarting() {
	$is_restarting = false;
	foreach ($this->getUnprocessedCommands() as $command_object) {
	$command = $command_object->getCommand();
	switch ($command) {
	case HarbormasterBuildCommand::COMMAND_RESTART:
	$is_restarting = true;
	break;
	}
	}

	return $is_restarting;
	}

	public function deleteUnprocessedCommands() {
	foreach ($this->getUnprocessedCommands() as $key => $command_object) {
	$command_object->delete();
	unset($this->unprocessedCommands[$key]);
	}

	return $this;
	}


	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	return $this->getBuildable()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getBuildable()->hasAutomaticCapability(
	$capability,
	$viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('A build inherits policies from its buildable.');
	}

	}
	diff --git a/src/applications/herald/storage/transcript/HeraldObjectTranscript.php b/src/applications/herald/storage/transcript/HeraldObjectTranscript.php
	index e63dc7d6b2..1edc24adc1 100644
	--- a/src/applications/herald/storage/transcript/HeraldObjectTranscript.php
	+++ b/src/applications/herald/storage/transcript/HeraldObjectTranscript.php
	@@ -1,75 +1,75 @@
	<?php

	final class HeraldObjectTranscript {

	protected $phid;
	protected $type;
	protected $name;
	protected $fields;

	public function setPHID($phid) {
	$this->phid = $phid;
	return $this;
	}

	public function getPHID() {
	return $this->phid;
	}

	public function setType($type) {
	$this->type = $type;
	return $this;
	}

	public function getType() {
	return $this->type;
	}

	public function setName($name) {
	$this->name = $name;
	return $this;
	}

	public function getName() {
	return $this->name;
	}

	public function setFields(array $fields) {
	foreach ($fields as $key => $value) {
	$fields[$key] = self::truncateValue($value, 4096);
	}

	$this->fields = $fields;
	return $this;
	}

	public function getFields() {
	return $this->fields;
	}

	private static function truncateValue($value, $length) {
	if (is_string($value)) {
	if (strlen($value) <= $length) {
	return $value;
	} else {
	- // NOTE: phutil_utf8_shorten() has huge runtime for giant strings.
	+ // NOTE: PhutilUTF8StringTruncator has huge runtime for giant strings.
	return phutil_utf8ize(substr($value, 0, $length)."\n<...>");
	}
	} else if (is_array($value)) {
	foreach ($value as $key => $v) {
	if ($length <= 0) {
	$value['<...>'] = '<...>';
	unset($value[$key]);
	} else {
	$v = self::truncateValue($v, $length);
	$length -= strlen($v);
	$value[$key] = $v;
	}
	}
	return $value;
	} else {
	return $value;
	}
	}

	}
	diff --git a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php b/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
	index 792f1a8068..bd0c771361 100644
	--- a/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
	+++ b/src/applications/maniphest/export/ManiphestExcelDefaultFormat.php
	@@ -1,138 +1,140 @@
	<?php

	final class ManiphestExcelDefaultFormat extends ManiphestExcelFormat {

	public function getName() {
	return pht('Default');
	}

	public function getFileName() {
	return 'maniphest_tasks_'.date('Ymd');
	}

	/**
	* @phutil-external-symbol class PHPExcel
	* @phutil-external-symbol class PHPExcel_IOFactory
	* @phutil-external-symbol class PHPExcel_Style_NumberFormat
	* @phutil-external-symbol class PHPExcel_Cell_DataType
	*/
	public function buildWorkbook(
	PHPExcel $workbook,
	array $tasks,
	array $handles,
	PhabricatorUser $user) {

	$sheet = $workbook->setActiveSheetIndex(0);
	$sheet->setTitle(pht('Tasks'));

	$widths = array(
	null,
	15,
	null,
	10,
	15,
	15,
	60,
	30,
	20,
	100,
	);

	foreach ($widths as $col => $width) {
	if ($width !== null) {
	$sheet->getColumnDimension($this->col($col))->setWidth($width);
	}
	}

	$status_map = ManiphestTaskStatus::getTaskStatusMap();
	$pri_map = ManiphestTaskPriority::getTaskPriorityMap();

	$date_format = null;

	$rows = array();
	$rows[] = array(
	pht('ID'),
	pht('Owner'),
	pht('Status'),
	pht('Priority'),
	pht('Date Created'),
	pht('Date Updated'),
	pht('Title'),
	pht('Projects'),
	pht('URI'),
	pht('Description'),
	);

	$is_date = array(
	false,
	false,
	false,
	false,
	true,
	true,
	false,
	false,
	false,
	false,
	);

	$header_format = array(
	'font' => array(
	'bold' => true,
	),
	);

	foreach ($tasks as $task) {
	$task_owner = null;
	if ($task->getOwnerPHID()) {
	$task_owner = $handles[$task->getOwnerPHID()]->getName();
	}

	$projects = array();
	foreach ($task->getProjectPHIDs() as $phid) {
	$projects[] = $handles[$phid]->getName();
	}
	$projects = implode(', ', $projects);

	$rows[] = array(
	'T'.$task->getID(),
	$task_owner,
	idx($status_map, $task->getStatus(), '?'),
	idx($pri_map, $task->getPriority(), '?'),
	$this->computeExcelDate($task->getDateCreated()),
	$this->computeExcelDate($task->getDateModified()),
	$task->getTitle(),
	$projects,
	PhabricatorEnv::getProductionURI('/T'.$task->getID()),
	- phutil_utf8_shorten($task->getDescription(), 512),
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumBytes(512)
	+ ->truncateString($task->getDescription()),
	);
	}

	foreach ($rows as $row => $cols) {
	foreach ($cols as $col => $spec) {
	$cell_name = $this->col($col).($row + 1);
	$cell = $sheet
	->setCellValue($cell_name, $spec, $return_cell = true);

	if ($row == 0) {
	$sheet->getStyle($cell_name)->applyFromArray($header_format);
	}

	if ($is_date[$col]) {
	$code = PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2;
	$sheet
	->getStyle($cell_name)
	->getNumberFormat()
	->setFormatCode($code);
	} else {
	$cell->setDataType(PHPExcel_Cell_DataType::TYPE_STRING);
	}
	}
	}
	}

	private function col($n) {
	return chr(ord('A') + $n);
	}

	}
	diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
	index 3571a2f1ab..9ac771ea23 100644
	--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
	+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
	@@ -1,937 +1,939 @@
	<?php

	/**
	* @task recipients Managing Recipients
	*/
	final class PhabricatorMetaMTAMail extends PhabricatorMetaMTADAO {

	const STATUS_QUEUE = 'queued';
	const STATUS_SENT = 'sent';
	const STATUS_FAIL = 'fail';
	const STATUS_VOID = 'void';

	const RETRY_DELAY = 5;

	protected $parameters;
	protected $status;
	protected $message;
	protected $relatedPHID;

	private $recipientExpansionMap;

	public function __construct() {

	$this->status = self::STATUS_QUEUE;
	$this->parameters = array();

	parent::__construct();
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'parameters' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	protected function setParam($param, $value) {
	$this->parameters[$param] = $value;
	return $this;
	}

	protected function getParam($param, $default = null) {
	return idx($this->parameters, $param, $default);
	}

	/**
	* Set tags (@{class:MetaMTANotificationType} constants) which identify the
	* content of this mail in a general way. These tags are used to allow users
	* to opt out of receiving certain types of mail, like updates when a task's
	* projects change.
	*
	* @param list<const> List of @{class:MetaMTANotificationType} constants.
	* @return this
	*/
	public function setMailTags(array $tags) {
	$this->setParam('mailtags', array_unique($tags));
	return $this;
	}

	public function getMailTags() {
	return $this->getParam('mailtags', array());
	}

	/**
	* In Gmail, conversations will be broken if you reply to a thread and the
	* server sends back a response without referencing your Message-ID, even if
	* it references a Message-ID earlier in the thread. To avoid this, use the
	* parent email's message ID explicitly if it's available. This overwrites the
	* "In-Reply-To" and "References" headers we would otherwise generate. This
	* needs to be set whenever an action is triggered by an email message. See
	* T251 for more details.
	*
	* @param string The "Message-ID" of the email which precedes this one.
	* @return this
	*/
	public function setParentMessageID($id) {
	$this->setParam('parent-message-id', $id);
	return $this;
	}

	public function getParentMessageID() {
	return $this->getParam('parent-message-id');
	}

	public function getSubject() {
	return $this->getParam('subject');
	}

	public function addTos(array $phids) {
	$phids = array_unique($phids);
	$this->setParam('to', $phids);
	return $this;
	}

	public function addRawTos(array $raw_email) {

	// Strip addresses down to bare emails, since the MailAdapter API currently
	// requires we pass it just the address (like `alincoln@logcabin.org`), not
	// a full string like `"Abraham Lincoln" <alincoln@logcabin.org>`.
	foreach ($raw_email as $key => $email) {
	$object = new PhutilEmailAddress($email);
	$raw_email[$key] = $object->getAddress();
	}

	$this->setParam('raw-to', $raw_email);
	return $this;
	}

	public function addCCs(array $phids) {
	$phids = array_unique($phids);
	$this->setParam('cc', $phids);
	return $this;
	}

	public function setExcludeMailRecipientPHIDs(array $exclude) {
	$this->setParam('exclude', $exclude);
	return $this;
	}

	private function getExcludeMailRecipientPHIDs() {
	return $this->getParam('exclude', array());
	}

	public function getTranslation(array $objects) {
	$default_translation = PhabricatorEnv::getEnvConfig('translation.provider');
	$return = null;
	$recipients = array_merge(
	idx($this->parameters, 'to', array()),
	idx($this->parameters, 'cc', array()));
	foreach (array_select_keys($objects, $recipients) as $object) {
	$translation = null;
	if ($object instanceof PhabricatorUser) {
	$translation = $object->getTranslation();
	}
	if (!$translation) {
	$translation = $default_translation;
	}
	if ($return && $translation != $return) {
	return $default_translation;
	}
	$return = $translation;
	}

	if (!$return) {
	$return = $default_translation;
	}

	return $return;
	}

	public function addPHIDHeaders($name, array $phids) {
	foreach ($phids as $phid) {
	$this->addHeader($name, '<'.$phid.'>');
	}
	return $this;
	}

	public function addHeader($name, $value) {
	$this->parameters['headers'][] = array($name, $value);
	return $this;
	}

	public function addAttachment(PhabricatorMetaMTAAttachment $attachment) {
	$this->parameters['attachments'][] = $attachment->toDictionary();
	return $this;
	}

	public function getAttachments() {
	$dicts = $this->getParam('attachments');

	$result = array();
	foreach ($dicts as $dict) {
	$result[] = PhabricatorMetaMTAAttachment::newFromDictionary($dict);
	}
	return $result;
	}

	public function setAttachments(array $attachments) {
	assert_instances_of($attachments, 'PhabricatorMetaMTAAttachment');
	$this->setParam('attachments', mpull($attachments, 'toDictionary'));
	return $this;
	}

	public function setFrom($from) {
	$this->setParam('from', $from);
	return $this;
	}

	public function setReplyTo($reply_to) {
	$this->setParam('reply-to', $reply_to);
	return $this;
	}

	public function setSubject($subject) {
	$this->setParam('subject', $subject);
	return $this;
	}

	public function setSubjectPrefix($prefix) {
	$this->setParam('subject-prefix', $prefix);
	return $this;
	}

	public function setVarySubjectPrefix($prefix) {
	$this->setParam('vary-subject-prefix', $prefix);
	return $this;
	}

	public function setBody($body) {
	$this->setParam('body', $body);
	return $this;
	}

	public function setHTMLBody($html) {
	$this->setParam('html-body', $html);
	return $this;
	}

	public function getBody() {
	return $this->getParam('body');
	}

	public function getHTMLBody() {
	return $this->getParam('html-body');
	}

	public function setIsErrorEmail($is_error) {
	$this->setParam('is-error', $is_error);
	return $this;
	}

	public function getIsErrorEmail() {
	return $this->getParam('is-error', false);
	}

	public function getToPHIDs() {
	return $this->getParam('to', array());
	}

	public function getRawToAddresses() {
	return $this->getParam('raw-to', array());
	}

	public function getCcPHIDs() {
	return $this->getParam('cc', array());
	}

	/**
	* Force delivery of a message, even if recipients have preferences which
	* would otherwise drop the message.
	*
	* This is primarily intended to let users who don't want any email still
	* receive things like password resets.
	*
	* @param bool True to force delivery despite user preferences.
	* @return this
	*/
	public function setForceDelivery($force) {
	$this->setParam('force', $force);
	return $this;
	}

	public function getForceDelivery() {
	return $this->getParam('force', false);
	}

	/**
	* Flag that this is an auto-generated bulk message and should have bulk
	* headers added to it if appropriate. Broadly, this means some flavor of
	* "Precedence: bulk" or similar, but is implementation and configuration
	* dependent.
	*
	* @param bool True if the mail is automated bulk mail.
	* @return this
	*/
	public function setIsBulk($is_bulk) {
	$this->setParam('is-bulk', $is_bulk);
	return $this;
	}

	/**
	* Use this method to set an ID used for message threading. MetaMTA will
	* set appropriate headers (Message-ID, In-Reply-To, References and
	* Thread-Index) based on the capabilities of the underlying mailer.
	*
	* @param string Unique identifier, appropriate for use in a Message-ID,
	* In-Reply-To or References headers.
	* @param bool If true, indicates this is the first message in the thread.
	* @return this
	*/
	public function setThreadID($thread_id, $is_first_message = false) {
	$this->setParam('thread-id', $thread_id);
	$this->setParam('is-first-message', $is_first_message);
	return $this;
	}

	/**
	* Save a newly created mail to the database. The mail will eventually be
	* delivered by the MetaMTA daemon.
	*
	* @return this
	*/
	public function saveAndSend() {
	return $this->save();
	}

	public function save() {
	if ($this->getID()) {
	return parent::save();
	}

	// NOTE: When mail is sent from CLI scripts that run tasks in-process, we
	// may re-enter this method from within scheduleTask(). The implementation
	// is intended to avoid anything awkward if we end up reentering this
	// method.

	$this->openTransaction();
	// Save to generate a task ID.
	$result = parent::save();

	// Queue a task to send this mail.
	$mailer_task = PhabricatorWorker::scheduleTask(
	'PhabricatorMetaMTAWorker',
	$this->getID(),
	PhabricatorWorker::PRIORITY_ALERTS);

	$this->saveTransaction();

	return $result;
	}

	public function buildDefaultMailer() {
	return PhabricatorEnv::newObjectFromConfig('metamta.mail-adapter');
	}


	/**
	* Attempt to deliver an email immediately, in this process.
	*
	* @param bool Try to deliver this email even if it has already been
	* delivered or is in backoff after a failed delivery attempt.
	* @param PhabricatorMailImplementationAdapter Use a specific mail adapter,
	* instead of the default.
	*
	* @return void
	*/
	public function sendNow(
	$force_send = false,
	PhabricatorMailImplementationAdapter $mailer = null) {

	if ($mailer === null) {
	$mailer = $this->buildDefaultMailer();
	}

	if (!$force_send) {
	if ($this->getStatus() != self::STATUS_QUEUE) {
	throw new Exception('Trying to send an already-sent mail!');
	}
	}

	try {
	$params = $this->parameters;

	$actors = $this->loadAllActors();
	$deliverable_actors = $this->filterDeliverableActors($actors);

	$default_from = PhabricatorEnv::getEnvConfig('metamta.default-address');
	if (empty($params['from'])) {
	$mailer->setFrom($default_from);
	}

	$is_first = idx($params, 'is-first-message');
	unset($params['is-first-message']);

	$is_threaded = (bool)idx($params, 'thread-id');

	$reply_to_name = idx($params, 'reply-to-name', '');
	unset($params['reply-to-name']);

	$add_cc = array();
	$add_to = array();

	// Only try to use preferences if everything is multiplexed, so we
	// get consistent behavior.
	$use_prefs = self::shouldMultiplexAllMail();

	$prefs = null;
	if ($use_prefs) {

	// If multiplexing is enabled, some recipients will be in "Cc"
	// rather than "To". We'll move them to "To" later (or supply a
	// dummy "To") but need to look for the recipient in either the
	// "To" or "Cc" fields here.
	$target_phid = head(idx($params, 'to', array()));
	if (!$target_phid) {
	$target_phid = head(idx($params, 'cc', array()));
	}

	if ($target_phid) {
	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$target_phid);
	if ($user) {
	$prefs = $user->loadPreferences();
	}
	}
	}

	foreach ($params as $key => $value) {
	switch ($key) {
	case 'from':
	$from = $value;
	$actor_email = null;
	$actor_name = null;
	$actor = idx($actors, $from);
	if ($actor) {
	$actor_email = $actor->getEmailAddress();
	$actor_name = $actor->getName();
	}
	$can_send_as_user = $actor_email &&
	PhabricatorEnv::getEnvConfig('metamta.can-send-as-user');

	if ($can_send_as_user) {
	$mailer->setFrom($actor_email, $actor_name);
	} else {
	$from_email = coalesce($actor_email, $default_from);
	$from_name = coalesce($actor_name, pht('Phabricator'));

	if (empty($params['reply-to'])) {
	$params['reply-to'] = $from_email;
	$params['reply-to-name'] = $from_name;
	}

	$mailer->setFrom($default_from, $from_name);
	}
	break;
	case 'reply-to':
	$mailer->addReplyTo($value, $reply_to_name);
	break;
	case 'to':
	$to_phids = $this->expandRecipients($value);
	$to_actors = array_select_keys($deliverable_actors, $to_phids);
	$add_to = array_merge(
	$add_to,
	mpull($to_actors, 'getEmailAddress'));
	break;
	case 'raw-to':
	$add_to = array_merge($add_to, $value);
	break;
	case 'cc':
	$cc_phids = $this->expandRecipients($value);
	$cc_actors = array_select_keys($deliverable_actors, $cc_phids);
	$add_cc = array_merge(
	$add_cc,
	mpull($cc_actors, 'getEmailAddress'));
	break;
	case 'headers':
	foreach ($value as $pair) {
	list($header_key, $header_value) = $pair;

	// NOTE: If we have \n in a header, SES rejects the email.
	$header_value = str_replace("\n", ' ', $header_value);

	$mailer->addHeader($header_key, $header_value);
	}
	break;
	case 'attachments':
	$value = $this->getAttachments();
	foreach ($value as $attachment) {
	$mailer->addAttachment(
	$attachment->getData(),
	$attachment->getFilename(),
	$attachment->getMimeType());
	}
	break;
	case 'subject':
	$subject = array();

	if ($is_threaded) {
	$add_re = PhabricatorEnv::getEnvConfig('metamta.re-prefix');

	if ($prefs) {
	$add_re = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_RE_PREFIX,
	$add_re);
	}

	if ($add_re) {
	$subject[] = 'Re:';
	}
	}

	$subject[] = trim(idx($params, 'subject-prefix'));

	$vary_prefix = idx($params, 'vary-subject-prefix');
	if ($vary_prefix != '') {
	$use_subject = PhabricatorEnv::getEnvConfig(
	'metamta.vary-subjects');

	if ($prefs) {
	$use_subject = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_VARY_SUBJECT,
	$use_subject);
	}

	if ($use_subject) {
	$subject[] = $vary_prefix;
	}
	}

	$subject[] = $value;

	$mailer->setSubject(implode(' ', array_filter($subject)));
	break;
	case 'is-bulk':
	if ($value) {
	if (PhabricatorEnv::getEnvConfig('metamta.precedence-bulk')) {
	$mailer->addHeader('Precedence', 'bulk');
	}
	}
	break;
	case 'thread-id':

	// NOTE: Gmail freaks out about In-Reply-To and References which
	// aren't in the form "<string@domain.tld>"; this is also required
	// by RFC 2822, although some clients are more liberal in what they
	// accept.
	$domain = PhabricatorEnv::getEnvConfig('metamta.domain');
	$value = '<'.$value.'@'.$domain.'>';

	if ($is_first && $mailer->supportsMessageIDHeader()) {
	$mailer->addHeader('Message-ID', $value);
	} else {
	$in_reply_to = $value;
	$references = array($value);
	$parent_id = $this->getParentMessageID();
	if ($parent_id) {
	$in_reply_to = $parent_id;
	// By RFC 2822, the most immediate parent should appear last
	// in the "References" header, so this order is intentional.
	$references[] = $parent_id;
	}
	$references = implode(' ', $references);
	$mailer->addHeader('In-Reply-To', $in_reply_to);
	$mailer->addHeader('References', $references);
	}
	$thread_index = $this->generateThreadIndex($value, $is_first);
	$mailer->addHeader('Thread-Index', $thread_index);
	break;
	case 'mailtags':
	// Handled below.
	break;
	case 'subject-prefix':
	case 'vary-subject-prefix':
	// Handled above.
	break;
	default:
	// Just discard.
	}
	}

	$body = idx($params, 'body', '');
	$max = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');
	if (strlen($body) > $max) {
	- $body = phutil_utf8_shorten($body, $max);
	+ $body = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumBytes($max)
	+ ->truncateString($body);
	$body .= "\n";
	$body .= pht('(This email was truncated at %d bytes.)', $max);
	}
	$mailer->setBody($body);

	$html_emails = false;
	if ($use_prefs && $prefs) {
	$html_emails = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_HTML_EMAILS,
	$html_emails);
	}

	if ($html_emails && isset($params['html-body'])) {
	$mailer->setHTMLBody($params['html-body']);
	}

	if (!$add_to && !$add_cc) {
	$this->setStatus(self::STATUS_VOID);
	$this->setMessage(
	'Message has no valid recipients: all To/Cc are disabled, invalid, '.
	'or configured not to receive this mail.');
	return $this->save();
	}

	if ($this->getIsErrorEmail()) {
	$all_recipients = array_merge($add_to, $add_cc);
	if ($this->shouldRateLimitMail($all_recipients)) {
	$this->setStatus(self::STATUS_VOID);
	$this->setMessage(
	pht(
	'This is an error email, but one or more recipients have '.
	'exceeded the error email rate limit. Declining to deliver '.
	'message.'));
	return $this->save();
	}
	}

	$mailer->addHeader('X-Phabricator-Sent-This-Message', 'Yes');
	$mailer->addHeader('X-Mail-Transport-Agent', 'MetaMTA');

	// Some clients respect this to suppress OOF and other auto-responses.
	$mailer->addHeader('X-Auto-Response-Suppress', 'All');

	// If the message has mailtags, filter out any recipients who don't want
	// to receive this type of mail.
	$mailtags = $this->getParam('mailtags');
	if ($mailtags) {
	$tag_header = array();
	foreach ($mailtags as $mailtag) {
	$tag_header[] = '<'.$mailtag.'>';
	}
	$tag_header = implode(', ', $tag_header);
	$mailer->addHeader('X-Phabricator-Mail-Tags', $tag_header);
	}

	// Some mailers require a valid "To:" in order to deliver mail. If we
	// don't have any "To:", try to fill it in with a placeholder "To:".
	// If that also fails, move the "Cc:" line to "To:".
	if (!$add_to) {
	$placeholder_key = 'metamta.placeholder-to-recipient';
	$placeholder = PhabricatorEnv::getEnvConfig($placeholder_key);
	if ($placeholder !== null) {
	$add_to = array($placeholder);
	} else {
	$add_to = $add_cc;
	$add_cc = array();
	}
	}

	$add_to = array_unique($add_to);
	$add_cc = array_diff(array_unique($add_cc), $add_to);

	$mailer->addTos($add_to);
	if ($add_cc) {
	$mailer->addCCs($add_cc);
	}
	} catch (Exception $ex) {
	$this
	->setStatus(self::STATUS_FAIL)
	->setMessage($ex->getMessage())
	->save();

	throw $ex;
	}

	try {
	$ok = $mailer->send();
	if (!$ok) {
	// TODO: At some point, we should clean this up and make all mailers
	// throw.
	throw new Exception(
	pht('Mail adapter encountered an unexpected, unspecified failure.'));
	}

	$this->setStatus(self::STATUS_SENT);
	$this->save();

	return $this;
	} catch (PhabricatorMetaMTAPermanentFailureException $ex) {
	$this
	->setStatus(self::STATUS_FAIL)
	->setMessage($ex->getMessage())
	->save();

	throw $ex;
	} catch (Exception $ex) {
	$this
	->setMessage($ex->getMessage()."\n".$ex->getTraceAsString())
	->save();

	throw $ex;
	}
	}

	public static function getReadableStatus($status_code) {
	static $readable = array(
	self::STATUS_QUEUE => 'Queued for Delivery',
	self::STATUS_FAIL => 'Delivery Failed',
	self::STATUS_SENT => 'Sent',
	self::STATUS_VOID => 'Void',
	);
	$status_code = coalesce($status_code, '?');
	return idx($readable, $status_code, $status_code);
	}

	private function generateThreadIndex($seed, $is_first_mail) {
	// When threading, Outlook ignores the 'References' and 'In-Reply-To'
	// headers that most clients use. Instead, it uses a custom 'Thread-Index'
	// header. The format of this header is something like this (from
	// camel-exchange-folder.c in Evolution Exchange):

	/* A new post to a folder gets a 27-byte-long thread index. (The value
	* is apparently unique but meaningless.) Each reply to a post gets a
	* 32-byte-long thread index whose first 27 bytes are the same as the
	* parent's thread index. Each reply to any of those gets a
	* 37-byte-long thread index, etc. The Thread-Index header contains a
	* base64 representation of this value.
	*/

	// The specific implementation uses a 27-byte header for the first email
	// a recipient receives, and a random 5-byte suffix (32 bytes total)
	// thereafter. This means that all the replies are (incorrectly) siblings,
	// but it would be very difficult to keep track of the entire tree and this
	// gets us reasonable client behavior.

	$base = substr(md5($seed), 0, 27);
	if (!$is_first_mail) {
	// Not totally sure, but it seems like outlook orders replies by
	// thread-index rather than timestamp, so to get these to show up in the
	// right order we use the time as the last 4 bytes.
	$base .= ' '.pack('N', time());
	}

	return base64_encode($base);
	}

	public static function shouldMultiplexAllMail() {
	return PhabricatorEnv::getEnvConfig('metamta.one-mail-per-recipient');
	}


	/* -( Managing Recipients )------------------------------------------------ */


	/**
	* Get all of the recipients for this mail, after preference filters are
	* applied. This list has all objects to whom delivery will be attempted.
	*
	* @return list<phid> A list of all recipients to whom delivery will be
	* attempted.
	* @task recipients
	*/
	public function buildRecipientList() {
	$actors = $this->loadActors(
	array_merge(
	$this->getToPHIDs(),
	$this->getCcPHIDs()));
	$actors = $this->filterDeliverableActors($actors);
	return mpull($actors, 'getPHID');
	}

	public function loadAllActors() {
	$actor_phids = array_merge(
	array($this->getParam('from')),
	$this->getToPHIDs(),
	$this->getCcPHIDs());

	$this->loadRecipientExpansions($actor_phids);
	$actor_phids = $this->expandRecipients($actor_phids);

	return $this->loadActors($actor_phids);
	}

	private function loadRecipientExpansions(array $phids) {
	$expansions = id(new PhabricatorMetaMTAMemberQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($phids)
	->execute();

	$this->recipientExpansionMap = $expansions;

	return $this;
	}

	/**
	* Expand a list of recipient PHIDs (possibly including aggregate recipients
	* like projects) into a deaggregated list of individual recipient PHIDs.
	* For example, this will expand project PHIDs into a list of the project's
	* members.
	*
	* @param list<phid> List of recipient PHIDs, possibly including aggregate
	* recipients.
	* @return list<phid> Deaggregated list of mailable recipients.
	*/
	private function expandRecipients(array $phids) {
	if ($this->recipientExpansionMap === null) {
	throw new Exception(
	pht(
	'Call loadRecipientExpansions() before expandRecipients()!'));
	}

	$results = array();
	foreach ($phids as $phid) {
	if (!isset($this->recipientExpansionMap[$phid])) {
	$results[$phid] = $phid;
	} else {
	foreach ($this->recipientExpansionMap[$phid] as $recipient_phid) {
	$results[$recipient_phid] = $recipient_phid;
	}
	}
	}

	return array_keys($results);
	}

	private function filterDeliverableActors(array $actors) {
	assert_instances_of($actors, 'PhabricatorMetaMTAActor');
	$deliverable_actors = array();
	foreach ($actors as $phid => $actor) {
	if ($actor->isDeliverable()) {
	$deliverable_actors[$phid] = $actor;
	}
	}
	return $deliverable_actors;
	}

	private function loadActors(array $actor_phids) {
	$actor_phids = array_filter($actor_phids);
	$viewer = PhabricatorUser::getOmnipotentUser();

	$actors = id(new PhabricatorMetaMTAActorQuery())
	->setViewer($viewer)
	->withPHIDs($actor_phids)
	->execute();

	if (!$actors) {
	return array();
	}

	if ($this->getForceDelivery()) {
	// If we're forcing delivery, skip all the opt-out checks.
	return $actors;
	}

	// Exclude explicit recipients.
	foreach ($this->getExcludeMailRecipientPHIDs() as $phid) {
	$actor = idx($actors, $phid);
	if (!$actor) {
	continue;
	}
	$actor->setUndeliverable(
	pht(
	'This message is a response to another email message, and this '.
	'recipient received the original email message, so we are not '.
	'sending them this substantially similar message (for example, '.
	'the sender used "Reply All" instead of "Reply" in response to '.
	'mail from Phabricator).'));
	}

	// Exclude the actor if their preferences are set.
	$from_phid = $this->getParam('from');
	$from_actor = idx($actors, $from_phid);
	if ($from_actor) {
	$from_user = id(new PhabricatorPeopleQuery())
	->setViewer($viewer)
	->withPHIDs(array($from_phid))
	->execute();
	$from_user = head($from_user);
	if ($from_user) {
	$pref_key = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;
	$exclude_self = $from_user
	->loadPreferences()
	->getPreference($pref_key);
	if ($exclude_self) {
	$from_actor->setUndeliverable(
	pht(
	'This recipient is the user whose actions caused delivery of '.
	'this message, but they have set preferences so they do not '.
	'receive mail about their own actions (Settings > Email '.
	'Preferences > Self Actions).'));
	}
	}
	}

	$all_prefs = id(new PhabricatorUserPreferences())->loadAllWhere(
	'userPHID in (%Ls)',
	$actor_phids);
	$all_prefs = mpull($all_prefs, null, 'getUserPHID');

	// Exclude recipients who don't want any mail.
	foreach ($all_prefs as $phid => $prefs) {
	$exclude = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_NO_MAIL,
	false);
	if ($exclude) {
	$actors[$phid]->setUndeliverable(
	pht(
	'This recipient has disabled all email notifications '.
	'(Settings > Email Preferences > Email Notifications).'));
	}
	}

	$value_email = PhabricatorUserPreferences::MAILTAG_PREFERENCE_EMAIL;

	// Exclude all recipients who have set preferences to not receive this type
	// of email (for example, a user who says they don't want emails about task
	// CC changes).
	$tags = $this->getParam('mailtags');
	if ($tags) {
	foreach ($all_prefs as $phid => $prefs) {
	$user_mailtags = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_MAILTAGS,
	array());

	// The user must have elected to receive mail for at least one
	// of the mailtags.
	$send = false;
	foreach ($tags as $tag) {
	if (((int)idx($user_mailtags, $tag, $value_email)) == $value_email) {
	$send = true;
	break;
	}
	}

	if (!$send) {
	$actors[$phid]->setUndeliverable(
	pht(
	'This mail has tags which control which users receive it, and '.
	'this recipient has not elected to receive mail with any of '.
	'the tags on this message (Settings > Email Preferences).'));
	}
	}
	}

	return $actors;
	}

	private function shouldRateLimitMail(array $all_recipients) {
	try {
	PhabricatorSystemActionEngine::willTakeAction(
	$all_recipients,
	new PhabricatorMetaMTAErrorMailAction(),
	1);
	return false;
	} catch (PhabricatorSystemActionRateLimitException $ex) {
	return true;
	}
	}


	}
	diff --git a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
	index b74fbf2eac..3bb955cf42 100644
	--- a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
	+++ b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
	@@ -1,69 +1,71 @@
	<?php

	final class PhabricatorPeopleHovercardEventListener
	extends PhabricatorEventListener {

	public function register() {
	$this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD);
	}

	public function handleEvent(PhutilEvent $event) {
	switch ($event->getType()) {
	case PhabricatorEventType::TYPE_UI_DIDRENDERHOVERCARD:
	$this->handleHovercardEvent($event);
	break;
	}
	}

	private function handleHovercardEvent($event) {
	$viewer = $event->getUser();
	$hovercard = $event->getValue('hovercard');
	$object_handle = $event->getValue('handle');
	$phid = $object_handle->getPHID();
	$user = $event->getValue('object');

	if (!($user instanceof PhabricatorUser)) {
	return;
	}

	$profile = $user->loadUserProfile();

	$hovercard->setTitle($user->getUsername());
	$hovercard->setDetail(pht('%s - %s.', $user->getRealname(),
	nonempty($profile->getTitle(),
	pht('No title was found befitting of this rare specimen'))));

	if ($user->getIsDisabled()) {
	$hovercard->addField(pht('Account'), pht('Disabled'));
	} else if (!$user->isUserActivated()) {
	$hovercard->addField(pht('Account'), pht('Not Activated'));
	} else if (PhabricatorApplication::isClassInstalledForViewer(
	'PhabricatorCalendarApplication',
	$viewer)) {
	$statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
	array($user->getPHID()));
	if ($statuses) {
	$current_status = reset($statuses);
	$dateto = phabricator_datetime($current_status->getDateTo(), $user);
	$hovercard->addField(pht('Status'),
	$current_status->getDescription());
	$hovercard->addField(pht('Until'),
	$dateto);
	} else {
	$hovercard->addField(pht('Status'), pht('Available'));
	}
	}

	$hovercard->addField(pht('User since'),
	phabricator_date($user->getDateCreated(), $user));

	if ($profile->getBlurb()) {
	$hovercard->addField(pht('Blurb'),
	- phutil_utf8_shorten($profile->getBlurb(), 120));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(120)
	+ ->truncateString($profile->getBlurb()));
	}

	$event->setValue('hovercard', $hovercard);
	}


	}
	diff --git a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	index 2724cf8b35..c82eac5954 100644
	--- a/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	+++ b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	@@ -1,101 +1,103 @@
	<?php

	final class PhameCreatePostConduitAPIMethod extends PhameConduitAPIMethod {

	public function getAPIMethodName() {
	return 'phame.createpost';
	}

	public function getMethodDescription() {
	return pht('Create a phame post.');
	}

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}

	public function defineParamTypes() {
	return array(
	'blogPHID' => 'required phid',
	'title' => 'required string',
	'body' => 'required string',
	'phameTitle' => 'optional string',
	'bloggerPHID' => 'optional phid',
	'isDraft' => 'optional bool',
	);
	}

	public function defineReturnType() {
	return 'list<dict>';
	}

	public function defineErrorTypes() {
	return array(
	'ERR-INVALID-PARAMETER' =>
	pht('Missing or malformed parameter.'),
	'ERR-INVALID-BLOG' =>
	pht('Invalid blog PHID or user can not post to blog.'),
	);
	}

	protected function execute(ConduitAPIRequest $request) {
	$user = $request->getUser();
	$blog_phid = $request->getValue('blogPHID');
	$title = $request->getValue('title');
	$body = $request->getValue('body');
	$exception_description = array();
	if (!$blog_phid) {
	$exception_description[] = pht('No blog phid.');
	}
	if (!strlen($title)) {
	$exception_description[] = pht('No post title.');
	}
	if (!strlen($body)) {
	$exception_description[] = pht('No post body.');
	}
	if ($exception_description) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(implode("\n", $exception_description));
	}

	$blogger_phid = $request->getValue('bloggerPHID');
	if ($blogger_phid) {
	$blogger = id(new PhabricatorPeopleQuery())
	->setViewer($user)
	->withPHIDs(array($blogger_phid))
	->executeOne();
	} else {
	$blogger = $user;
	}

	$blog = id(new PhameBlogQuery())
	->setViewer($blogger)
	->withPHIDs(array($blog_phid))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_JOIN,
	))
	->executeOne();

	if (!$blog) {
	throw new ConduitException('ERR-INVALID-BLOG');
	}

	$post = PhamePost::initializePost($blogger, $blog);
	$is_draft = $request->getValue('isDraft', false);
	if (!$is_draft) {
	$post->setDatePublished(time());
	$post->setVisibility(PhamePost::VISIBILITY_PUBLISHED);
	}
	$post->setTitle($title);
	$phame_title = $request->getValue(
	'phameTitle',
	- phutil_utf8_shorten($title, 64));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumCodepoints(64)
	+ ->truncateString($title));
	$post->setPhameTitle(PhabricatorSlug::normalize($phame_title));
	$post->setBody($body);
	$post->save();

	return $post->toDictionary();
	}

	}
	diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
	index fa3735a456..286feda610 100644
	--- a/src/applications/pholio/storage/PholioTransaction.php
	+++ b/src/applications/pholio/storage/PholioTransaction.php
	@@ -1,374 +1,376 @@
	<?php

	final class PholioTransaction extends PhabricatorApplicationTransaction {

	public function getApplicationName() {
	return 'pholio';
	}

	public function getApplicationTransactionType() {
	return PholioMockPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PholioTransactionComment();
	}

	public function getApplicationTransactionViewObject() {
	return new PholioTransactionView();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();
	$phids[] = $this->getObjectPHID();

	$new = $this->getNewValue();
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_IMAGE_FILE:
	$phids = array_merge($phids, $new, $old);
	break;
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	$phids[] = $new;
	$phids[] = $old;
	break;
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_NAME:
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	$phids[] = key($new);
	break;
	}

	return $phids;
	}

	public function shouldHide() {
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_DESCRIPTION:
	return ($old === null);
	case PholioTransactionType::TYPE_IMAGE_NAME:
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	return ($old === array(null => null));
	// this is boring / silly to surface; changing sequence is NBD
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return true;
	}

	return parent::shouldHide();
	}

	public function getIcon() {
	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_INLINE:
	return 'fa-comment';
	case PholioTransactionType::TYPE_NAME:
	case PholioTransactionType::TYPE_DESCRIPTION:
	case PholioTransactionType::TYPE_STATUS:
	case PholioTransactionType::TYPE_IMAGE_NAME:
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return 'fa-pencil';
	case PholioTransactionType::TYPE_IMAGE_FILE:
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	return 'fa-picture-o';
	}

	return parent::getIcon();
	}

	public function getMailTags() {
	$tags = array();
	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_INLINE:
	case PhabricatorTransactions::TYPE_COMMENT:
	$tags[] = MetaMTANotificationType::TYPE_PHOLIO_COMMENT;
	break;
	case PholioTransactionType::TYPE_STATUS:
	$tags[] = MetaMTANotificationType::TYPE_PHOLIO_STATUS;
	break;
	case PholioTransactionType::TYPE_NAME:
	case PholioTransactionType::TYPE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_NAME:
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	case PholioTransactionType::TYPE_IMAGE_FILE:
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	$tags[] = MetaMTANotificationType::TYPE_PHOLIO_UPDATED;
	break;
	default:
	$tags[] = MetaMTANotificationType::TYPE_PHOLIO_OTHER;
	break;
	}
	return $tags;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case PholioTransactionType::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created "%s".',
	$this->renderHandleLink($author_phid),
	$new);
	} else {
	return pht(
	'%s renamed this mock from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	break;
	case PholioTransactionType::TYPE_DESCRIPTION:
	return pht(
	"%s updated the mock's description.",
	$this->renderHandleLink($author_phid));
	break;
	case PholioTransactionType::TYPE_STATUS:
	return pht(
	"%s updated the mock's status.",
	$this->renderHandleLink($author_phid));
	break;
	case PholioTransactionType::TYPE_INLINE:
	$count = 1;
	foreach ($this->getTransactionGroup() as $xaction) {
	if ($xaction->getTransactionType() == $type) {
	$count++;
	}
	}

	return pht(
	'%s added %d inline comment(s).',
	$this->renderHandleLink($author_phid),
	$count);
	break;
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	return pht(
	'%s replaced %s with %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	break;
	case PholioTransactionType::TYPE_IMAGE_FILE:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s edited image(s), added %d: %s; removed %d: %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderHandleList($add),
	count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return pht(
	'%s added %d image(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderHandleList($add));
	} else {
	return pht(
	'%s removed %d image(s): %s.',
	$this->renderHandleLink($author_phid),
	count($rem),
	$this->renderHandleList($rem));
	}
	break;

	case PholioTransactionType::TYPE_IMAGE_NAME:
	return pht(
	'%s renamed an image (%s) from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(key($new)),
	reset($old),
	reset($new));
	break;
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	return pht(
	'%s updated an image\'s (%s) description.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(key($new)));
	break;
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return pht(
	'%s updated an image\'s (%s) sequence.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(key($new)));
	break;
	}

	return parent::getTitle();
	}

	public function getTitleForFeed(PhabricatorFeedStory $story) {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	$type = $this->getTransactionType();
	switch ($type) {
	case PholioTransactionType::TYPE_NAME:
	if ($old === null) {
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s renamed %s from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old,
	$new);
	}
	break;
	case PholioTransactionType::TYPE_DESCRIPTION:
	return pht(
	'%s updated the description for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_STATUS:
	return pht(
	'%s updated the status for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_INLINE:
	return pht(
	'%s added an inline comment to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	case PholioTransactionType::TYPE_IMAGE_FILE:
	return pht(
	'%s updated images of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_IMAGE_NAME:
	return pht(
	'%s updated the image names of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	return pht(
	'%s updated image descriptions of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return pht(
	'%s updated image sequence of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	break;
	}

	return parent::getTitleForFeed($story);
	}

	public function getBodyForFeed(PhabricatorFeedStory $story) {
	$text = null;
	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_NAME:
	if ($this->getOldValue() === null) {
	$mock = $story->getPrimaryObject();
	$text = $mock->getDescription();
	}
	break;
	case PholioTransactionType::TYPE_INLINE:
	$text = $this->getComment()->getContent();
	break;
	}

	if ($text) {
	return phutil_escape_html_newlines(
	- phutil_utf8_shorten($text, 128));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(128)
	+ ->truncateString($text));
	}

	return parent::getBodyForFeed($story);
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	return true;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	if ($this->getTransactionType() ==
	PholioTransactionType::TYPE_IMAGE_DESCRIPTION) {
	$old = reset($old);
	$new = reset($new);
	}

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$old,
	$new);
	}

	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_NAME:
	if ($old === null) {
	return PhabricatorTransactions::COLOR_GREEN;
	}
	case PholioTransactionType::TYPE_DESCRIPTION:
	case PholioTransactionType::TYPE_STATUS:
	case PholioTransactionType::TYPE_IMAGE_NAME:
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return PhabricatorTransactions::COLOR_BLUE;
	case PholioTransactionType::TYPE_IMAGE_REPLACE:
	return PhabricatorTransactions::COLOR_YELLOW;
	case PholioTransactionType::TYPE_IMAGE_FILE:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	if ($add && $rem) {
	return PhabricatorTransactions::COLOR_YELLOW;
	} else if ($add) {
	return PhabricatorTransactions::COLOR_GREEN;
	} else {
	return PhabricatorTransactions::COLOR_RED;
	}
	}

	return parent::getColor();
	}

	public function getNoEffectDescription() {
	switch ($this->getTransactionType()) {
	case PholioTransactionType::TYPE_IMAGE_NAME:
	return pht('The image title was not updated.');
	case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
	return pht('The image description was not updated.');
	case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
	return pht('The image sequence was not updated.');
	}

	return parent::getNoEffectDescription();
	}
	}
	diff --git a/src/applications/phriction/editor/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php
	index df5a7a90b4..988c5dcbe9 100644
	--- a/src/applications/phriction/editor/PhrictionDocumentEditor.php
	+++ b/src/applications/phriction/editor/PhrictionDocumentEditor.php
	@@ -1,375 +1,378 @@
	<?php

	/**
	* Create or update Phriction documents.
	*/
	final class PhrictionDocumentEditor extends PhabricatorEditor {

	private $document;
	private $content;

	private $newTitle;
	private $newContent;
	private $description;

	// For the Feed Story when moving documents
	private $fromDocumentPHID;

	private function __construct() {
	// <restricted>
	}

	public static function newForSlug($slug) {
	$slug = PhabricatorSlug::normalize($slug);

	// TODO: Get rid of this.
	$document = id(new PhrictionDocument())->loadOneWhere(
	'slug = %s',
	$slug);
	$content = null;

	if ($document) {
	$content = id(new PhrictionContent())->load($document->getContentID());
	} else {
	$document = new PhrictionDocument();
	$document->setSlug($slug);
	}

	if (!$content) {
	$default_title = PhabricatorSlug::getDefaultTitle($slug);
	$content = new PhrictionContent();
	$content->setSlug($slug);
	$content->setTitle($default_title);
	$content->setContent('');
	}

	$obj = new PhrictionDocumentEditor();
	$obj->document = $document;
	$obj->content = $content;

	return $obj;
	}

	public function setTitle($title) {
	$this->newTitle = $title;
	return $this;
	}

	public function setContent($content) {
	$this->newContent = $content;
	return $this;
	}

	public function setDescription($description) {
	$this->description = $description;
	return $this;
	}

	public function getDocument() {
	return $this->document;
	}

	public function moveAway($new_doc_id) {
	return $this->execute(
	PhrictionChangeType::CHANGE_MOVE_AWAY, true, $new_doc_id);
	}

	public function moveHere($old_doc_id, $old_doc_phid) {
	$this->fromDocumentPHID = $old_doc_phid;
	return $this->execute(
	PhrictionChangeType::CHANGE_MOVE_HERE, false, $old_doc_id);
	}

	private function execute(
	$change_type, $del_new_content = true, $doc_ref = null) {

	$actor = $this->requireActor();

	$document = $this->document;
	$content = $this->content;

	$new_content = $this->buildContentTemplate($document, $content);
	$new_content->setChangeType($change_type);

	if ($del_new_content) {
	$new_content->setContent('');
	}

	if ($doc_ref) {
	$new_content->setChangeRef($doc_ref);
	}

	return $this->updateDocument($document, $content, $new_content);
	}

	public function delete() {
	return $this->execute(PhrictionChangeType::CHANGE_DELETE, true);
	}

	private function stub() {
	return $this->execute(PhrictionChangeType::CHANGE_STUB, true);
	}

	public function save() {
	$actor = $this->requireActor();

	if ($this->newContent === '') {
	// If this is an edit which deletes all the content, just treat it as
	// a delete. NOTE: null means "don't change the content", not "delete
	// the page"! Thus the strict type check.
	return $this->delete();
	}

	$document = $this->document;
	$content = $this->content;

	$new_content = $this->buildContentTemplate($document, $content);

	return $this->updateDocument($document, $content, $new_content);
	}

	private function buildContentTemplate(
	PhrictionDocument $document,
	PhrictionContent $content) {

	$new_content = new PhrictionContent();
	$new_content->setSlug($document->getSlug());
	$new_content->setAuthorPHID($this->getActor()->getPHID());
	$new_content->setChangeType(PhrictionChangeType::CHANGE_EDIT);

	$new_content->setTitle(
	coalesce(
	$this->newTitle,
	$content->getTitle()));

	$new_content->setContent(
	coalesce(
	$this->newContent,
	$content->getContent()));

	if (strlen($this->description)) {
	$new_content->setDescription($this->description);
	}

	return $new_content;
	}

	private function updateDocument($document, $content, $new_content) {

	$is_new = false;
	if (!$document->getID()) {
	$is_new = true;
	}

	$new_content->setVersion($content->getVersion() + 1);

	$change_type = $new_content->getChangeType();
	switch ($change_type) {
	case PhrictionChangeType::CHANGE_EDIT:
	$doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
	$feed_action = $is_new
	? PhrictionActionConstants::ACTION_CREATE
	: PhrictionActionConstants::ACTION_EDIT;
	break;
	case PhrictionChangeType::CHANGE_DELETE:
	$doc_status = PhrictionDocumentStatus::STATUS_DELETED;
	$feed_action = PhrictionActionConstants::ACTION_DELETE;
	if ($is_new) {
	throw new Exception(
	"You can not delete a document which doesn't exist yet!");
	}
	break;
	case PhrictionChangeType::CHANGE_STUB:
	$doc_status = PhrictionDocumentStatus::STATUS_STUB;
	$feed_action = null;
	break;
	case PhrictionChangeType::CHANGE_MOVE_AWAY:
	$doc_status = PhrictionDocumentStatus::STATUS_MOVED;
	$feed_action = null;
	break;
	case PhrictionChangeType::CHANGE_MOVE_HERE:
	$doc_status = PhrictionDocumentStatus::STATUS_EXISTS;
	$feed_action = PhrictionActionConstants::ACTION_MOVE_HERE;
	break;
	default:
	throw new Exception(
	"Unsupported content change type '{$change_type}'!");
	}

	$document->setStatus($doc_status);

	// TODO: This should be transactional.

	if ($is_new) {
	$document->save();
	}

	$new_content->setDocumentID($document->getID());
	$new_content->save();

	$document->setContentID($new_content->getID());
	$document->save();

	$document->attachContent($new_content);

	id(new PhabricatorSearchIndexer())
	->queueDocumentForIndexing($document->getPHID());

	// Stub out empty parent documents if they don't exist
	$ancestral_slugs = PhabricatorSlug::getAncestry($document->getSlug());
	if ($ancestral_slugs) {
	$ancestors = id(new PhrictionDocument())->loadAllWhere(
	'slug IN (%Ls)',
	$ancestral_slugs);
	$ancestors = mpull($ancestors, null, 'getSlug');
	foreach ($ancestral_slugs as $slug) {
	// We check for change type to prevent near-infinite recursion
	if (!isset($ancestors[$slug]) &&
	$new_content->getChangeType() != PhrictionChangeType::CHANGE_STUB) {

	id(PhrictionDocumentEditor::newForSlug($slug))
	->setActor($this->getActor())
	->setTitle(PhabricatorSlug::getDefaultTitle($slug))
	->setContent('')
	->setDescription(pht('Empty Parent Document'))
	->stub();
	}
	}
	}

	$project_phid = null;
	$slug = $document->getSlug();
	if (PhrictionDocument::isProjectSlug($slug)) {
	$project = id(new PhabricatorProjectQuery())
	->setViewer($this->requireActor())
	->withPhrictionSlugs(array(
	PhrictionDocument::getProjectSlugIdentifier($slug)))
	->executeOne();
	if ($project) {
	$project_phid = $project->getPHID();
	}
	}

	$related_phids = array(
	$document->getPHID(),
	$this->getActor()->getPHID(),
	);

	if ($project_phid) {
	$related_phids[] = $project_phid;
	}

	if ($this->fromDocumentPHID) {
	$related_phids[] = $this->fromDocumentPHID;
	}

	if ($feed_action) {
	+ $content = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(140)
	+ ->truncateString($new_content->getContent());
	id(new PhabricatorFeedStoryPublisher())
	->setRelatedPHIDs($related_phids)
	->setStoryAuthorPHID($this->getActor()->getPHID())
	->setStoryTime(time())
	->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_PHRICTION)
	->setStoryData(
	array(
	'phid' => $document->getPHID(),
	'action' => $feed_action,
	- 'content' => phutil_utf8_shorten($new_content->getContent(), 140),
	+ 'content' => $content,
	'project' => $project_phid,
	'movedFromPHID' => $this->fromDocumentPHID,
	))
	->publish();
	}

	// TODO: Migrate to ApplicationTransactions fast, so we get rid of this code
	$subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$document->getPHID());
	$this->sendMailToSubscribers($subscribers, $content);

	return $this;
	}

	private function getChangeTypeDescription($const, $title) {
	$map = array(
	PhrictionChangeType::CHANGE_EDIT =>
	pht('Phriction Document %s was edited.', $title),
	PhrictionChangeType::CHANGE_DELETE =>
	pht('Phriction Document %s was deleted.', $title),
	PhrictionChangeType::CHANGE_MOVE_HERE =>
	pht('Phriction Document %s was moved here.', $title),
	PhrictionChangeType::CHANGE_MOVE_AWAY =>
	pht('Phriction Document %s was moved away.', $title),
	PhrictionChangeType::CHANGE_STUB =>
	pht('Phriction Document %s was created through child.', $title),
	);
	return idx($map, $const, pht('Something magical occurred.'));
	}

	private function sendMailToSubscribers(array $subscribers, $old_content) {
	if (!$subscribers) {
	return;
	}

	$author_phid = $this->getActor()->getPHID();
	$document = $this->document;
	$content = $document->getContent();
	$slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
	$diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
	$prod_uri = PhabricatorEnv::getProductionURI('');

	$vs_head = $diff_uri
	->alter('l', $old_content->getVersion())
	->alter('r', $content->getVersion());

	$old_title = $old_content->getTitle();
	$title = $content->getTitle();
	$name = $this->getChangeTypeDescription($content->getChangeType(), $title);
	$action = PhrictionChangeType::getChangeTypeLabel(
	$content->getChangeType());

	$body = array($name);
	// Content may have changed, you never know
	if ($content->getChangeType() == PhrictionChangeType::CHANGE_EDIT) {

	if ($old_title != $title) {
	$body[] = pht('Title was changed from "%s" to "%s"',
	$old_title, $title);
	}

	$body[] = pht("Link to new version:\n%s",
	$prod_uri.$slug_uri.'?v='.$content->getVersion());

	$body[] = pht("Link to diff:\n%s", $prod_uri.$vs_head);
	} else if ($content->getChangeType() ==
	PhrictionChangeType::CHANGE_MOVE_AWAY) {

	$target_document = id(new PhrictionDocument())
	->load($content->getChangeRef());
	$slug_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
	$body[] = pht("Link to destination document:\n%s", $prod_uri.$slug_uri);
	}

	$body = implode("\n\n", $body);

	$subject_prefix = $this->getMailSubjectPrefix();

	$mail = new PhabricatorMetaMTAMail();
	$mail->setSubject($name)
	->setSubjectPrefix($subject_prefix)
	->setVarySubjectPrefix('['.$action.']')
	->addHeader('Thread-Topic', $name)
	->setFrom($author_phid)
	->addTos($subscribers)
	->setBody($body)
	->setRelatedPHID($document->getPHID())
	->setIsBulk(true);

	$mail->saveAndSend();
	}

	/* --( For less copy-pasting when switching to ApplicationTransactions )--- */

	protected function getMailSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.phriction.subject-prefix');
	}

	}
	diff --git a/src/applications/ponder/storage/PonderAnswerTransaction.php b/src/applications/ponder/storage/PonderAnswerTransaction.php
	index ced8a08fe9..e1a7c029a2 100644
	--- a/src/applications/ponder/storage/PonderAnswerTransaction.php
	+++ b/src/applications/ponder/storage/PonderAnswerTransaction.php
	@@ -1,98 +1,100 @@
	<?php

	final class PonderAnswerTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_CONTENT = 'ponder.answer:content';

	public function getApplicationName() {
	return 'ponder';
	}

	public function getTableName() {
	return 'ponder_answertransaction';
	}

	public function getApplicationTransactionType() {
	return PonderAnswerPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PonderAnswerTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	$phids[] = $this->getObjectPHID();
	break;
	}

	return $phids;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return pht(
	'%s edited %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	return parent::getTitle();
	}

	public function getTitleForFeed(PhabricatorFeedStory $story) {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return pht(
	'%s updated %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	return parent::getTitleForFeed($story);
	}

	public function getBodyForFeed(PhabricatorFeedStory $story) {
	$new = $this->getNewValue();

	$body = null;

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return phutil_escape_html_newlines(
	- phutil_utf8_shorten($new, 128));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(128)
	+ ->truncateString($new));
	break;
	}
	return parent::getBodyForFeed($story);
	}


	public function hasChangeDetails() {
	$old = $this->getOldValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return $old !== null;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	}
	diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php
	index 32edeef72b..9bfaf6a741 100644
	--- a/src/applications/ponder/storage/PonderQuestionTransaction.php
	+++ b/src/applications/ponder/storage/PonderQuestionTransaction.php
	@@ -1,307 +1,311 @@
	<?php

	final class PonderQuestionTransaction
	extends PhabricatorApplicationTransaction {

	const TYPE_TITLE = 'ponder.question:question';
	const TYPE_CONTENT = 'ponder.question:content';
	const TYPE_ANSWERS = 'ponder.question:answer';
	const TYPE_STATUS = 'ponder.question:status';

	public function getApplicationName() {
	return 'ponder';
	}

	public function getTableName() {
	return 'ponder_questiontransaction';
	}

	public function getApplicationTransactionType() {
	return PonderQuestionPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PonderQuestionTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	switch ($this->getTransactionType()) {
	case self::TYPE_ANSWERS:
	$phids[] = $this->getNewAnswerPHID();
	$phids[] = $this->getObjectPHID();
	break;
	}

	return $phids;
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s asked this question.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s edited the question title from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$old,
	$new);
	}
	case self::TYPE_CONTENT:
	return pht(
	'%s edited the question description.',
	$this->renderHandleLink($author_phid));
	case self::TYPE_ANSWERS:
	$answer_handle = $this->getHandle($this->getNewAnswerPHID());
	$question_handle = $this->getHandle($object_phid);

	return pht(
	'%s answered %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return pht(
	'%s reopened this question.',
	$this->renderHandleLink($author_phid));
	case PonderQuestionStatus::STATUS_CLOSED:
	return pht(
	'%s closed this question.',
	$this->renderHandleLink($author_phid));
	}
	}

	return parent::getTitle();
	}

	public function getIcon() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	return 'fa-pencil';
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return 'fa-check-circle';
	case PonderQuestionStatus::STATUS_CLOSED:
	return 'fa-minus-circle';
	}
	case self::TYPE_ANSWERS:
	return 'fa-plus';
	}

	return parent::getIcon();
	}

	public function getColor() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	case self::TYPE_CONTENT:
	return PhabricatorTransactions::COLOR_BLUE;
	case self::TYPE_ANSWERS:
	return PhabricatorTransactions::COLOR_GREEN;
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return PhabricatorTransactions::COLOR_GREEN;
	case PonderQuestionStatus::STATUS_CLOSED:
	return PhabricatorTransactions::COLOR_BLACK;
	}
	}
	}

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	return true;
	}
	return parent::hasChangeDetails();
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	public function getActionStrength() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return 3;
	}
	break;
	case self::TYPE_ANSWERS:
	return 2;
	}

	return parent::getActionStrength();
	}

	public function getActionName() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht('Asked');
	}
	break;
	case self::TYPE_ANSWERS:
	return pht('Answered');
	}

	return parent::getActionName();
	}

	public function shouldHide() {
	switch ($this->getTransactionType()) {
	case self::TYPE_CONTENT:
	if ($this->getOldValue() === null) {
	return true;
	} else {
	return false;
	}
	break;
	}

	return parent::shouldHide();
	}

	public function getTitleForFeed(PhabricatorFeedStory $story) {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

	$old = $this->getOldValue();
	$new = $this->getNewValue();

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	return pht(
	'%s asked a question: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	} else {
	return pht(
	'%s edited the title of %s (was "%s")',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$old);
	}
	case self::TYPE_CONTENT:
	return pht(
	'%s edited the description of %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case self::TYPE_ANSWERS:
	$answer_handle = $this->getHandle($this->getNewAnswerPHID());
	$question_handle = $this->getHandle($object_phid);
	return pht(
	'%s answered %s',
	$this->renderHandleLink($author_phid),
	$answer_handle->renderLink($question_handle->getFullName()));
	case self::TYPE_STATUS:
	switch ($new) {
	case PonderQuestionStatus::STATUS_OPEN:
	return pht(
	'%s reopened %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PonderQuestionStatus::STATUS_CLOSED:
	return pht(
	'%s closed %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	}

	return parent::getTitleForFeed($story);
	}

	public function getBodyForFeed(PhabricatorFeedStory $story) {
	$new = $this->getNewValue();
	$old = $this->getOldValue();

	$body = null;

	switch ($this->getTransactionType()) {
	case self::TYPE_TITLE:
	if ($old === null) {
	$question = $story->getObject($this->getObjectPHID());
	return phutil_escape_html_newlines(
	- phutil_utf8_shorten($question->getContent(), 128));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(128)
	+ ->truncateString($question->getContent()));
	}
	break;
	case self::TYPE_ANSWERS:
	$answer = $this->getNewAnswerObject($story);
	if ($answer) {
	return phutil_escape_html_newlines(
	- phutil_utf8_shorten($answer->getContent(), 128));
	+ id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(128)
	+ ->truncateString($answer->getContent()));
	}
	break;
	}

	return parent::getBodyForFeed($story);
	}

	/**
	* Currently the application only supports adding answers one at a time.
	* This data is stored as a list of phids. Use this function to get the
	* new phid.
	*/
	private function getNewAnswerPHID() {
	$new = $this->getNewValue();
	$old = $this->getOldValue();
	$add = array_diff($new, $old);

	if (count($add) != 1) {
	throw new Exception(
	'There should be only one answer added at a time.');
	}

	return reset($add);
	}

	/**
	* Generally, the answer object is only available if the transaction
	* type is self::TYPE_ANSWERS.
	*
	* Some stories - notably ones made before D7027 - will be of the more
	* generic @{class:PhabricatorApplicationTransactionFeedStory}. These
	* poor stories won't have the PonderAnswer loaded, and thus will have
	* less cool information.
	*/
	private function getNewAnswerObject(PhabricatorFeedStory $story) {
	if ($story instanceof PonderTransactionFeedStory) {
	$answer_phid = $this->getNewAnswerPHID();
	if ($answer_phid) {
	return $story->getObject($answer_phid);
	}
	}
	return null;
	}

	}
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommitData.php b/src/applications/repository/storage/PhabricatorRepositoryCommitData.php
	index 88a311bbf4..499e16ab78 100644
	--- a/src/applications/repository/storage/PhabricatorRepositoryCommitData.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryCommitData.php
	@@ -1,61 +1,63 @@
	<?php

	final class PhabricatorRepositoryCommitData extends PhabricatorRepositoryDAO {

	/**
	* NOTE: We denormalize this into the commit table; make sure the sizes
	* match up.
	*/
	const SUMMARY_MAX_LENGTH = 80;

	protected $commitID;
	protected $authorName = '';
	protected $commitMessage = '';
	protected $commitDetails = array();

	public function getConfiguration() {
	return array(
	self::CONFIG_TIMESTAMPS => false,
	self::CONFIG_SERIALIZATION => array(
	'commitDetails' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	public function getSummary() {
	$message = $this->getCommitMessage();
	return self::summarizeCommitMessage($message);
	}

	public static function summarizeCommitMessage($message) {
	$summary = phutil_split_lines($message, $retain_endings = false);
	$summary = head($summary);
	- $summary = phutil_utf8_shorten($summary, self::SUMMARY_MAX_LENGTH);
	+ $summary = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumCodepoints(self::SUMMARY_MAX_LENGTH)
	+ ->truncateString($summary);

	return $summary;
	}

	public function getCommitDetail($key, $default = null) {
	return idx($this->commitDetails, $key, $default);
	}

	public function setCommitDetail($key, $value) {
	$this->commitDetails[$key] = $value;
	return $this;
	}

	public function toDictionary() {
	return array(
	'commitID' => $this->commitID,
	'authorName' => $this->authorName,
	'commitMessage' => $this->commitMessage,
	'commitDetails' => json_encode($this->commitDetails),
	);
	}

	public static function newFromDictionary(array $dict) {
	return id(new PhabricatorRepositoryCommitData())
	->loadFromArray($dict);
	}

	}
	diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	index e0e8baf0ba..79a4ea75de 100644
	--- a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	+++ b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
	@@ -1,171 +1,173 @@
	<?php

	final class PhabricatorSlowvoteSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getResultTypeDescription() {
	return pht('Slowvotes');
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();
	$saved->setParameter(
	'authorPHIDs',
	$this->readUsersFromRequest($request, 'authors'));

	$saved->setParameter('voted', $request->getBool('voted'));
	$saved->setParameter('statuses', $request->getArr('statuses'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new PhabricatorSlowvoteQuery())
	->withAuthorPHIDs($saved->getParameter('authorPHIDs', array()));

	if ($saved->getParameter('voted')) {
	$query->withVotesByViewer(true);
	}

	$statuses = $saved->getParameter('statuses', array());
	if (count($statuses) == 1) {
	$status = head($statuses);
	if ($status == 'open') {
	$query->withIsClosed(false);
	} else {
	$query->withIsClosed(true);
	}
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved_query) {
	$phids = $saved_query->getParameter('authorPHIDs', array());
	$author_handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	->withPHIDs($phids)
	->execute();

	$voted = $saved_query->getParameter('voted', false);
	$statuses = $saved_query->getParameter('statuses', array());

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('authors')
	->setLabel(pht('Authors'))
	->setValue($author_handles))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->addCheckbox(
	'voted',
	1,
	pht("Show only polls I've voted in."),
	$voted))
	->appendChild(
	id(new AphrontFormCheckboxControl())
	->setLabel(pht('Status'))
	->addCheckbox(
	'statuses[]',
	'open',
	pht('Open'),
	in_array('open', $statuses))
	->addCheckbox(
	'statuses[]',
	'closed',
	pht('Closed'),
	in_array('closed', $statuses)));
	}

	protected function getURI($path) {
	return '/vote/'.$path;
	}

	public function getBuiltinQueryNames() {
	$names = array(
	'open' => pht('Open Polls'),
	'all' => pht('All Polls'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	$names['voted'] = pht('Voted In');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'open':
	return $query->setParameter('statuses', array('open'));
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	case 'voted':
	return $query->setParameter('voted', true);
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	public function getRequiredHandlePHIDsForResultList(
	array $polls,
	PhabricatorSavedQuery $query) {
	return mpull($polls, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $polls,
	PhabricatorSavedQuery $query,
	array $handles) {

	assert_instances_of($polls, 'PhabricatorSlowvotePoll');
	$viewer = $this->requireViewer();

	$list = id(new PHUIObjectItemListView())
	->setUser($viewer);

	$phids = mpull($polls, 'getAuthorPHID');

	foreach ($polls as $poll) {
	$date_created = phabricator_datetime($poll->getDateCreated(), $viewer);
	if ($poll->getAuthorPHID()) {
	$author = $handles[$poll->getAuthorPHID()]->renderLink();
	} else {
	$author = null;
	}

	$item = id(new PHUIObjectItemView())
	->setObjectName('V'.$poll->getID())
	->setHeader($poll->getQuestion())
	->setHref('/V'.$poll->getID())
	->setDisabled($poll->getIsClosed())
	->addIcon('none', $date_created);

	$description = $poll->getDescription();
	if (strlen($description)) {
	- $item->addAttribute(phutil_utf8_shorten($poll->getDescription(), 120));
	+ $item->addAttribute(id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(120)
	+ ->truncateString($poll->getDescription()));
	}

	if ($author) {
	$item->addByline(pht('Author: %s', $author));
	}

	$list->addItem($item);
	}

	return $list;
	}

	}
	diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
	index 0009e4836b..2b588a8a33 100644
	--- a/src/view/form/control/AphrontFormPolicyControl.php
	+++ b/src/view/form/control/AphrontFormPolicyControl.php
	@@ -1,230 +1,233 @@
	<?php

	final class AphrontFormPolicyControl extends AphrontFormControl {

	private $object;
	private $capability;
	private $policies;

	public function setPolicyObject(PhabricatorPolicyInterface $object) {
	$this->object = $object;
	return $this;
	}

	public function setPolicies(array $policies) {
	assert_instances_of($policies, 'PhabricatorPolicy');
	$this->policies = $policies;
	return $this;
	}

	public function setCapability($capability) {
	$this->capability = $capability;

	$labels = array(
	PhabricatorPolicyCapability::CAN_VIEW => pht('Visible To'),
	PhabricatorPolicyCapability::CAN_EDIT => pht('Editable By'),
	PhabricatorPolicyCapability::CAN_JOIN => pht('Joinable By'),
	);

	if (isset($labels[$capability])) {
	$label = $labels[$capability];
	} else {
	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if ($capobj) {
	$label = $capobj->getCapabilityName();
	} else {
	$label = pht('Capability "%s"', $capability);
	}
	}

	$this->setLabel($label);

	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-policy';
	}

	protected function getOptions() {
	$capability = $this->capability;

	$options = array();
	foreach ($this->policies as $policy) {
	if ($policy->getPHID() == PhabricatorPolicies::POLICY_PUBLIC) {
	// Never expose "Public" for capabilities which don't support it.
	$capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
	if (!$capobj \|\| !$capobj->shouldAllowPublicPolicySetting()) {
	continue;
	}
	}
	+ $policy_short_name = id(new PhutilUTF8StringTruncator())
	+ ->setMaximumGlyphs(28)
	+ ->truncateString($policy->getName());

	$options[$policy->getType()][$policy->getPHID()] = array(
	- 'name' => phutil_utf8_shorten($policy->getName(), 28),
	+ 'name' => $policy_short_name,
	'full' => $policy->getName(),
	'icon' => $policy->getIcon(),
	);
	}

	// If we were passed several custom policy options, throw away the ones
	// which aren't the value for this capability. For example, an object might
	// have a custom view pollicy and a custom edit policy. When we render
	// the selector for "Can View", we don't want to show the "Can Edit"
	// custom policy -- if we did, the menu would look like this:
	//
	// Custom
	// Custom Policy
	// Custom Policy
	//
	// ...where one is the "view" custom policy, and one is the "edit" custom
	// policy.

	$type_custom = PhabricatorPolicyType::TYPE_CUSTOM;
	if (!empty($options[$type_custom])) {
	$options[$type_custom] = array_select_keys(
	$options[$type_custom],
	array($this->getValue()));
	}

	// If there aren't any custom policies, add a placeholder policy so we
	// render a menu item. This allows the user to switch to a custom policy.

	if (empty($options[$type_custom])) {
	$placeholder = new PhabricatorPolicy();
	$placeholder->setName(pht('Custom Policy...'));
	$options[$type_custom][$this->getCustomPolicyPlaceholder()] = array(
	'name' => $placeholder->getName(),
	'full' => $placeholder->getName(),
	'icon' => $placeholder->getIcon(),
	);
	}

	$options = array_select_keys(
	$options,
	array(
	PhabricatorPolicyType::TYPE_GLOBAL,
	PhabricatorPolicyType::TYPE_USER,
	PhabricatorPolicyType::TYPE_CUSTOM,
	PhabricatorPolicyType::TYPE_PROJECT,
	));

	return $options;
	}

	protected function renderInput() {
	if (!$this->object) {
	throw new Exception(pht('Call setPolicyObject() before rendering!'));
	}
	if (!$this->capability) {
	throw new Exception(pht('Call setCapability() before rendering!'));
	}

	$policy = $this->object->getPolicy($this->capability);
	if (!$policy) {
	// TODO: Make this configurable.
	$policy = PhabricatorPolicies::POLICY_USER;
	}

	if (!$this->getValue()) {
	$this->setValue($policy);
	}

	$control_id = celerity_generate_unique_node_id();
	$input_id = celerity_generate_unique_node_id();

	$caret = phutil_tag(
	'span',
	array(
	'class' => 'caret',
	));

	$input = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'id' => $input_id,
	'name' => $this->getName(),
	'value' => $this->getValue(),
	));

	$options = $this->getOptions();

	$order = array();
	$labels = array();
	foreach ($options as $key => $values) {
	$order[$key] = array_keys($values);
	$labels[$key] = PhabricatorPolicyType::getPolicyTypeName($key);
	}

	$flat_options = array_mergev($options);

	$icons = array();
	foreach (igroup($flat_options, 'icon') as $icon => $ignored) {
	$icons[$icon] = id(new PHUIIconView())
	->setIconFont($icon);
	}


	Javelin::initBehavior(
	'policy-control',
	array(
	'controlID' => $control_id,
	'inputID' => $input_id,
	'options' => $flat_options,
	'groups' => array_keys($options),
	'order' => $order,
	'icons' => $icons,
	'labels' => $labels,
	'value' => $this->getValue(),
	'customPlaceholder' => $this->getCustomPolicyPlaceholder(),
	));

	$selected = idx($flat_options, $this->getValue(), array());
	$selected_icon = idx($selected, 'icon');
	$selected_name = idx($selected, 'name');

	return phutil_tag(
	'div',
	array(
	),
	array(
	javelin_tag(
	'a',
	array(
	'class' => 'grey button dropdown has-icon policy-control',
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'policy-control',
	'id' => $control_id,
	),
	array(
	$caret,
	javelin_tag(
	'span',
	array(
	'sigil' => 'policy-label',
	'class' => 'phui-button-text',
	),
	array(
	idx($icons, $selected_icon),
	$selected_name,
	)),
	)),
	$input,
	));

	return AphrontFormSelectControl::renderSelectTag(
	$this->getValue(),
	$this->getOptions(),
	array(
	'name' => $this->getName(),
	'disabled' => $this->getDisabled() ? 'disabled' : null,
	'id' => $this->getID(),
	));
	}

	private function getCustomPolicyPlaceholder() {
	return 'custom:placeholder';
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 15:06 (3 w, 1 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125786
Default Alt Text: (190 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions