No OneTemporary
Actions

Size

10 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
	index 1f82d78423..aa5b7f908e 100644
	--- a/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
	+++ b/src/applications/people/markup/PhabricatorMentionRemarkupRule.php
	@@ -1,190 +1,192 @@
	<?php

	final class PhabricatorMentionRemarkupRule extends PhutilRemarkupRule {

	const KEY_RULE_MENTION = 'rule.mention';
	const KEY_RULE_MENTION_ORIGINAL = 'rule.mention.original';

	const KEY_MENTIONED = 'phabricator.mentioned-user-phids';


	// NOTE: The negative lookbehind prevents matches like "mail@lists", while
	// allowing constructs like "@tomo/@mroch". Since we now allow periods in
	// usernames, we can't resonably distinguish that "@company.com" isn't a
	// username, so we'll incorrectly pick it up, but there's little to be done
	// about that. We forbid terminal periods so that we can correctly capture
	// "@joe" instead of "@joe." in "Hey, @joe.".
	//
	// We disallow "@@joe" because it creates a false positive in the common
	// construction "l@@k", made popular by eBay.
	const REGEX = '/(?<!\w\|@)@([a-zA-Z0-9._-]*[a-zA-Z0-9_-])/';

	public function apply($text) {
	return preg_replace_callback(
	self::REGEX,
	array($this, 'markupMention'),
	$text);
	}

	protected function markupMention(array $matches) {
	$engine = $this->getEngine();

	if ($engine->isTextMode()) {
	return $engine->storeText($matches[0]);
	}

	$token = $engine->storeText('');

	// Store the original text exactly so we can preserve casing if it doesn't
	// resolve into a username.
	$original_key = self::KEY_RULE_MENTION_ORIGINAL;
	$original = $engine->getTextMetadata($original_key, array());
	$original[$token] = $matches[1];
	$engine->setTextMetadata($original_key, $original);

	$metadata_key = self::KEY_RULE_MENTION;
	$metadata = $engine->getTextMetadata($metadata_key, array());
	$username = strtolower($matches[1]);
	if (empty($metadata[$username])) {
	$metadata[$username] = array();
	}
	$metadata[$username][] = $token;
	$engine->setTextMetadata($metadata_key, $metadata);

	return $token;
	}

	public function didMarkupText() {
	$engine = $this->getEngine();

	$metadata_key = self::KEY_RULE_MENTION;
	$metadata = $engine->getTextMetadata($metadata_key, array());
	if (empty($metadata)) {
	// No mentions, or we already processed them.
	return;
	}

	$original_key = self::KEY_RULE_MENTION_ORIGINAL;
	$original = $engine->getTextMetadata($original_key, array());

	$usernames = array_keys($metadata);

	$users = id(new PhabricatorPeopleQuery())
	->setViewer($this->getEngine()->getConfig('viewer'))
	->withUsernames($usernames)
	->needAvailability(true)
	->execute();

	$actual_users = array();

	$mentioned_key = self::KEY_MENTIONED;
	$mentioned = $engine->getTextMetadata($mentioned_key, array());
	foreach ($users as $row) {
	$actual_users[strtolower($row->getUserName())] = $row;
	$mentioned[$row->getPHID()] = $row->getPHID();
	}

	$engine->setTextMetadata($mentioned_key, $mentioned);
	$context_object = $engine->getConfig('contextObject');

	foreach ($metadata as $username => $tokens) {
	$exists = isset($actual_users[$username]);
	$user_has_no_permission = false;

	if ($exists) {
	$user = $actual_users[$username];
	Javelin::initBehavior('phui-hovercards');

	// Check if the user has view access to the object she was mentioned in
	if ($context_object
	&& $context_object instanceof PhabricatorPolicyInterface) {
	if (!PhabricatorPolicyFilter::hasCapability(
	$user,
	$context_object,
	PhabricatorPolicyCapability::CAN_VIEW)) {
	// User mentioned has no permission to this object
	$user_has_no_permission = true;
	}
	}

	$user_href = '/p/'.$user->getUserName().'/';

	if ($engine->isHTMLMailMode()) {
	$user_href = PhabricatorEnv::getProductionURI($user_href);

	if ($user_has_no_permission) {
	$colors = '
	border-color: #92969D;
	color: #92969D;
	background-color: #F7F7F7;';
	} else {
	$colors = '
	border-color: #f1f7ff;
	color: #19558d;
	background-color: #f1f7ff;';
	}

	$tag = phutil_tag(
	'a',
	array(
	'href' => $user_href,
	'style' => $colors.'
	border: 1px solid transparent;
	border-radius: 3px;
	font-weight: bold;
	padding: 0 4px;',
	),
	'@'.$user->getUserName());
	} else {
	if ($engine->getConfig('uri.full')) {
	$user_href = PhabricatorEnv::getURI($user_href);
	}

	$tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_PERSON)
	->setPHID($user->getPHID())
	->setName('@'.$user->getUserName())
	->setHref($user_href);

	if ($user_has_no_permission) {
	$tag->addClass('phabricator-remarkup-mention-nopermission');
	}

	- if (!$user->isResponsive()) {
	+ if ($user->getIsDisabled()) {
	+ $tag->setDotColor(PHUITagView::COLOR_GREY);
	+ } else if (!$user->isResponsive()) {
	$tag->setDotColor(PHUITagView::COLOR_VIOLET);
	} else {
	if ($user->getAwayUntil()) {
	$away = PhabricatorCalendarEventInvitee::AVAILABILITY_AWAY;
	if ($user->getDisplayAvailability() == $away) {
	$tag->setDotColor(PHUITagView::COLOR_RED);
	} else {
	$tag->setDotColor(PHUITagView::COLOR_ORANGE);
	}
	}
	}
	}

	foreach ($tokens as $token) {
	$engine->overwriteStoredText($token, $tag);
	}
	} else {
	// NOTE: The structure here is different from the 'exists' branch,
	// because we want to preserve the original text capitalization and it
	// may differ for each token.
	foreach ($tokens as $token) {
	$tag = phutil_tag(
	'span',
	array(
	'class' => 'phabricator-remarkup-mention-unknown',
	),
	'@'.idx($original, $token, $username));
	$engine->overwriteStoredText($token, $tag);
	}
	}
	}

	// Don't re-process these mentions.
	$engine->setTextMetadata($metadata_key, array());
	}

	}
	diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	index b2a456cd51..f0512e91f1 100644
	--- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	@@ -1,116 +1,118 @@
	<?php

	final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'USER';

	public function getTypeName() {
	return pht('User');
	}

	public function getTypeIcon() {
	return 'fa-user bluegrey';
	}

	public function newObject() {
	return new PhabricatorUser();
	}

	public function getPHIDTypeApplicationClass() {
	return 'PhabricatorPeopleApplication';
	}

	protected function buildQueryForObjects(
	PhabricatorObjectQuery $query,
	array $phids) {

	return id(new PhabricatorPeopleQuery())
	->withPHIDs($phids)
	->needProfile(true)
	->needProfileImage(true)
	->needAvailability(true);
	}

	public function loadHandles(
	PhabricatorHandleQuery $query,
	array $handles,
	array $objects) {

	foreach ($handles as $phid => $handle) {
	$user = $objects[$phid];
	$realname = $user->getRealName();

	$handle->setName($user->getUsername());
	$handle->setURI('/p/'.$user->getUsername().'/');
	$handle->setFullName($user->getFullName());
	$handle->setImageURI($user->getProfileImageURI());

	if ($user->getIsMailingList()) {
	$handle->setIcon('fa-envelope-o');
	$handle->setSubtitle(pht('Mailing List'));
	} else {
	$profile = $user->getUserProfile();
	$icon_key = $profile->getIcon();
	$icon_icon = PhabricatorPeopleIconSet::getIconIcon($icon_key);
	$subtitle = $profile->getDisplayTitle();

	$handle
	->setIcon($icon_icon)
	->setSubtitle($subtitle)
	->setTokenIcon('fa-user');
	}

	$availability = null;
	- if (!$user->isResponsive()) {
	+ if ($user->getIsDisabled()) {
	+ $availability = PhabricatorObjectHandle::AVAILABILITY_DISABLED;
	+ } else if (!$user->isResponsive()) {
	$availability = PhabricatorObjectHandle::AVAILABILITY_NOEMAIL;
	} else {
	$until = $user->getAwayUntil();
	if ($until) {
	$away = PhabricatorCalendarEventInvitee::AVAILABILITY_AWAY;
	if ($user->getDisplayAvailability() == $away) {
	$availability = PhabricatorObjectHandle::AVAILABILITY_NONE;
	} else {
	$availability = PhabricatorObjectHandle::AVAILABILITY_PARTIAL;
	}
	}
	}

	if ($availability) {
	$handle->setAvailability($availability);
	}
	}
	}

	public function canLoadNamedObject($name) {
	return preg_match('/^@.+/', $name);
	}

	public function loadNamedObjects(
	PhabricatorObjectQuery $query,
	array $names) {

	$id_map = array();
	foreach ($names as $name) {
	$id = substr($name, 1);
	$id = phutil_utf8_strtolower($id);
	$id_map[$id][] = $name;
	}

	$objects = id(new PhabricatorPeopleQuery())
	->setViewer($query->getViewer())
	->withUsernames(array_keys($id_map))
	->execute();

	$results = array();
	foreach ($objects as $id => $object) {
	$user_key = $object->getUsername();
	$user_key = phutil_utf8_strtolower($user_key);
	foreach (idx($id_map, $user_key, array()) as $name) {
	$results[$name] = $object;
	}
	}

	return $results;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jul 27, 7:06 PM (1 w, 11 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 186089
Default Alt Text: (10 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions