Commit 5e2b6fb5 authored by Olivia Madrid's avatar Olivia Madrid
Browse files

Merge branch 'master' of https://gitlab.com/minds/engine into feat/wire-email-currency-574

parents 392452f9 81ed3601

Controllers/api/v1/groups/group.php

+1 −5
Original line number Diff line number Diff line
@@ -271,11 +271,7 @@ class group implements Interfaces\Api 
            return Factory::response([]);

        }



        $canDelete = Session::isAdmin();



        if (!$canDelete && $group->isCreator($user)) {

            $canDelete = $group->getMembersCount() <= 1;

        }

        $canDelete = Session::isAdmin() || $group->isCreator($user);



        if (!$canDelete) {

            return Factory::response([

Controllers/api/v2/boost/feed.php

+10 −1
Original line number Diff line number Diff line
@@ -78,10 +78,12 @@ class feed implements Interfaces\Api 
            case 'newsfeed':

                // Newsfeed boosts



                $resolver = new Core\Entities\Resolver();



                /** @var Core\Boost\Network\Iterator $iterator */

                $iterator = Core\Di\Di::_()->get('Boost\Network\Iterator');

                $iterator

                    ->setLimit($limit)

                    ->setLimit(12)

                    ->setOffset($offset)

                    ->setRating($rating)

                    ->setQuality($quality)
@@ -97,6 +99,13 @@ class feed implements Interfaces\Api 
                        ->setTimestamp($boost->getCreatedTimestamp())

                        ->setUrn(new Urn("urn:boost:{$boost->getType()}:{$boost->getGuid()}"));



                    $entity = $resolver->single(new Urn("urn:boost:{$boost->getType()}:{$boost->getGuid()}"));

                    if (!$entity) {

                        continue; // Duff entity?

                    }



                    $feedSyncEntity->setEntity($entity);



                    $boosts[] = $feedSyncEntity;

                }

               // $boosts = iterator_to_array($iterator, false);

Controllers/api/v2/referrals.php

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ class referrals implements Interfaces\Api 
        $prospect_guid = $pages[0];

        $referral = new Referral;

        $referral->setReferrerGuid($referrer_guid)

            ->setProspectGuid($prospect_guid)

            ->setPingTimestamp(time());

            ->setProspectGuid($prospect_guid);



        $manager = Di::_()->get('Referrals\Manager');

        if(!$manager->ping($referral)){

Core/Boost/Network/Analytics.php

+5 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ class Analytics 
                                'field' => '@reviewed',

                            ],

                        ],

                        [

                            'term' => [

                                'is_campaign' => true

                            ],

                        ],

                    ],

                ],

            ],

Core/Boost/Network/ElasticRepository.php

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ class ElasticRepository 
            ],

        ];



        $must_not[] = [

            'term' => [

                'is_campaign' => true,

            ]

        ];



        if ($opts['offset']) {

            $must[] = [

                'range' => [