Page MenuHomePhabricator
Files F14849845

D11076.id26589.diff
No OneTemporary
Actions

D11076.id26589.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2583,11 +2583,14 @@
'PhameBlogDeleteController' => 'applications/phame/controller/blog/PhameBlogDeleteController.php',
'PhameBlogEditController' => 'applications/phame/controller/blog/PhameBlogEditController.php',
'PhameBlogFeedController' => 'applications/phame/controller/blog/PhameBlogFeedController.php',
+ 'PhameBlogHasBloggerEdgeType' => 'applications/phame/edge/PhameBlogHasBloggerEdgeType.php',
+ 'PhameBlogHasPostEdgeType' => 'applications/phame/edge/PhameBlogHasPostEdgeType.php',
'PhameBlogListController' => 'applications/phame/controller/blog/PhameBlogListController.php',
'PhameBlogLiveController' => 'applications/phame/controller/blog/PhameBlogLiveController.php',
'PhameBlogQuery' => 'applications/phame/query/PhameBlogQuery.php',
'PhameBlogSkin' => 'applications/phame/skins/PhameBlogSkin.php',
'PhameBlogViewController' => 'applications/phame/controller/blog/PhameBlogViewController.php',
+ 'PhameBloggerHasBlogEdgeType' => 'applications/phame/edge/PhameBloggerHasBlogEdgeType.php',
'PhameCelerityResources' => 'applications/phame/celerity/PhameCelerityResources.php',
'PhameConduitAPIMethod' => 'applications/phame/conduit/PhameConduitAPIMethod.php',
'PhameController' => 'applications/phame/controller/PhameController.php',
@@ -2597,6 +2600,7 @@
'PhamePostDeleteController' => 'applications/phame/controller/post/PhamePostDeleteController.php',
'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
'PhamePostFramedController' => 'applications/phame/controller/post/PhamePostFramedController.php',
+ 'PhamePostHasBlogEdgeType' => 'applications/phame/edge/PhamePostHasBlogEdgeType.php',
'PhamePostListController' => 'applications/phame/controller/post/PhamePostListController.php',
'PhamePostNewController' => 'applications/phame/controller/post/PhamePostNewController.php',
'PhamePostNotLiveController' => 'applications/phame/controller/post/PhamePostNotLiveController.php',
@@ -5806,11 +5810,14 @@
'PhameBlogDeleteController' => 'PhameController',
'PhameBlogEditController' => 'PhameController',
'PhameBlogFeedController' => 'PhameController',
+ 'PhameBlogHasBloggerEdgeType' => 'PhabricatorEdgeType',
+ 'PhameBlogHasPostEdgeType' => 'PhabricatorEdgeType',
'PhameBlogListController' => 'PhameController',
'PhameBlogLiveController' => 'PhameController',
'PhameBlogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'PhameBlogSkin' => 'PhabricatorController',
'PhameBlogViewController' => 'PhameController',
+ 'PhameBloggerHasBlogEdgeType' => 'PhabricatorEdgeType',
'PhameCelerityResources' => 'CelerityResources',
'PhameConduitAPIMethod' => 'ConduitAPIMethod',
'PhameController' => 'PhabricatorController',
@@ -5825,6 +5832,7 @@
'PhamePostDeleteController' => 'PhameController',
'PhamePostEditController' => 'PhameController',
'PhamePostFramedController' => 'PhameController',
+ 'PhamePostHasBlogEdgeType' => 'PhabricatorEdgeType',
'PhamePostListController' => 'PhameController',
'PhamePostNewController' => 'PhameController',
'PhamePostNotLiveController' => 'PhameController',
diff --git a/src/applications/phame/edge/PhameBlogHasBloggerEdgeType.php b/src/applications/phame/edge/PhameBlogHasBloggerEdgeType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phame/edge/PhameBlogHasBloggerEdgeType.php
@@ -0,0 +1,105 @@
+<?php
+
+final class PhameBlogHasBloggerEdgeType extends PhabricatorEdgeType {
+
+ const EDGECONST = 9;
+
+ public function shouldWriteInverseTransactions() {
+ return true;
+ }
+
+ public function getInverseEdgeConstant() {
+ return PhameBloggerHasBlogEdgeType::EDGECONST;
+ }
+
+ public function getTransactionAddString(
+ $actor,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blogger(s): %s.',
+ $actor,
+ $add_count,
+ $add_edges);
+ }
+
+ public function getTransactionRemoveString(
+ $actor,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blogger(s): %s.',
+ $actor,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getTransactionEditString(
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blogger(s), added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getFeedAddString(
+ $actor,
+ $object,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blogger(s) to %s: %s.',
+ $actor,
+ $add_count,
+ $object,
+ $add_edges);
+ }
+
+ public function getFeedRemoveString(
+ $actor,
+ $object,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blogger(s) from %s: %s.',
+ $actor,
+ $rem_count,
+ $object,
+ $rem_edges);
+ }
+
+ public function getFeedEditString(
+ $actor,
+ $object,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blogger(s) for %s, added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $object,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+}
diff --git a/src/applications/phame/edge/PhameBlogHasPostEdgeType.php b/src/applications/phame/edge/PhameBlogHasPostEdgeType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phame/edge/PhameBlogHasPostEdgeType.php
@@ -0,0 +1,105 @@
+<?php
+
+final class PhameBlogHasPostEdgeType extends PhabricatorEdgeType {
+
+ const EDGECONST = 7;
+
+ public function shouldWriteInverseTransactions() {
+ return true;
+ }
+
+ public function getInverseEdgeConstant() {
+ return PhamePostHasBlogEdgeType::EDGECONST;
+ }
+
+ public function getTransactionAddString(
+ $actor,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s post(s): %s.',
+ $actor,
+ $add_count,
+ $add_edges);
+ }
+
+ public function getTransactionRemoveString(
+ $actor,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s post(s): %s.',
+ $actor,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getTransactionEditString(
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s post(s), added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getFeedAddString(
+ $actor,
+ $object,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s post(s) to %s: %s.',
+ $actor,
+ $add_count,
+ $object,
+ $add_edges);
+ }
+
+ public function getFeedRemoveString(
+ $actor,
+ $object,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s post(s) from %s: %s.',
+ $actor,
+ $rem_count,
+ $object,
+ $rem_edges);
+ }
+
+ public function getFeedEditString(
+ $actor,
+ $object,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s post(s) for %s, added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $object,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+}
diff --git a/src/applications/phame/edge/PhameBloggerHasBlogEdgeType.php b/src/applications/phame/edge/PhameBloggerHasBlogEdgeType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phame/edge/PhameBloggerHasBlogEdgeType.php
@@ -0,0 +1,105 @@
+<?php
+
+final class PhameBloggerHasBlogEdgeType extends PhabricatorEdgeType {
+
+ const EDGECONST = 10;
+
+ public function shouldWriteInverseTransactions() {
+ return true;
+ }
+
+ public function getInverseEdgeConstant() {
+ return PhameBlogHasBloggerEdgeType::EDGECONST;
+ }
+
+ public function getTransactionAddString(
+ $actor,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blog(s): %s.',
+ $actor,
+ $add_count,
+ $add_edges);
+ }
+
+ public function getTransactionRemoveString(
+ $actor,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blog(s): %s.',
+ $actor,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getTransactionEditString(
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blog(s), added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getFeedAddString(
+ $actor,
+ $object,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blog(s) to %s: %s.',
+ $actor,
+ $add_count,
+ $object,
+ $add_edges);
+ }
+
+ public function getFeedRemoveString(
+ $actor,
+ $object,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blog(s) from %s: %s.',
+ $actor,
+ $rem_count,
+ $object,
+ $rem_edges);
+ }
+
+ public function getFeedEditString(
+ $actor,
+ $object,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blog(s) for %s, added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $object,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+}
diff --git a/src/applications/phame/edge/PhamePostHasBlogEdgeType.php b/src/applications/phame/edge/PhamePostHasBlogEdgeType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phame/edge/PhamePostHasBlogEdgeType.php
@@ -0,0 +1,105 @@
+<?php
+
+final class PhamePostHasBlogEdgeType extends PhabricatorEdgeType {
+
+ const EDGECONST = 8;
+
+ public function shouldWriteInverseTransactions() {
+ return true;
+ }
+
+ public function getInverseEdgeConstant() {
+ return PhameBlogHasPostEdgeType::EDGECONST;
+ }
+
+ public function getTransactionAddString(
+ $actor,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blog(s): %s.',
+ $actor,
+ $add_count,
+ $add_edges);
+ }
+
+ public function getTransactionRemoveString(
+ $actor,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blog(s): %s.',
+ $actor,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getTransactionEditString(
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blog(s), added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+ public function getFeedAddString(
+ $actor,
+ $object,
+ $add_count,
+ $add_edges) {
+
+ return pht(
+ '%s added %s blog(s) to %s: %s.',
+ $actor,
+ $add_count,
+ $object,
+ $add_edges);
+ }
+
+ public function getFeedRemoveString(
+ $actor,
+ $object,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s removed %s blog(s) from %s: %s.',
+ $actor,
+ $rem_count,
+ $object,
+ $rem_edges);
+ }
+
+ public function getFeedEditString(
+ $actor,
+ $object,
+ $total_count,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges) {
+
+ return pht(
+ '%s edited %s blog(s) for %s, added %s: %s; removed %s: %s.',
+ $actor,
+ $total_count,
+ $object,
+ $add_count,
+ $add_edges,
+ $rem_count,
+ $rem_edges);
+ }
+
+}
diff --git a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
--- a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
+++ b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
@@ -5,11 +5,6 @@
const TABLE_NAME_EDGE = 'edge';
const TABLE_NAME_EDGEDATA = 'edgedata';
- const TYPE_BLOG_HAS_POST = 7;
- const TYPE_POST_HAS_BLOG = 8;
- const TYPE_BLOG_HAS_BLOGGER = 9;
- const TYPE_BLOGGER_HAS_BLOG = 10;
-
const TYPE_PROJ_MEMBER = 13;
const TYPE_MEMBER_OF_PROJ = 14;
@@ -125,11 +120,6 @@
private static function getInverse($edge_type) {
static $map = array(
- self::TYPE_BLOG_HAS_POST => self::TYPE_POST_HAS_BLOG,
- self::TYPE_POST_HAS_BLOG => self::TYPE_BLOG_HAS_POST,
- self::TYPE_BLOG_HAS_BLOGGER => self::TYPE_BLOGGER_HAS_BLOG,
- self::TYPE_BLOGGER_HAS_BLOG => self::TYPE_BLOG_HAS_BLOGGER,
-
self::TYPE_PROJ_MEMBER => self::TYPE_MEMBER_OF_PROJ,
self::TYPE_MEMBER_OF_PROJ => self::TYPE_PROJ_MEMBER,
@@ -229,13 +219,6 @@
case self::TYPE_COMMIT_HAS_DREV:
case self::TYPE_REVIEWER_FOR_DREV:
return '%s edited revision(s), added %d: %s; removed %d: %s.';
- case self::TYPE_BLOG_HAS_POST:
- return '%s edited post(s), added %d: %s; removed %d: %s.';
- case self::TYPE_POST_HAS_BLOG:
- case self::TYPE_BLOGGER_HAS_BLOG:
- return '%s edited blog(s), added %d: %s; removed %d: %s.';
- case self::TYPE_BLOG_HAS_BLOGGER:
- return '%s edited blogger(s), added %d: %s; removed %d: %s.';
case self::TYPE_PROJ_MEMBER:
return '%s edited member(s), added %d: %s; removed %d: %s.';
case self::TYPE_MEMBER_OF_PROJ:
@@ -291,13 +274,6 @@
case self::TYPE_COMMIT_HAS_DREV:
case self::TYPE_REVIEWER_FOR_DREV:
return '%s added %d revision(s): %s.';
- case self::TYPE_BLOG_HAS_POST:
- return '%s added %d post(s): %s.';
- case self::TYPE_POST_HAS_BLOG:
- case self::TYPE_BLOGGER_HAS_BLOG:
- return '%s added %d blog(s): %s.';
- case self::TYPE_BLOG_HAS_BLOGGER:
- return '%s added %d blogger(s): %s.';
case self::TYPE_PROJ_MEMBER:
return '%s added %d member(s): %s.';
case self::TYPE_MEMBER_OF_PROJ:
@@ -352,13 +328,6 @@
case self::TYPE_COMMIT_HAS_DREV:
case self::TYPE_REVIEWER_FOR_DREV:
return '%s removed %d revision(s): %s.';
- case self::TYPE_BLOG_HAS_POST:
- return '%s removed %d post(s): %s.';
- case self::TYPE_POST_HAS_BLOG:
- case self::TYPE_BLOGGER_HAS_BLOG:
- return '%s removed %d blog(s): %s.';
- case self::TYPE_BLOG_HAS_BLOGGER:
- return '%s removed %d blogger(s): %s.';
case self::TYPE_PROJ_MEMBER:
return '%s removed %d member(s): %s.';
case self::TYPE_MEMBER_OF_PROJ:
@@ -411,13 +380,6 @@
case self::TYPE_COMMIT_HAS_DREV:
case self::TYPE_REVIEWER_FOR_DREV:
return '%s updated revisions of %s.';
- case self::TYPE_BLOG_HAS_POST:
- return '%s updated posts of %s.';
- case self::TYPE_POST_HAS_BLOG:
- case self::TYPE_BLOGGER_HAS_BLOG:
- return '%s updated blogs of %s.';
- case self::TYPE_BLOG_HAS_BLOGGER:
- return '%s updated bloggers of %s.';
case self::TYPE_PROJ_MEMBER:
return '%s updated members of %s.';
case self::TYPE_MEMBER_OF_PROJ:
diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
--- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
@@ -249,51 +249,51 @@
'The actions you are taking have no effect:',
),
- '%s edited post(s), added %d: %s; removed %d: %s.' =>
+ '%s edited post(s), added %s: %s; removed %s: %s.' =>
'%s edited posts, added: %3$s; removed: %5$s',
- '%s added %d post(s): %s.' => array(
+ '%s added %s post(s): %s.' => array(
array(
'%s added a post: %3$s.',
'%s added posts: %3$s.',
),
),
- '%s removed %d post(s): %s.' => array(
+ '%s removed %s post(s): %s.' => array(
array(
'%s removed a post: %3$s.',
'%s removed posts: %3$s.',
),
),
- '%s edited blog(s), added %d: %s; removed %d: %s.' =>
+ '%s edited blog(s), added %s: %s; removed %s: %s.' =>
'%s edited blogs, added: %3$s; removed: %5$s',
- '%s added %d blog(s): %s.' => array(
+ '%s added %s blog(s): %s.' => array(
array(
'%s added a blog: %3$s.',
'%s added blogs: %3$s.',
),
),
- '%s removed %d blog(s): %s.' => array(
+ '%s removed %s blog(s): %s.' => array(
array(
'%s removed a blog: %3$s.',
'%s removed blogs: %3$s.',
),
),
- '%s edited blogger(s), added %d: %s; removed %d: %s.' =>
+ '%s edited blogger(s), added %s: %s; removed %s: %s.' =>
'%s edited bloggers, added: %3$s; removed: %5$s',
- '%s added %d blogger(s): %s.' => array(
+ '%s added %s blogger(s): %s.' => array(
array(
'%s added a blogger: %3$s.',
'%s added bloggers: %3$s.',
),
),
- '%s removed %d blogger(s): %s.' => array(
+ '%s removed %s blogger(s): %s.' => array(
array(
'%s removed a blogger: %3$s.',
'%s removed bloggers: %3$s.',

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 5, 2:32 AM (19 h, 45 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7090985
Default Alt Text
D11076.id26589.diff (17 KB)

Event Timeline

Phabricator · Built by Phacility