diff --git a/Core/Notification/Extensions/Push.php b/Core/Notification/Extensions/Push.php
index a1de8bb27fcd7ea8bf2bf2c9c0ae7067aee6fcba..0f1cf3b7accbb9b6c2c6103d3db10d4ae2b5fb2f 100644
--- a/Core/Notification/Extensions/Push.php
+++ b/Core/Notification/Extensions/Push.php
@@ -192,7 +192,7 @@ class Push implements Interfaces\NotificationExtensionInterface
* @param mixed $entity
* @return string
*/
- protected static function buildNotificationMessage(array $notification = [], $from_user, $entity)
+ public static function buildNotificationMessage(array $notification = [], $from_user, $entity)
{
$message = '';
@@ -207,8 +207,22 @@ class Push implements Interfaces\NotificationExtensionInterface
$name = $from_user->name;
$isOwner = $notification['to'] == $entity->owner_guid;
- $prefix = $isOwner ? 'your ': $entity->ownerObj['name']."'s ";
- $desc = ($entity->type == 'activity') ? 'activity': $entity->subtype;
+
+ $prefix = '';
+ if ($isOwner) {
+ $prefix = 'your ';
+ } elseif (isset($entity->ownerObj['name'])) {
+ $prefix = $entity->ownerObj['name'].'\'s ';
+ }
+
+ $desc = 'a post';
+ if ($entity->type == 'activity') {
+ $desc = 'activity';
+ } elseif (isset($entity->subtype)) {
+ $desc = $entity->subtype;
+ } elseif ($isOwner || isset($entity->ownerObj['name'])) {
+ $desc = 'post';
+ }
$boostDescription = $entity->title ?: $entity->name ?: ($entity->type !== 'user' ? 'post' : 'channel');
diff --git a/Spec/Core/Notification/Extensions/PushSpec.php b/Spec/Core/Notification/Extensions/PushSpec.php
new file mode 100644
index 0000000000000000000000000000000000000000..9df1deb49784b94ffbabc5a94acbb19b489f1364
--- /dev/null
+++ b/Spec/Core/Notification/Extensions/PushSpec.php
@@ -0,0 +1,321 @@
+<?php
+
+namespace Spec\Minds\Core\Notification\Extensions;
+
+use Minds\Core\Notification\Extensions\Push;
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+use Minds\Core\Di\Di;
+
+
+use Minds\Core\Events\Dispatcher;
+use Minds\Entities\User;
+use Minds\Core\Notification\Notification as NotificationEntity;
+use Minds\Entities\Entity;
+
+class PushSpec extends ObjectBehavior
+{
+ /** @var Config */
+ protected $config;
+ public function let($config)
+ {
+ $this->config = $config;
+ }
+
+ public function it_is_initializable()
+ {
+ $this->shouldHaveType(Push::class);
+ }
+
+ public function it_should_construct_commented_on_a_post_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'comment'],
+ 'to' => '1'
+ ], $user, $entity)->shouldBe('Bob commented on a post');
+ }
+
+ public function it_should_construct_commented_on_your_post_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $entity->ownerObj = null;
+
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'comment'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob commented on your post');
+ }
+
+ public function it_should_construct_commented_on_alices_post_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->ownerObj = [ 'name'=> 'Alice'];
+
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'comment'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob commented on Alice\'s post');
+ }
+
+
+ public function it_should_construct_your_liked_your_comment_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $entity->type = 'comment';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'like'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob voted up your comment');
+ }
+
+ public function it_should_construct_your_liked_your_activity_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $entity->type = 'activity';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'like'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob voted up your activity');
+ }
+
+ public function it_should_construct_your_liked_your_object_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $entity->type = 'object';
+ $entity->subtype = 'message';
+
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'like'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob voted up your message');
+ }
+
+ public function it_should_construct_your_tagged_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'tag'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob mentioned you in a post');
+ }
+
+ public function it_should_construct_your_reminded_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['test'=>123]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'remind'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob reminded your post');
+ }
+
+ public function it_should_construct_your_boost_gift_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['impressions'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_gift'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob gifted you 99 views');
+ }
+
+ public function it_should_construct_your_boost_request_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['points'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_request'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob has requested a boost of 99 points');
+ }
+
+ public function it_should_construct_your_boost_accepted_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['impressions'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_accepted'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('99 views for post were accepted'); //????
+ }
+
+ public function it_should_construct_your_boost_rejected_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['impressions'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_rejected'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Your boost request for post was rejected');
+ }
+
+ public function it_should_construct_your_boost_revoked_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['impressions'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_revoked'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('You revoked the boost request for post');
+ }
+
+ public function it_should_construct_your_boost_completed_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['impressions'=>99]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'boost_completed'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('99/99 impressions were met for post');
+ }
+
+ public function it_should_construct_your_group_invite_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['group'=>['name'=>'test_group']]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'group_invite'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('Bob invited you to test_group');
+ }
+
+ public function it_should_construct_your_messenger_invite_message(NotificationEntity $notification, User $user, Entity $entity)
+ {
+ $notification->getData()
+ ->shouldBeCalled()
+ ->willReturn(['group'=>['name'=>'test_group']]);
+ $user = new User();
+ $user->name = 'Bob';
+ $entity = new Entity();
+ $entity->owner_guid = '123';
+ $this->buildNotificationMessage([
+ 'notification' => $notification,
+ 'params' => ['notification_view' => 'messenger_invite'],
+ 'to' => '123'
+ ], $user, $entity)->shouldBe('@Bob wants to chat with you!');
+ }
+
+ public function getMatchers()
+ {
+ $matchers['beAnArrayOf'] = function ($subject, $count, $class) {
+ if (!is_array($subject) || ($count !== null && count($subject) !== $count)) {
+ throw new FailureException("Subject should be an array of $count elements");
+ }
+
+ $validTypes = true;
+
+ foreach ($subject as $element) {
+ if (!($element instanceof $class)) {
+ $validTypes = false;
+ break;
+ }
+ }
+
+ if (!$validTypes) {
+ throw new FailureException("Subject should be an array of {$class}");
+ }
+
+ return true;
+ };
+
+ return $matchers;
+ }
+}