Mark Harding · @markeharding · b43f9796
--- a/Controllers/api/v2/subscriptions/incoming.php
+++ b/Controllers/api/v2/subscriptions/incoming.php
+ // Construct URN on the fly 
+ $subscriberGuid = $pages[0]; 
+ $urn = "urn:subscription-request:" . implode('-', [ Session::getLoggedInUserGuid(), $subscriberGuid ]); 
+  
+ $request = $manager->get($urn); 
+  
+ if (!$request || $request->getPublisherGuid() != Session::getLoggedInUserGuid()) { 
+ return Factory::response([ 
+ 'status' => 'error', 
+ 'message' => 'Not found', 
+ ]); 
+ } 
+ 
+ try { 
+ switch ($pages[1]) { 
+ case "accept": 
--- a/Controllers/api/v2/subscriptions/incoming/all.php
+++ b/Controllers/api/v2/subscriptions/incoming/all.php
+<?php 
+ 
+namespace Minds\Controllers\api\v2\subscriptions\incoming; 
+ 
+use Minds\Api\Factory; 
+use Minds\Core\Di\Di; 
+use Minds\Core\Session; 
+use Minds\Interfaces; 
+ 
+/** 
+ * Incoming subscritions 
+ */ 
+class all implements Interfaces\Api 
+{ 
+ public function get($pages) 
+ { 
--- a/Controllers/api/v2/subscriptions/outgoing/all.php
+++ b/Controllers/api/v2/subscriptions/outgoing/all.php
+<?php 
+ 
+namespace Minds\Controllers\api\v2\subscriptions\outgoing; 
+ 
+use Minds\Api\Factory; 
+use Minds\Core\Di\Di; 
+use Minds\Core\Session; 
+use Minds\Interfaces; 
+ 
+/** 
+ * Outgoing subscritions 
+ */ 
+class all implements Interfaces\Api 
+{ 
+ public function get($pages) 
+ { 
--- a/Core/Subscriptions/Manager.php
+++ b/Core/Subscriptions/Manager.php
 /** 
 * Subscribe to a publisher 
 * @param User $publisher 
+ * @param bool $force 
 * @return Subscription 
 */ 
- public function subscribe($publisher) 
+ public function subscribe($publisher, $force = false) 
 { 
 $subscription = new Subscription(); 
 $subscription->setSubscriberGuid($this->subscriber->getGuid()) 
 ->setPublisherGuid($publisher->getGuid()); 
 
+ if ($publisher->getMode() === 2 && !$force) { 
+ throw new \Exception("Can not subscribe to closed channel, send a request instead"); 
--- a/Core/Subscriptions/Requests/Manager.php
+++ b/Core/Subscriptions/Requests/Manager.php
+ private $entitiesBuilder; 
+ 
+ public function __construct($repository = null, $notificationsDelegate = null, $subscriptionsDelegate = null, $entitiesBuilder = null) 
+ { 
+ $this->repository = $repository ?? new Repository(); 
+ $this->notificationsDelegate = $notificationsDelegate ?? new NotificationsDelegate; 
+ $this->subscriptionsDelegate = $subscriptionsDelegate ?? new SubscriptionsDelegate; 
+ $this->entitiesBuilder = $entitiesBuilder ?? Di::_()->get('EntitiesBuilder'); 
+ } 
+ 
+ /** 
+ * Return a list of incoming subscription requests 
+ * @param array $opts 
+ * @return Response 
+ */ 
+ public function getIncomingList($user_guid, array $opts = [])