.gitlab-ci.yml

-image: minds/php:latest
-
-services:
-  - docker:dind
+image: minds/php:7.3
 
 stages:
   - build
@@ -13,38 +10,34 @@ stages:
   - deploy:canary
   - deploy:production
 
-cache:
-  paths:
-    - vendor
-    - bin
-  policy: pull
-
 build:
   stage: build
   script:
-    - apk update && apk add --no-cache git
+    - apk add --no-cache git
     - sh tools/setup.sh production
-  cache:
+  artifacts:
+    name: '$CI_COMMIT_REF_SLUG'
     paths:
       - vendor
       - bin
-    policy: push
 
 test:
   stage: test
-  image: minds/php-tests:latest
+  image: minds/php:7.3
   script:
-    - bin/phpspec run
+    - php -n -c Spec/php-test.ini bin/phpspec run
 
 lint:
   stage: test
-  image: minds/php-tests:latest
+  image: minds/php:7.3
   script:
     - bin/php-cs-fixer fix --allow-risky=yes --verbose --dry-run
 
 prepare:fpm:
   stage: prepare
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY} 
     - |
@@ -59,6 +52,8 @@ prepare:fpm:
 prepare:runners:
   stage: prepare
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
     - |
@@ -142,6 +137,8 @@ qa:manual:
 staging:fpm:
   stage: deploy:staging
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - IMAGE_LABEL="staging"
     - $(aws ecr get-login --no-include-email --region us-east-1)
@@ -168,6 +165,8 @@ staging:fpm:
 canary:fpm:
   stage: deploy:canary
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - IMAGE_LABEL="canary"
     - $(aws ecr get-login --no-include-email --region us-east-1)
@@ -196,6 +195,8 @@ canary:fpm:
 production:fpm:
   stage: deploy:production
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - IMAGE_LABEL="production"
     - $(aws ecr get-login --no-include-email --region us-east-1)
@@ -224,6 +225,8 @@ production:fpm:
 production:runners:
   stage: deploy:production
   image: minds/ci:latest
+  services:
+    - docker:dind
   script:
     - IMAGE_LABEL="production"
     - $(aws ecr get-login --no-include-email --region us-east-1)

Cli/Controller.php

@@ -171,16 +171,17 @@ class Controller
 
     /**
      * Gets the list of publically available commands and filters out the system ones.
+     * @param array $additionalExcludes Additional methods to exclude from command list (optional)
      */
-    public function getCommands()
+    public function getCommands(array $additionalExcludes = [])
     {
-        $excludedMethods = ['__construct', 'help', 'out', 'setArgs', 'setApp', 'getApp', 'getExecCommand', 'getOpt', 'getOpts', 'getAllOpts', 'getCommands', 'displayCommandHelp'];
+        $excludedMethods = ['__construct', 'help', 'out', 'setArgs', 'setApp', 'getApp', 'getExecCommand', 'getOpt', 'getOpts', 'getAllOpts', 'getCommands', 'displayCommandHelp', 'exec', 'gatekeeper'];
         $commands = [];
         foreach ((new ReflectionClass($this))->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
             $commands[] = $method->getName();
         }
 
-        return array_diff($commands, $excludedMethods);
+        return array_diff($commands, $excludedMethods, $additionalExcludes);
     }
 
     public function displayCommandHelp()

Controllers/Cli/CustomerSync.php

@@ -40,12 +40,14 @@ class CustomerSync extends Cli\Controller implements Interfaces\CliControllerInt
             $guid = $data[29];
             try {
                 $insert = new Core\Data\Cassandra\Prepared\Custom();
-                $insert->query("INSERT INTO user_index_to_guid (key, column1, value) VALUES (?, ?, ?)",
-                [
+                $insert->query(
+                    "INSERT INTO user_index_to_guid (key, column1, value) VALUES (?, ?, ?)",
+                    [
                   "$guid:payments",
                   "customer_id",
                   $id
-                ]);
+                ]
+                );
                 $this->db->request($insert);
                 $this->out("$guid with customer id $id done");
             } catch (\Exception $e) {

Controllers/Cli/PartnerEarnings.php

+<?php
+
+namespace Minds\Controllers\Cli;
+
+use Minds\Core;
+use Minds\Core\Monetization\Partners\Manager;
+use Minds\Cli;
+use Minds\Interfaces;
+use Minds\Exceptions;
+use Minds\Entities;
+
+class PartnerEarnings extends Cli\Controller implements Interfaces\CliControllerInterface
+{
+    public function __construct()
+    {
+    }
+
+    public function help($command = null)
+    {
+        $this->out('TBD');
+    }
+    
+    public function exec()
+    {
+        $this->out('Missing subcommand');
+    }
+
+    public function sync()
+    {
+        error_reporting(E_ALL);
+        ini_set('display_errors', 1);
+
+        $daysAgo = $this->getOpt('daysAgo') ?: 0;
+        $from = $this->getOpt('from') ?: strtotime("midnight $daysAgo days ago");
+        $manager = new Manager();
+
+        $i = 0;
+        foreach ($manager->issueDeposits([ 'from' => $from ]) as $record) {
+            $this->out(++$i);
+        }
+    }
+}

Controllers/Cli/SubscriptionSync.php

@@ -56,18 +56,21 @@ class SubscriptionSync extends Cli\Controller implements Interfaces\CliControlle
                 $amount = ($result->quantity * $result->plan->amount) / 100;
 
                 $insert = new Core\Data\Cassandra\Prepared\Custom();
-                $insert->query("INSERT INTO plans (user_guid, plan, entity_guid, amount) VALUES (?, ?, ?, ?)",
-                [
+                $insert->query(
+                    "INSERT INTO plans (user_guid, plan, entity_guid, amount) VALUES (?, ?, ?, ?)",
+                    [
                   $plan['user_guid'],
                   $plan['plan'],
                   $plan['entity_guid'],
                   (int) $amount
-                ]);
+                ]
+                );
                 $this->db->request($insert);
 
                 if ($plan['plan'] == 'exclusive') {
                     $query = new Core\Data\Cassandra\Prepared\Custom();
-                    $query->query("INSERT INTO wire
+                    $query->query(
+                        "INSERT INTO wire
                       (receiver_guid, sender_guid, method, timestamp, entity_guid, wire_guid, amount, recurring, status)
                       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
                         [
@@ -80,7 +83,8 @@ class SubscriptionSync extends Cli\Controller implements Interfaces\CliControlle
                             new \Cassandra\Decimal($amount),
                             true,
                             'success'
-                        ]);
+                        ]
+                    );
 
                     $this->db->request($query);
                 }

Controllers/Cli/Transcode.php

@@ -18,11 +18,12 @@ class Transcode extends Cli\Controller implements Interfaces\CliControllerInterf
     {
         $this->out('TBD');
     }
-    
+
     public function exec()
     {
         $transcoder = new Core\Media\Services\FFMpeg;
         $transcoder->setKey($this->getOpt('guid'));
-        $transcoder->transcode();
+        $transcoder->setFullHD($this->getOpt('full_hd') ?? false);
+        $transcoder->onQueue();
     }
 }

Controllers/api/v1/boost/fetch.php

@@ -61,7 +61,7 @@ class fetch implements Interfaces\Api
             ->setQuality($quality)
             ->setOffset($_GET['offset'])
             ->setType($pages[0])
-            ->setPriority(true);
+            ->setUserGuid($user->getGUID());
 
         if (isset($_GET['rating']) && $pages[0] == 'newsfeed') {
             $cacher = Core\Data\cache\factory::build('Redis');
@@ -79,6 +79,7 @@ class fetch implements Interfaces\Api
                         'boosted_guid' => (string) $guid,
                         'urn' => "urn:boost:content:{$guid}",
                     ]);
+                    /* TODO: Resolve bug below, $entity->guid is private member */
                     Counters::increment($entity->guid, "impression");
                     Counters::increment($entity->owner_guid, "impression");
                 }

Controllers/api/v1/comments.php

@@ -347,15 +347,22 @@ class comments implements Interfaces\Api
 
         $comment = $manager->getByLuid($pages[0]);
 
-        if ($comment && $comment->canEdit()) {
+        if (!$comment) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Comment not found',
+            ]);
+        }
+
+        if ($comment->canEdit()) {
             $manager->delete($comment);
             return Factory::response([]);
         }
         //check if owner of activity trying to remove
         $entity = Entities\Factory::build($comment->getEntityGuid());
-        
+
         if ($entity->owner_guid == Core\Session::getLoggedInUserGuid()) {
-            $manager->delete($comment, [ 'force' => true ]);
+            $manager->delete($comment, ['force' => true]);
             return Factory::response([]);
         }
 

Controllers/api/v1/entities/report.php

@@ -36,8 +36,12 @@ class report implements Interfaces\Api
         /** @var Core\Reports\Repository $repository */
         $repository = Di::_()->get('Reports\Repository');
 
-        $done = $repository->create($pages[0], Core\Session::getLoggedinUser(),
-            $reason, $reason_note);
+        $done = $repository->create(
+            $pages[0],
+            Core\Session::getLoggedinUser(),
+            $reason,
+            $reason_note
+        );
 
         return Factory::response([
             'done' => $done

Controllers/api/v1/groups/review.php

@@ -19,6 +19,13 @@ class review implements Interfaces\Api
         $group = Entities\Factory::build($pages[0]);
         $user = Core\Session::getLoggedInUser();
 
+        if (!$group) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Group not found'
+            ]);
+        }
+
         if (!$group->isOwner($user) && !$group->isModerator($user)) {
             return Factory::response([
                 'status' => 'error',

Controllers/api/v1/media.php

@@ -36,6 +36,13 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
                 return Factory::response(['status' => 'error']);
             }
 
+            if (!in_array($this->getType($entity), ['object:video', 'object:image'], true)) {
+                return Factory::response([
+                    'status' => 'error',
+                    'message' => 'Entity is not a media entity',
+                ]);
+            }
+
             switch ($entity->subtype) {
                 case "video":
                     // Helpers\Counters::increment($pages[0], 'plays');
@@ -43,10 +50,12 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
                     if (isset($pages[1]) && $pages[1] == 'play') {
                         http_response_code(302);
 
+                        $res = !empty($_GET['res']) && in_array($_GET['res'], ['360', '720', '1080'], true) ?$_GET['res'] : '360';
+
                         if ($entity->subtype == 'audio') {
                             \forward($entity->getSourceUrl('128.mp3'));
                         } else {
-                            \forward($entity->getSourceUrl('360.mp4'));
+                            \forward($entity->getSourceUrl("{$res}.mp4"));
                         }
 
                         exit;
@@ -58,8 +67,11 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
                         $response = $entities[0];
                         $response['transcodes'] = [
                             '360.mp4' => $entity->getSourceUrl('360.mp4'),
-                            '720.mp4' =>  $entity->getSourceUrl('720.mp4')
+                            '720.mp4' => $entity->getSourceUrl('720.mp4'),
                         ];
+                        if ($entity->getFlag('full_hd')) {
+                            $response['transcodes']['1080.mp4'] = $entity->getSourceUrl('1080.mp4');
+                        }
                     }
 
                     if (method_exists($entity, 'getWireThreshold')) {
@@ -73,7 +85,7 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
                         Security\ACL::$ignore = $ignore;
                     }
 
-                    /* No break */
+                    /* no break */
                 default:
                     $entity->fullExport = true;
                     $response['entity'] = $entity->export();
@@ -158,6 +170,7 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
                 $body = $req['body'];
                 fwrite($fp, $body);
                 $video->access_id = 0;
+                $video->patch(['full_hd', Core\Session::getLoggedinUser()->isPro()]);
                 $video->upload($tmpFilename);
                 $guid = $video->save();
                 fclose($fp);
@@ -258,7 +271,8 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
             'access_id' => 0,
             'owner_guid' => $user->guid,
             'hidden' => $container_guid !== null,
-            'container_guid' => $container_guid
+            'container_guid' => $container_guid,
+            'full_hd' => $user->isPro(),
         ]);
 
         $assets = Core\Media\AssetsFactory::build($entity);
@@ -267,7 +281,7 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
         $entity->setAssets($assets->upload($media, $data));
 
         // Save initial entity
-       
+
         $success =  $save
             ->setEntity($entity)
             ->save(true);
@@ -356,4 +370,9 @@ class media implements Interfaces\Api, Interfaces\ApiIgnorePam
 
         return $response;
     }
+
+    private function getType($entity): string
+    {
+        return $entity->subtype ? "{$entity->type}:{$entity->subtype}" : $entity->type;
+    }
 }

Controllers/api/v1/merchant.php

@@ -299,28 +299,6 @@ class merchant implements Interfaces\Api
                   $response['uploaded'] = true;
               }
               break;
-          case "charge":
-            $sale = (new Payments\Sale)
-              ->setId($pages[1]);
-
-            try {
-                Payments\Factory::build('braintree', ['gateway'=>'merchants'])->chargeSale($sale);
-            } catch (\Exception $e) {
-                var_dump($e);
-                exit;
-            }
-            exit;
-            break;
-          case "void":
-            $sale = (new Payments\Sale)
-              ->setId($pages[1]);
-            Payments\Factory::build('braintree', ['gateway'=>'merchants'])->voidSale($sale);
-            break;
-          case "refund":
-            $sale = (new Payments\Sale)
-              ->setId($pages[1]);
-            Payments\Factory::build('braintree', ['gateway'=>'merchants'])->refundSale($sale);
-            break;
         }
 
         return Factory::response($response);

Controllers/api/v1/minds/config.php

@@ -9,6 +9,7 @@ namespace Minds\Controllers\api\v1\minds;
 
 use Minds;
 use Minds\Core;
+use Minds\Core\Rewards\Contributions\ContributionValues;
 use Minds\Interfaces;
 use Minds\Api\Factory;
 
@@ -39,6 +40,12 @@ class config implements Interfaces\Api, Interfaces\ApiIgnorePam
             "plus" => Minds\Core\Config::_()->get('plus'),
             "report_reasons" => Minds\Core\Config::_()->get('report_reasons'),
             "last_tos_update" => (Minds\Core\Config::_()->get('last_tos_update') ?: time()),
+            'handlers' => [
+                'plus' => Minds\Core\Di\Di::_()->get('Config')->get('plus')['handler'] ?? null,
+                'pro' => Minds\Core\Di\Di::_()->get('Config')->get('pro')['handler'] ?? null,
+            ],
+            'upgrades' => Minds\Core\Di\Di::_()->get('Config')->get('upgrades'),
+            'contribution_values' => ContributionValues::export(),
         ];
 
         return Factory::response($minds);

Controllers/api/v1/newsfeed.php

@@ -181,24 +181,18 @@ class newsfeed implements Interfaces\Api
 
                 /** @var Core\Boost\Network\Iterator $iterator */
                 $iterator = Core\Di\Di::_()->get('Boost\Network\Iterator');
-                $iterator->setPriority(!get_input('offset', ''))
-                    ->setType('newsfeed')
+                $iterator->setType('newsfeed')
                     ->setLimit($limit)
                     ->setOffset($offset)
-                    //->setRating(0)
                     ->setQuality(0)
-                    ->setIncrement(false);
+                    ->setUserGuid(Core\Session::getLoggedinUserGuid())
+                    ->setRating((int) Core\Session::getLoggedinUser()->getBoostRating());
 
 
                 foreach ($iterator as $guid => $boost) {
                     $boost->boosted = true;
                     $boost->boosted_guid = (string) $guid;
                     array_unshift($activity, $boost);
-                    //if (get_input('offset')) {
-                    //bug: sometimes views weren't being calculated on scroll down
-                    //Counters::increment($boost->guid, "impression");
-                    //Counters::increment($boost->owner_guid, "impression");
-                    //}
                 }
                 $cacher->set(Core\Session::getLoggedinUser()->guid . ':boost-offset:newsfeed', $iterator->getOffset(), (3600 / 2));
             } catch (\Exception $e) {
@@ -358,7 +352,8 @@ class newsfeed implements Interfaces\Api
                                         ->setCustom('video', [
                                             'thumbnail_src' => $embeded->getIconUrl(),
                                             'guid' => $embeded->guid,
-                                            'mature' => $embeded instanceof Flaggable ? $embeded->getFlag('mature') : false
+                                            'mature' => $embeded instanceof Flaggable ? $embeded->getFlag('mature') : false,
+                                            'full_hd' => $embeded->getFlag('full_hd') ?? false,
                                         ])
                                         ->setTitle($embeded->title)
                                         ->setBlurb($embeded->description)
@@ -378,7 +373,7 @@ class newsfeed implements Interfaces\Api
                                             ->setTitle($embeded->title)
                                             ->setBlurb($embeded->description)
                                             ->export()
-                                        )
+                                    )
                                         ->setMessage($message);
                                 }
                                 $save->setEntity($activity)
@@ -416,7 +411,7 @@ class newsfeed implements Interfaces\Api
                                             ->setTitle($embeded->title)
                                             ->setBlurb($embeded->description)
                                             ->export()
-                                        )
+                                    )
                                         ->setMessage($message);
                                 }
                                 $save->setEntity($activity)
@@ -525,7 +520,7 @@ class newsfeed implements Interfaces\Api
                             ]);
                         }
                     }
-                    
+
                     $save->setEntity($activity)
                         ->save();
 

Controllers/api/v1/payments/braintree.php

-<?php
-/**
- * Minds Payments API:: braintree
- *
- * @version 1
- * @author Mark Harding
- */
-namespace Minds\Controllers\api\v1\payments;
-
-use Minds\Core;
-use Minds\Helpers;
-use Minds\Interfaces;
-use Minds\Api\Factory;
-use Minds\Core\Payments;
-
-class braintree implements Interfaces\Api
-{
-    /**
-   * Returns merchant information
-   * @param array $pages
-   *
-   * API:: /v1/merchant/:slug
-   */
-    public function get($pages)
-    {
-        $response = [];
-
-        switch ($pages[0]) {
-        case "token":
-          $gateway = isset($pages[1]) ? $pages[1] : 'default';
-          $response['token'] = Payments\Factory::build('braintree', ['gateway'=>$gateway])->getToken();
-          break;
-      }
-
-        return Factory::response($response);
-    }
-
-    public function post($pages)
-    {
-        $response = [];
-
-        switch ($pages[0]) {
-          case "charge":
-            $amount = $_POST['amount'];
-            $fee = $amount * 0.05 + 0.30; //5% + $.30
-
-            if (!isset($_POST['merchant'])) {
-                $merchant = Core\Session::getLoggedInUser();
-            }
-
-            $sale = (new Payments\Sale())
-              ->setAmount($amount)
-              ->setMerchant($merchant)
-              ->setFee($fee)
-              ->setCustomerId(Core\Session::getLoggedInUser()->guid)
-              ->setNonce($_POST['nonce']);
-
-            try {
-                $result = Payments\Factory::build('braintree', ['gateway'=>'merchants'])->setSale($sale);
-            } catch (\Exception $e) {
-                $response['status'] = "error";
-                $response['message'] = $e->getMessage();
-            }
-
-            break;
-          case "charge-master":
-            $amount = $_POST['amount'];
-
-            $sale = (new Payments\Sale())
-              ->setAmount($amount)
-              ->setCustomerId(Core\Session::getLoggedInUser()->guid)
-              ->setSettle(true)
-              ->setFee(0)
-              ->setNonce($_POST['nonce']);
-
-            try {
-                $result = Payments\Factory::build('braintree', ['gateway'=>'merchants'])->setSale($sale);
-            } catch (\Exception $e) {
-                $response['status'] = "error";
-                $response['message'] = $e->getMessage();
-            }
-            break;
-        }
-
-        return Factory::response($response);
-    }
-
-    public function put($pages)
-    {
-        return Factory::response([]);
-    }
-
-    public function delete($pages)
-    {
-        return Factory::response([]);
-    }
-}

Controllers/api/v1/payments/subscriptions.php

@@ -97,9 +97,6 @@ class subscriptions implements Interfaces\Api
                 }
                 $stripe = Core\Di\Di::_()->get('StripePayments');
                 $stripe->cancelSubscription($subscription);
-            } else {
-                $braintree = Payments\Factory::build("Braintree", ['gateway'=>'default']);
-                $braintree->cancelSubscription($subscription);
             }
         }
         

Controllers/api/v1/plus.php

@@ -25,13 +25,22 @@ class plus implements Interfaces\Api
      */
     public function get($pages)
     {
-        $response = [];
+        $user = Core\Session::getLoggedInUser();
+
+        if (!$user) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Invalid user'
+            ]);
+        }
 
         $plus = new Core\Plus\Subscription();
-        $plus->setUser(Core\Session::getLoggedInUser());
-        $response['active'] = $plus->isActive();
+        $plus->setUser($user);
 
-        return Factory::response($response);
+        return Factory::response([
+            'active' => $plus->isActive(),
+            'can_be_cancelled' => $plus->canBeCancelled()
+        ]);
     }
 
     public function post($pages)

Controllers/api/v1/subscribe.php

@@ -26,78 +26,37 @@ class subscribe implements Interfaces\Api
      */
     public function get($pages)
     {
+        $manager = new Subscriptions\Manager();
         $response = [];
 
-        switch ($pages[0]) {
-            case 'subscriptions':
-                $db = new \Minds\Core\Data\Call('friends');
-                $subscribers= $db->getRow($pages[1], ['limit'=>get_input('limit', 12), 'offset'=>get_input('offset', '')]);
-                if (!$subscribers) {
-                    return Factory::response([]);
-                }
-                $users = [];
-                foreach ($subscribers as $guid => $subscriber) {
-                    if ($guid == get_input('offset')) {
-                        continue;
-                    }
-                    if (is_numeric($subscriber)) {
-                        //this is a local, old style subscription
-                        $users[] = new \Minds\Entities\User($guid);
-                        continue;
-                    }
-
-                    $users[] = new \Minds\Entities\User(json_decode($subscriber, true));
-                }
-
-                $users = array_values(array_filter($users, function ($user) {
-                    return ($user->enabled != 'no' && $user->banned != 'yes');
-                }));
-                
-                $response['users'] = factory::exportable($users);
-                $response['load-next'] = (string) end($users)->guid;
-                $response['load-previous'] = (string) key($users)->guid;
-                break;
-            case 'subscribers':
-
-                if ($pages[1] == "100000000000000519") {
-                    break;
-                }
-
-                $db = new \Minds\Core\Data\Call('friendsof');
-                $subscribers= $db->getRow($pages[1], ['limit'=>get_input('limit', 12), 'offset'=>get_input('offset', '')]);
-                if (!$subscribers) {
-                    return Factory::response([]);
-                }
-                $users = [];
-                if (get_input('offset') && key($subscribers) != get_input('offset')) {
-                    $response['load-previous'] = (string) get_input('offset');
-                } else {
-                    foreach ($subscribers as $guid => $subscriber) {
-                        if ($guid == get_input('offset')) {
-                            unset($subscribers[$guid]);
-                            continue;
-                        }
-                        if (is_numeric($subscriber)) {
-                            //this is a local, old style subscription
-                            $users[] = new \Minds\Entities\User($guid);
-                            continue;
-                        }
-
-                        //var_dump(print_r($users,true));die();
-                        $users[] = new \Minds\Entities\User(json_decode($subscriber, true));
-                    }
-
-                    $users = array_values(array_filter($users, function ($user) {
-                        return ($user->enabled != 'no' && $user->banned != 'yes')
-                                && $user->guid && $user->username;
-                    }));
-
-                    $response['users'] = factory::exportable($users);
-                    $response['load-next'] = (string) end($users)->guid;
-                    $response['load-previous'] = (string) key($users)->guid;
-                }
-                break;
+        $guid = $pages[1] ?? Core\Session::getLoggedInUser()->guid;
+        $type = $pages[0] ?? "subscribers";
+        $limit = $_GET['limit'] ?? 12;
+        $offset = $_GET['offset'] ?? "";
+
+        $opts = [
+            'guid'=>$guid,
+            'type'=>$type,
+            'limit'=>$limit,
+            'offset'=>$offset,
+        ];
+      
+        $users = $manager->getList($opts);
+
+        if (!$users) {
+            return Factory::response([
+                'status' => 'error',
+                'message' => 'Unable to find '.$type,
+            ]);
         }
+        $pagingToken = (string) $users->getPagingToken();
+        
+        $users = array_filter(Factory::exportable($users->toArray()), function ($user) {
+            return ($user->enabled != 'no' && $user->banned != 'yes');
+        });
+
+        $response['users'] = $users;
+        $response['load-next'] = $pagingToken;
 
         return Factory::response($response);
     }

Controllers/api/v1/webhooks/braintree.php

-<?php
-/**
- * Minds Webhook: Braintree
- *
- * @version 1
- * @author Mark Harding
- */
-namespace Minds\Controllers\api\v1\webhooks;
-
-use Minds\Core;
-use Minds\Entities;
-use Minds\Interfaces;
-use Minds\Api\Factory;
-use Minds\Helpers;
-use Minds\Core\Payments;
-
-use Braintree_WebhookNotification;
-
-class braintree implements Interfaces\Api, Interfaces\ApiIgnorePam
-{
-    /**
-   * NOT AVAILABLE
-   */
-    public function get($pages)
-    {
-        return Factory::response(['status'=>'error', 'message'=>'GET is not supported for this endpoint']);
-    }
-
-    /**
-     */
-    public function post($pages)
-    {
-        error_log("[webhooks]:: hit first entrace point");
-
-        /*$gateway = isset($pages[0]) ? $pages[0] : 'default';
-
-        $bt = Payments\Factory::build('braintree', ['gateway'=>$gateway]);
-
-        $hooks = new Payments\Hooks();
-        $hooks->loadDefaults();
-
-        $webhooks = new Payments\Braintree\Webhooks($hooks, $bt);
-        $webhooks->setSignature($_POST['bt_signature'])
-          ->setPayload($_POST['bt_payload'])
-          ->run();*/
-    }
-
-
-    public function put($pages)
-    {
-    }
-
-    public function delete($pages)
-    {
-    }
-}

Controllers/api/v1/webhooks/stripe.php

@@ -48,24 +48,9 @@ class stripe implements Interfaces\Api, Interfaces\ApiIgnorePam
 
         $hooks->run();
 
-
-        // Do something with $event_json
-
         http_response_code(200); // PHP 5.4 or greater
         exit;
 
-        /*$gateway = isset($pages[0]) ? $pages[0] : 'default';
-
-        $bt = Payments\Factory::build('braintree', ['gateway'=>$gateway]);
-
-        $hooks = new Payments\Hooks();
-        $hooks->loadDefaults();
-
-        $webhooks = new Payments\Braintree\Webhooks($hooks, $bt);
-        $webhooks->setSignature($_POST['bt_signature'])
-          ->setPayload($_POST['bt_payload'])
-          ->run();*/
-
         return Factory::response([]);
     }