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);
  }

Core/Data/Cassandra/Prepared/Custom.php

@@ -37,4 +37,15 @@ class Custom implements Interfaces\PreparedInterface
  {
  return $this->opts;
  }
+
+ /**
+ * Gets the template of the custom query
+ * e.g. "SELECT * FROM friendsof WHERE column1 = ?"
+ *
+ * @return string the template.
+ */
+ public function getTemplate(): string
+ {
+ return $this->template;
+ }
 }

Core/Subscriptions/Manager.php

@@ -61,6 +61,32 @@ class Manager
  $this->checkRateLimitDelegate = $checkRateLimitDelegate ?: new CheckRateLimit();
  }
 
+ /**
+ * Gets a subscription or subscribers list from the repository.
+ *
+ * @param array $opts -
+ * guid - required!
+ * type - either 'subscribers' or 'subscriptions'.
+ * limit - limit.
+ * offset - offset.
+ * @return Response response objet
+ */
+ public function getList($opts)
+ {
+ if (!$opts['guid']) {
+ return [];
+ }
+ 
+ $opts = array_merge([
+ 'limit' => 12,
+ 'offset' => '',
+ 'guid' => '',
+ 'type' => 'subscribers',
+ ], $opts);
+ 
+ return $this->repository->getList($opts);
+ }
+
  public function setSubscriber($user)
  {
  $this->subscriber = $user;

Core/Subscriptions/Repository.php

@@ -5,9 +5,9 @@ namespace Minds\Core\Subscriptions;
 use Cassandra;
 use Minds\Common\Repository\Response;
 use Minds\Core\Data\Cassandra\Client;
-use Minds\Core\Data\Cassandra\Prepared\Custom;
 use Minds\Core\Di\Di;
-use Minds\Core\Util\UUIDGenerator;
+use Minds\Core\Data\Cassandra\Prepared;
+use Minds\Entities\User;
 
 class Repository
 {
@@ -20,17 +20,67 @@ class Repository
  }
 
  /**
- * @param array $opts
- * @return Response
+ * Gets a subscription or subscribers list from cassandra.
+ *
+ * @param array $opts -
+ * guid - required!
+ * type - either 'subscribers' or 'subscriptions'.
+ * limit - limit.
+ * offset - offset.
+ * @return Response response object.
  */
- public function getList(array $opts = [])
+ public function getList(array $opts = []): Response
  {
  $opts = array_merge([
- 'limit' => 10,
- 'offset' => 0,
- 'uuid' => '',
- 'recursive' => false,
+ 'limit' => 12,
+ 'offset' => '',
+ 'guid' => null,
+ 'type' => null,
  ], $opts);
+
+ if (!$opts['guid']) {
+ throw new \Exception('GUID is required');
+ }
+
+ $response = new Response;
+ if ($opts['type'] === 'subscribers') {
+ $statement = "SELECT * FROM friendsof";
+ } else {
+ $statement = "SELECT * FROM friends";
+ }
+
+ $where = ["key = ?"];
+ $values = [$opts['guid']];
+
+ $statement .= " WHERE " . implode(' AND ', $where);
+
+ $cqlOpts = [];
+ if ($opts['limit']) {
+ $cqlOpts['page_size'] = (int) $opts['limit'];
+ }
+
+ if ($opts['offset']) {
+ $cqlOpts['paging_state_token'] = base64_decode($opts['offset'], true);
+ }
+ 
+ $query = new Prepared\Custom();
+ $query->query($statement, $values);
+ $query->setOpts($cqlOpts);
+
+ try {
+ $rows = $this->client->request($query);
+ foreach ($rows as $row) {
+ $user = new User($row['column1']);
+ $response[] = $user;
+ }
+
+ $response->setPagingToken(base64_encode($rows->pagingStateToken()));
+ $response->setLastPage($rows->isLastPage());
+ } catch (\Exception $e) {
+ // do nothing.
+ }
+
+ return $response;
  }
 
  /**

Spec/Core/Subscriptions/RepositorySpec.php

@@ -7,6 +7,8 @@ use Minds\Core\Subscriptions\Subscription;
 use Minds\Core\Data\Cassandra\Client;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use Spec\Minds\Mocks\Cassandra\Rows;
+use Minds\Common\Repository\Response;
 
 class RepositorySpec extends ObjectBehavior
 {
@@ -62,4 +64,40 @@ class RepositorySpec extends ObjectBehavior
  $newSubscription->isActive()
  ->shouldBe(false);
  }
+
+ public function it_should_get_subscribers()
+ {
+ $this->client->request(Argument::that(function ($prepared) {
+ var_dump($prepared->getTemplate());
+
+ return $prepared->getTemplate() === "SELECT * FROM friendsof WHERE key = ?";
+ }))
+ ->shouldBeCalled()
+ ->willReturn(new Rows([
+ [ 'guid' => 1 ],
+ [ 'guid' => 2 ],
+ ], 'paging-token'));
+
+ $this->getList([
+ 'guid' => '1234567891',
+ 'type' => 'subscribers',
+ ])->shouldImplement(Response::class);
+ }
+
+ public function it_should_get_subscriptions()
+ {
+ $this->client->request(Argument::that(function ($prepared) {
+ return $prepared->getTemplate() === "SELECT * FROM friends WHERE key = ?";
+ }))
+ ->shouldBeCalled()
+ ->willReturn(new Rows([
+ [ 'guid' => 1 ],
+ [ 'guid' => 2 ],
+ ], 'paging-token'));
+
+ $this->getList([
+ 'guid' => '1234567891',
+ 'type' => 'subscriptions',
+ ])->shouldImplement(Response::class);
+ }
 }