@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Use application PHIDs in Macro
Summary: Ref T2715. Move Macro to application PHIDs.
Test Plan: Used `conduit.query` to look up macros.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran
Maniphest Tasks: T2715
Differential Revision: https://secure.phabricator.com/D6556
+56
-32
+2
src/__phutil_library_map__.php
+2
src/__phutil_library_map__.php
···
1214
1214
'PhabricatorMacroMailReceiver' => 'applications/macro/mail/PhabricatorMacroMailReceiver.php',
1215
1215
'PhabricatorMacroMemeController' => 'applications/macro/controller/PhabricatorMacroMemeController.php',
1216
1216
'PhabricatorMacroMemeDialogController' => 'applications/macro/controller/PhabricatorMacroMemeDialogController.php',
1217
+
'PhabricatorMacroPHIDTypeMacro' => 'applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php',
1217
1218
'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
1218
1219
'PhabricatorMacroReplyHandler' => 'applications/macro/mail/PhabricatorMacroReplyHandler.php',
1219
1220
'PhabricatorMacroSearchEngine' => 'applications/macro/query/PhabricatorMacroSearchEngine.php',
···
3227
3228
'PhabricatorMacroMailReceiver' => 'PhabricatorObjectMailReceiver',
3228
3229
'PhabricatorMacroMemeController' => 'PhabricatorMacroController',
3229
3230
'PhabricatorMacroMemeDialogController' => 'PhabricatorMacroController',
3231
+
'PhabricatorMacroPHIDTypeMacro' => 'PhabricatorPHIDType',
3230
3232
'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
3231
3233
'PhabricatorMacroReplyHandler' => 'PhabricatorMailReplyHandler',
3232
3234
'PhabricatorMacroSearchEngine' => 'PhabricatorApplicationSearchEngine',
+50
src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php
+50
src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php
···
1
+
<?php
2
+
3
+
final class PhabricatorMacroPHIDTypeMacro extends PhabricatorPHIDType {
4
+
5
+
const TYPECONST = 'MCRO';
6
+
7
+
public function getTypeConstant() {
8
+
return self::TYPECONST;
9
+
}
10
+
11
+
public function getTypeName() {
12
+
return pht('Image Macro');
13
+
}
14
+
15
+
public function newObject() {
16
+
return new PhabricatorFileImageMacro();
17
+
}
18
+
19
+
public function loadObjects(
20
+
PhabricatorObjectQuery $query,
21
+
array $phids) {
22
+
23
+
return id(new PhabricatorMacroQuery())
24
+
->setViewer($query->getViewer())
25
+
->withPHIDs($phids)
26
+
->execute();
27
+
}
28
+
29
+
public function loadHandles(
30
+
PhabricatorHandleQuery $query,
31
+
array $handles,
32
+
array $objects) {
33
+
34
+
foreach ($handles as $phid => $handle) {
35
+
$macro = $objects[$phid];
36
+
37
+
$id = $macro->getID();
38
+
$name = $macro->getName();
39
+
40
+
$handle->setName($name);
41
+
$handle->setFullName(pht('Image Macro "%s"', $name));
42
+
$handle->setURI("/macro/view/{$id}/");
43
+
}
44
+
}
45
+
46
+
public function canLoadNamedObject($name) {
47
+
return false;
48
+
}
49
+
50
+
}
+1
-1
src/applications/macro/storage/PhabricatorFileImageMacro.php
+1
-1
src/applications/macro/storage/PhabricatorFileImageMacro.php
+1
-1
src/applications/macro/storage/PhabricatorMacroTransaction.php
+1
-1
src/applications/macro/storage/PhabricatorMacroTransaction.php
-1
src/applications/phid/PhabricatorObjectHandle.php
-1
src/applications/phid/PhabricatorObjectHandle.php
···
109
109
110
110
static $map = array(
111
111
PhabricatorPHIDConstants::PHID_TYPE_USER => 'User',
112
-
PhabricatorPHIDConstants::PHID_TYPE_MCRO => 'Image Macro',
113
112
PhabricatorPHIDConstants::PHID_TYPE_PIMG => 'Pholio Image',
114
113
PhabricatorPHIDConstants::PHID_TYPE_BLOG => 'Blog',
115
114
PhabricatorPHIDConstants::PHID_TYPE_POST => 'Post',
-1
src/applications/phid/PhabricatorPHIDConstants.php
-1
src/applications/phid/PhabricatorPHIDConstants.php
+1
-26
src/applications/phid/handle/PhabricatorObjectHandleData.php
+1
-26
src/applications/phid/handle/PhabricatorObjectHandleData.php
···
89
89
->execute();
90
90
$xactions += mpull($results, null, 'getPHID');
91
91
break;
92
-
case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
92
+
case PhabricatorMacroPHIDTypeMacro::TYPECONST:
93
93
$results = id(new PhabricatorMacroTransactionQuery())
94
94
->setViewer($this->viewer)
95
95
->withPHIDs($subtype_phids)
···
99
99
}
100
100
}
101
101
return mpull($xactions, null, 'getPHID');
102
-
103
-
case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
104
-
$macros = id(new PhabricatorMacroQuery())
105
-
->setViewer($this->viewer)
106
-
->withPHIDs($phids)
107
-
->execute();
108
-
return mpull($macros, null, 'getPHID');
109
102
110
103
case PhabricatorPHIDConstants::PHID_TYPE_BLOG:
111
104
$blogs = id(new PhameBlogQuery())
···
335
328
$handle->setFullName($image->getName());
336
329
$handle->setURI(
337
330
'/M'.$image->getMockID().'/'.$image->getID().'/');
338
-
$handle->setComplete(true);
339
-
}
340
-
$handles[$phid] = $handle;
341
-
}
342
-
break;
343
-
344
-
case PhabricatorPHIDConstants::PHID_TYPE_MCRO:
345
-
foreach ($phids as $phid) {
346
-
$handle = new PhabricatorObjectHandle();
347
-
$handle->setPHID($phid);
348
-
$handle->setType($type);
349
-
if (empty($objects[$phid])) {
350
-
$handle->setName('Unknown Macro');
351
-
} else {
352
-
$macro = $objects[$phid];
353
-
$handle->setName($macro->getName());
354
-
$handle->setFullName('Image Macro "'.$macro->getName().'"');
355
-
$handle->setURI('/macro/view/'.$macro->getID().'/');
356
331
$handle->setComplete(true);
357
332
}
358
333
$handles[$phid] = $handle;
-1
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
-1
src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
···
159
159
PhabricatorPHIDConstants::PHID_TYPE_BLOG => 'PhameBlog',
160
160
PhabricatorPHIDConstants::PHID_TYPE_POST => 'PhamePost',
161
161
PhabricatorPHIDConstants::PHID_TYPE_ANSW => 'PonderAnswer',
162
-
PhabricatorPHIDConstants::PHID_TYPE_MCRO => 'PhabricatorFileImageMacro',
163
162
PhabricatorPHIDConstants::PHID_TYPE_CONP => 'ConpherenceThread',
164
163
PhabricatorPHIDConstants::PHID_TYPE_ACNT => 'PhortuneAccount',
165
164
PhabricatorPHIDConstants::PHID_TYPE_PRCH => 'PhortunePurchase',
+1
-1
src/view/phui/PHUIFeedStoryView.php
+1
-1
src/view/phui/PHUIFeedStoryView.php