No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php b/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	index 7f680ebdbd..29702c8dc1 100644
	--- a/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	+++ b/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	@@ -1,83 +1,84 @@
	<?php

	final class MacroQueryConduitAPIMethod extends MacroConduitAPIMethod {

	public function getAPIMethodName() {
	return 'macro.query';
	}

	public function getMethodDescription() {
	return 'Retrieve image macro information.';
	}

	public function defineParamTypes() {
	return array(
	'authorPHIDs' => 'optional list<phid>',
	'phids' => 'optional list<phid>',
	'ids' => 'optional list<id>',
	'names' => 'optional list<string>',
	'nameLike' => 'optional string',
	);
	}

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

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

	protected function execute(ConduitAPIRequest $request) {
	- $query = new PhabricatorMacroQuery();
	- $query->setViewer($request->getUser());
	+ $query = id(new PhabricatorMacroQuery())
	+ ->setViewer($request->getUser())
	+ ->needFiles(true);

	$author_phids = $request->getValue('authorPHIDs');
	$phids = $request->getValue('phids');
	$ids = $request->getValue('ids');
	$name_like = $request->getValue('nameLike');
	$names = $request->getValue('names');

	if ($author_phids) {
	$query->withAuthorPHIDs($author_phids);
	}

	if ($phids) {
	$query->withPHIDs($phids);
	}

	if ($ids) {
	$query->withIDs($ids);
	}

	if ($name_like) {
	$query->withNameLike($name_like);
	}

	if ($names) {
	$query->withNames($names);
	}

	$macros = $query->execute();

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

	$results = array();
	foreach ($macros as $macro) {
	$file = $macro->getFile();
	$results[$macro->getName()] = array(
	'uri' => $file->getBestURI(),
	'phid' => $macro->getPHID(),
	'authorPHID' => $file->getAuthorPHID(),
	'dateCreated' => $file->getDateCreated(),
	'filePHID' => $file->getPHID(),
	);
	}

	return $results;
	}

	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
	index 5442754e42..074b7e5a7f 100644
	--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
	@@ -1,266 +1,267 @@
	<?php

	final class PhabricatorMacroEditController extends PhabricatorMacroController {

	private $id;

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

	public function processRequest() {
	$this->requireApplicationCapability(
	PhabricatorMacroManageCapability::CAPABILITY);

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

	if ($this->id) {
	$macro = id(new PhabricatorMacroQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	+ ->needFiles(true)
	->executeOne();
	if (!$macro) {
	return new Aphront404Response();
	}
	} else {
	$macro = new PhabricatorFileImageMacro();
	$macro->setAuthorPHID($user->getPHID());
	}

	$errors = array();
	$e_name = true;
	$e_file = null;
	$file = null;
	$can_fetch = PhabricatorEnv::getEnvConfig('security.allow-outbound-http');

	if ($request->isFormPost()) {
	$original = clone $macro;

	$new_name = null;
	if ($request->getBool('name_form') \|\| !$macro->getID()) {
	$new_name = $request->getStr('name');

	$macro->setName($new_name);

	if (!strlen($macro->getName())) {
	$errors[] = pht('Macro name is required.');
	$e_name = pht('Required');
	} else if (!preg_match('/^[a-z0-9:_-]{3,}\z/', $macro->getName())) {
	$errors[] = pht(
	'Macro must be at least three characters long and contain only '.
	'lowercase letters, digits, hyphens, colons and underscores.');
	$e_name = pht('Invalid');
	} else {
	$e_name = null;
	}
	}

	$file = null;
	if ($request->getFileExists('file')) {
	$file = PhabricatorFile::newFromPHPUpload(
	$_FILES['file'],
	array(
	'name' => $request->getStr('name'),
	'authorPHID' => $user->getPHID(),
	'isExplicitUpload' => true,
	'canCDN' => true,
	));
	} else if ($request->getStr('url')) {
	try {
	$file = PhabricatorFile::newFromFileDownload(
	$request->getStr('url'),
	array(
	'name' => $request->getStr('name'),
	'authorPHID' => $user->getPHID(),
	'isExplicitUpload' => true,
	'canCDN' => true,
	));
	} catch (Exception $ex) {
	$errors[] = pht('Could not fetch URL: %s', $ex->getMessage());
	}
	} else if ($request->getStr('phid')) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($user)
	->withPHIDs(array($request->getStr('phid')))
	->executeOne();
	}

	if ($file) {
	if (!$file->isViewableInBrowser()) {
	$errors[] = pht('You must upload an image.');
	$e_file = pht('Invalid');
	} else {
	$macro->setFilePHID($file->getPHID());
	$macro->attachFile($file);
	$e_file = null;
	}
	}

	if (!$macro->getID() && !$file) {
	$errors[] = pht('You must upload an image to create a macro.');
	$e_file = pht('Required');
	}

	if (!$errors) {
	try {
	$xactions = array();

	if ($new_name !== null) {
	$xactions[] = id(new PhabricatorMacroTransaction())
	->setTransactionType(PhabricatorMacroTransactionType::TYPE_NAME)
	->setNewValue($new_name);
	}

	if ($file) {
	$xactions[] = id(new PhabricatorMacroTransaction())
	->setTransactionType(PhabricatorMacroTransactionType::TYPE_FILE)
	->setNewValue($file->getPHID());
	}

	$editor = id(new PhabricatorMacroEditor())
	->setActor($user)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request);

	$xactions = $editor->applyTransactions($original, $xactions);

	$view_uri = $this->getApplicationURI('/view/'.$original->getID().'/');
	return id(new AphrontRedirectResponse())->setURI($view_uri);
	} catch (AphrontDuplicateKeyQueryException $ex) {
	throw $ex;
	$errors[] = pht('Macro name is not unique!');
	$e_name = pht('Duplicate');
	}
	}
	}

	$current_file = null;
	if ($macro->getFilePHID()) {
	$current_file = $macro->getFile();
	}

	$form = new AphrontFormView();
	$form->addHiddenInput('name_form', 1);
	$form->setUser($request->getUser());

	$form
	->setEncType('multipart/form-data')
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($macro->getName())
	->setCaption(
	pht('This word or phrase will be replaced with the image.'))
	->setError($e_name));

	if (!$macro->getID()) {
	if ($current_file) {
	$current_file_view = id(new PhabricatorFileLinkView())
	->setFilePHID($current_file->getPHID())
	->setFileName($current_file->getName())
	->setFileViewable(true)
	->setFileViewURI($current_file->getBestURI())
	->render();
	$form->addHiddenInput('phid', $current_file->getPHID());
	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Selected File'))
	->setValue($current_file_view));

	$other_label = pht('Change File');
	} else {
	$other_label = pht('File');
	}

	if ($can_fetch) {
	$form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('URL'))
	->setName('url')
	->setValue($request->getStr('url'))
	->setError($request->getFileExists('file') ? false : $e_file));
	}

	$form->appendChild(
	id(new AphrontFormFileControl())
	->setLabel($other_label)
	->setName('file')
	->setError($request->getStr('url') ? false : $e_file));
	}


	$view_uri = $this->getApplicationURI('/view/'.$macro->getID().'/');

	if ($macro->getID()) {
	$cancel_uri = $view_uri;
	} else {
	$cancel_uri = $this->getApplicationURI();
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Image Macro'))
	->addCancelButton($cancel_uri));

	$crumbs = $this->buildApplicationCrumbs();

	if ($macro->getID()) {
	$title = pht('Edit Image Macro');
	$crumb = pht('Edit Macro');

	$crumbs->addTextCrumb(pht('Macro "%s"', $macro->getName()), $view_uri);
	} else {
	$title = pht('Create Image Macro');
	$crumb = pht('Create Macro');
	}

	$crumbs->addTextCrumb($crumb, $request->getRequestURI());

	$upload = null;
	if ($macro->getID()) {
	$upload_form = id(new AphrontFormView())
	->setEncType('multipart/form-data')
	->setUser($request->getUser());

	if ($can_fetch) {
	$upload_form->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('URL'))
	->setName('url')
	->setValue($request->getStr('url')));
	}

	$upload_form
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('File'))
	->setName('file'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Upload File')));

	$upload = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Upload New File'))
	->setForm($upload_form);
	}

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setFormErrors($errors)
	->setForm($form);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$form_box,
	$upload,
	),
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroMemeController.php b/src/applications/macro/controller/PhabricatorMacroMemeController.php
	index d8b9d5c441..badb1759ad 100644
	--- a/src/applications/macro/controller/PhabricatorMacroMemeController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroMemeController.php
	@@ -1,68 +1,69 @@
	<?php

	final class PhabricatorMacroMemeController
	extends PhabricatorMacroController {

	public function shouldAllowPublic() {
	return true;
	}

	public function processRequest() {
	$request = $this->getRequest();
	$macro_name = $request->getStr('macro');
	$upper_text = $request->getStr('uppertext');
	$lower_text = $request->getStr('lowertext');
	$user = $request->getUser();

	$uri = PhabricatorMacroMemeController::generateMacro($user, $macro_name,
	$upper_text, $lower_text);
	if ($uri === false) {
	return new Aphront404Response();
	}
	return id(new AphrontRedirectResponse())
	->setIsExternal(true)
	->setURI($uri);
	}

	public static function generateMacro($user, $macro_name, $upper_text,
	$lower_text) {
	$macro = id(new PhabricatorMacroQuery())
	->setViewer($user)
	->withNames(array($macro_name))
	+ ->needFiles(true)
	->executeOne();
	if (!$macro) {
	return false;
	}
	$file = $macro->getFile();

	$upper_text = strtoupper($upper_text);
	$lower_text = strtoupper($lower_text);
	$mixed_text = md5($upper_text).':'.md5($lower_text);
	$hash = 'meme'.hash('sha256', $mixed_text);
	$xform = id(new PhabricatorTransformedFile())
	->loadOneWhere('originalphid=%s and transform=%s',
	$file->getPHID(), $hash);

	if ($xform) {
	$memefile = id(new PhabricatorFileQuery())
	->setViewer($user)
	->withPHIDs(array($xform->getTransformedPHID()))
	->executeOne();
	if ($memefile) {
	return $memefile->getBestURI();
	}
	}

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$transformers = (new PhabricatorImageTransformer());
	$newfile = $transformers
	->executeMemeTransform($file, $upper_text, $lower_text);
	$xfile = new PhabricatorTransformedFile();
	$xfile->setOriginalPHID($file->getPHID());
	$xfile->setTransformedPHID($newfile->getPHID());
	$xfile->setTransform($hash);
	$xfile->save();

	return $newfile->getBestURI();
	}
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
	index 01a3e9a926..da9bc83260 100644
	--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
	@@ -1,201 +1,202 @@
	<?php

	final class PhabricatorMacroViewController
	extends PhabricatorMacroController {

	private $id;

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

	public function shouldAllowPublic() {
	return true;
	}

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

	$macro = id(new PhabricatorMacroQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	+ ->needFiles(true)
	->executeOne();
	if (!$macro) {
	return new Aphront404Response();
	}

	$file = $macro->getFile();

	$title_short = pht('Macro "%s"', $macro->getName());
	$title_long = pht('Image Macro "%s"', $macro->getName());

	$actions = $this->buildActionView($macro);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->setActionList($actions);
	$crumbs->addTextCrumb(
	$title_short,
	$this->getApplicationURI('/view/'.$macro->getID().'/'));

	$properties = $this->buildPropertyView($macro, $actions);
	if ($file) {
	$file_view = new PHUIPropertyListView();
	$file_view->addImageContent(
	phutil_tag(
	'img',
	array(
	'src' => $file->getViewURI(),
	'class' => 'phabricator-image-macro-hero',
	)));
	}

	$xactions = id(new PhabricatorMacroTransactionQuery())
	->setViewer($request->getUser())
	->withObjectPHIDs(array($macro->getPHID()))
	->execute();

	$engine = id(new PhabricatorMarkupEngine())
	->setViewer($user);
	foreach ($xactions as $xaction) {
	if ($xaction->getComment()) {
	$engine->addObject(
	$xaction->getComment(),
	PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
	}
	}
	$engine->process();

	$timeline = id(new PhabricatorApplicationTransactionView())
	->setUser($user)
	->setObjectPHID($macro->getPHID())
	->setTransactions($xactions)
	->setMarkupEngine($engine);

	$header = id(new PHUIHeaderView())
	->setUser($user)
	->setPolicyObject($macro)
	->setHeader($title_long);

	if ($macro->getIsDisabled()) {
	$header->addTag(
	id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName(pht('Macro Disabled'))
	->setBackgroundColor(PHUITagView::COLOR_BLACK));
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$comment_header = $is_serious
	? pht('Add Comment')
	: pht('Grovel in Awe');

	$draft = PhabricatorDraft::newFromUserAndKey($user, $macro->getPHID());

	$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setObjectPHID($macro->getPHID())
	->setDraft($draft)
	->setHeaderText($comment_header)
	->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
	->setSubmitButtonName(pht('Add Comment'));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($file_view) {
	$object_box->addPropertyList($file_view);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	$add_comment_form,
	),
	array(
	'title' => $title_short,
	));
	}

	private function buildActionView(PhabricatorFileImageMacro $macro) {
	$can_manage = $this->hasApplicationCapability(
	PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$view = id(new PhabricatorActionListView())
	->setUser($request->getUser())
	->setObject($macro)
	->setObjectURI($request->getRequestURI())
	->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Macro'))
	->setHref($this->getApplicationURI('/edit/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-pencil'));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Audio'))
	->setHref($this->getApplicationURI('/audio/'.$macro->getID().'/'))
	->setDisabled(!$can_manage)
	->setWorkflow(!$can_manage)
	->setIcon('fa-music'));

	if ($macro->getIsDisabled()) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Restore Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-check-circle-o'));
	} else {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Disable Macro'))
	->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
	->setWorkflow(true)
	->setDisabled(!$can_manage)
	->setIcon('fa-ban'));
	}

	return $view;
	}

	private function buildPropertyView(
	PhabricatorFileImageMacro $macro,
	PhabricatorActionListView $actions) {

	$view = id(new PHUIPropertyListView())
	->setUser($this->getRequest()->getUser())
	->setObject($macro)
	->setActionList($actions);

	switch ($macro->getAudioBehavior()) {
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_ONCE:
	$view->addProperty(pht('Audio Behavior'), pht('Play Once'));
	break;
	case PhabricatorFileImageMacro::AUDIO_BEHAVIOR_LOOP:
	$view->addProperty(pht('Audio Behavior'), pht('Loop'));
	break;
	}

	$audio_phid = $macro->getAudioPHID();
	if ($audio_phid) {
	$this->loadHandles(array($audio_phid));
	$view->addProperty(
	pht('Audio'),
	$this->getHandle($audio_phid)->renderLink());
	}

	$view->invokeWillRenderEvent();

	return $view;
	}

	}
	diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
	index f07f308585..c7f9534499 100644
	--- a/src/applications/macro/query/PhabricatorMacroQuery.php
	+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
	@@ -1,227 +1,236 @@
	<?php

	final class PhabricatorMacroQuery
	extends PhabricatorCursorPagedPolicyAwareQuery {

	private $ids;
	private $phids;
	private $authors;
	private $names;
	private $nameLike;
	private $dateCreatedAfter;
	private $dateCreatedBefore;
	private $flagColor;

	+ private $needFiles;
	+
	private $status = 'status-any';
	const STATUS_ANY = 'status-any';
	const STATUS_ACTIVE = 'status-active';
	const STATUS_DISABLED = 'status-disabled';

	public static function getStatusOptions() {
	return array(
	self::STATUS_ACTIVE => pht('Active Macros'),
	self::STATUS_DISABLED => pht('Disabled Macros'),
	self::STATUS_ANY => pht('Active and Disabled Macros'),
	);
	}

	public static function getFlagColorsOptions() {
	$options = array(
	'-1' => pht('(No Filtering)'),
	'-2' => pht('(Marked With Any Flag)'),
	);

	foreach (PhabricatorFlagColor::getColorNameMap() as $color => $name) {
	$options[$color] = $name;
	}

	return $options;
	}

	public function withIDs(array $ids) {
	$this->ids = $ids;
	return $this;
	}

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

	public function withAuthorPHIDs(array $authors) {
	$this->authors = $authors;
	return $this;
	}

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

	public function withNames(array $names) {
	$this->names = $names;
	return $this;
	}

	public function withStatus($status) {
	$this->status = $status;
	return $this;
	}

	public function withDateCreatedBefore($date_created_before) {
	$this->dateCreatedBefore = $date_created_before;
	return $this;
	}

	public function withDateCreatedAfter($date_created_after) {
	$this->dateCreatedAfter = $date_created_after;
	return $this;
	}

	public function withFlagColor($flag_color) {
	$this->flagColor = $flag_color;
	return $this;
	}

	+ public function needFiles($need_files) {
	+ $this->needFiles = $need_files;
	+ return $this;
	+ }
	+
	protected function loadPage() {
	$macro_table = new PhabricatorFileImageMacro();
	$conn = $macro_table->establishConnection('r');

	$rows = queryfx_all(
	$conn,
	'SELECT m.* FROM %T m %Q %Q %Q',
	$macro_table->getTableName(),
	$this->buildWhereClause($conn),
	$this->buildOrderClause($conn),
	$this->buildLimitClause($conn));

	return $macro_table->loadAllFromArray($rows);
	}

	protected function buildWhereClause(AphrontDatabaseConnection $conn) {
	$where = array();

	if ($this->ids) {
	$where[] = qsprintf(
	$conn,
	'm.id IN (%Ld)',
	$this->ids);
	}

	if ($this->phids) {
	$where[] = qsprintf(
	$conn,
	'm.phid IN (%Ls)',
	$this->phids);
	}

	if ($this->authors) {
	$where[] = qsprintf(
	$conn,
	'm.authorPHID IN (%Ls)',
	$this->authors);
	}

	if ($this->nameLike) {
	$where[] = qsprintf(
	$conn,
	'm.name LIKE %~',
	$this->nameLike);
	}

	if ($this->names) {
	$where[] = qsprintf(
	$conn,
	'm.name IN (%Ls)',
	$this->names);
	}

	switch ($this->status) {
	case self::STATUS_ACTIVE:
	$where[] = qsprintf(
	$conn,
	'm.isDisabled = 0');
	break;
	case self::STATUS_DISABLED:
	$where[] = qsprintf(
	$conn,
	'm.isDisabled = 1');
	break;
	case self::STATUS_ANY:
	break;
	default:
	throw new Exception("Unknown status '{$this->status}'!");
	}

	if ($this->dateCreatedAfter) {
	$where[] = qsprintf(
	$conn,
	'm.dateCreated >= %d',
	$this->dateCreatedAfter);
	}

	if ($this->dateCreatedBefore) {
	$where[] = qsprintf(
	$conn,
	'm.dateCreated <= %d',
	$this->dateCreatedBefore);
	}

	if ($this->flagColor != '-1' && $this->flagColor !== null) {
	if ($this->flagColor == '-2') {
	$flag_colors = array_keys(PhabricatorFlagColor::getColorNameMap());
	} else {
	$flag_colors = array($this->flagColor);
	}
	$flags = id(new PhabricatorFlagQuery())
	->withOwnerPHIDs(array($this->getViewer()->getPHID()))
	->withTypes(array(PhabricatorMacroMacroPHIDType::TYPECONST))
	->withColors($flag_colors)
	->setViewer($this->getViewer())
	->execute();

	if (empty($flags)) {
	throw new PhabricatorEmptyQueryException('No matching flags.');
	} else {
	$where[] = qsprintf(
	$conn,
	'm.phid IN (%Ls)',
	mpull($flags, 'getObjectPHID'));
	}
	}

	$where[] = $this->buildPagingClause($conn);

	return $this->formatWhereClause($where);
	}

	protected function didFilterPage(array $macros) {
	- $file_phids = mpull($macros, 'getFilePHID');
	- $files = id(new PhabricatorFileQuery())
	- ->setViewer($this->getViewer())
	- ->setParentQuery($this)
	- ->withPHIDs($file_phids)
	- ->execute();
	- $files = mpull($files, null, 'getPHID');
	-
	- foreach ($macros as $key => $macro) {
	- $file = idx($files, $macro->getFilePHID());
	- if (!$file) {
	- unset($macros[$key]);
	- continue;
	+ if ($this->needFiles) {
	+ $file_phids = mpull($macros, 'getFilePHID');
	+ $files = id(new PhabricatorFileQuery())
	+ ->setViewer($this->getViewer())
	+ ->setParentQuery($this)
	+ ->withPHIDs($file_phids)
	+ ->execute();
	+ $files = mpull($files, null, 'getPHID');
	+
	+ foreach ($macros as $key => $macro) {
	+ $file = idx($files, $macro->getFilePHID());
	+ if (!$file) {
	+ unset($macros[$key]);
	+ continue;
	+ }
	+ $macro->attachFile($file);
	}
	- $macro->attachFile($file);
	}

	return $macros;
	}

	protected function getPagingColumn() {
	return 'm.id';
	}

	public function getQueryApplicationClass() {
	return 'PhabricatorMacroApplication';
	}

	}
	diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	index 48d2a2c5b7..45390b13b1 100644
	--- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	+++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
	@@ -1,220 +1,221 @@
	<?php

	final class PhabricatorMacroSearchEngine
	extends PhabricatorApplicationSearchEngine {

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

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

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

	$saved->setParameter('status', $request->getStr('status'));
	$saved->setParameter('names', $request->getStrList('names'));
	$saved->setParameter('nameLike', $request->getStr('nameLike'));
	$saved->setParameter('createdStart', $request->getStr('createdStart'));
	$saved->setParameter('createdEnd', $request->getStr('createdEnd'));
	$saved->setParameter('flagColor', $request->getStr('flagColor', '-1'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new PhabricatorMacroQuery())
	+ ->needFiles(true)
	->withIDs($saved->getParameter('ids', array()))
	->withPHIDs($saved->getParameter('phids', array()))
	->withAuthorPHIDs($saved->getParameter('authorPHIDs', array()));

	$status = $saved->getParameter('status');
	$options = PhabricatorMacroQuery::getStatusOptions();
	if (empty($options[$status])) {
	$status = head_key($options);
	}
	$query->withStatus($status);

	$names = $saved->getParameter('names', array());
	if ($names) {
	$query->withNames($names);
	}

	$like = $saved->getParameter('nameLike');
	if (strlen($like)) {
	$query->withNameLike($like);
	}

	$start = $this->parseDateTime($saved->getParameter('createdStart'));
	$end = $this->parseDateTime($saved->getParameter('createdEnd'));

	if ($start) {
	$query->withDateCreatedAfter($start);
	}

	if ($end) {
	$query->withDateCreatedBefore($end);
	}

	$color = $saved->getParameter('flagColor');
	if (strlen($color)) {
	$query->withFlagColor($color);
	}

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

	$status = $saved_query->getParameter('status');
	$names = implode(', ', $saved_query->getParameter('names', array()));
	$like = $saved_query->getParameter('nameLike');
	$color = $saved_query->getParameter('flagColor', '-1');

	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('status')
	->setLabel(pht('Status'))
	->setOptions(PhabricatorMacroQuery::getStatusOptions())
	->setValue($status))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorPeopleDatasource())
	->setName('authors')
	->setLabel(pht('Authors'))
	->setValue($author_handles))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('nameLike')
	->setLabel(pht('Name Contains'))
	->setValue($like))
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('names')
	->setLabel(pht('Exact Names'))
	->setValue($names))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('flagColor')
	->setLabel(pht('Marked with Flag'))
	->setOptions(PhabricatorMacroQuery::getFlagColorsOptions())
	->setValue($color));

	$this->buildDateRange(
	$form,
	$saved_query,
	'createdStart',
	pht('Created After'),
	'createdEnd',
	pht('Created Before'));
	}

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

	public function getBuiltinQueryNames() {
	$names = array(
	'active' => pht('Active'),
	'all' => pht('All'),
	);

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

	return $names;
	}

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

	switch ($query_key) {
	case 'active':
	return $query;
	case 'all':
	return $query->setParameter(
	'status',
	PhabricatorMacroQuery::STATUS_ANY);
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

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

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

	assert_instances_of($macros, 'PhabricatorFileImageMacro');
	$viewer = $this->requireViewer();

	$pinboard = new PHUIPinboardView();
	foreach ($macros as $macro) {
	$file = $macro->getFile();

	$item = new PHUIPinboardItemView();
	if ($file) {
	$item->setImageURI($file->getThumb280x210URI());
	$item->setImageSize(280, 210);
	}

	if ($macro->getDateCreated()) {
	$datetime = phabricator_date($macro->getDateCreated(), $viewer);
	$item->appendChild(
	phutil_tag(
	'div',
	array(),
	pht('Created on %s', $datetime)));
	} else {
	// Very old macros don't have a creation date. Rendering something
	// keeps all the pins at the same height and avoids flow issues.
	$item->appendChild(
	phutil_tag(
	'div',
	array(),
	pht('Created in ages long past')));
	}

	if ($macro->getAuthorPHID()) {
	$author_handle = $handles[$macro->getAuthorPHID()];
	$item->appendChild(
	pht('Created by %s', $author_handle->renderLink()));
	}

	$item->setURI($this->getApplicationURI('/view/'.$macro->getID().'/'));
	$item->setDisabled($macro->getisDisabled());
	$item->setHeader($macro->getName());

	$pinboard->addItem($item);
	}

	return $pinboard;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 23:43 (6 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1130012
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions