wip

mpociot · mpociot · commit 9a2183f642e8 · 2018-11-22T22:09:32.000+01:00
diff --git a/src/LaravelEcho/Http/Controllers/FetchUsers.php b/src/LaravelEcho/Http/Controllers/FetchUsers.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace BeyondCode\LaravelWebSockets\LaravelEcho\Http\Controllers;
+
+use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\InvalidSignatureException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class FetchUsers extends EchoController
+{
+    /** @var \BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager */
+    protected $channelManager;
+
+    public function __construct(ChannelManager $channelManager)
+    {
+        $this->channelManager = $channelManager;
+    }
+
+    public function __invoke(Request $request)
+    {
+        $channel = $this->channelManager->find($request->appId, $request->channelName);
+
+        if (is_null($channel)) {
+            throw new HttpException(404, 'Unknown channel "'.$request->channelName.'"');
+        }
+
+        if (! $channel instanceof PresenceChannel) {
+            throw new HttpException(400, 'Invalid presence channel "'.$request->channelName.'"');
+        }
+
+        return [
+            'users' => Collection::make($channel->getUsers())->map(function ($user) {
+                return ['id' => $user->user_id];
+            })->values()
+        ];
+    }
+}
diff --git a/src/LaravelEcho/Pusher/Channels/PresenceChannel.php b/src/LaravelEcho/Pusher/Channels/PresenceChannel.php
@@ -8,6 +8,11 @@ class PresenceChannel extends Channel
 {
     protected $users = [];
 
+    public function getUsers(): array
+    {
+        return $this->users;
+    }
+
     /*
      * @link https://pusher.com/docs/pusher_protocol#presence-channel-events
      */
diff --git a/src/Router.php b/src/Router.php
@@ -72,7 +72,7 @@ public function echo()
         $this->get('/apps/{appId}/status', LaravelEcho\Http\Controllers\StatusController::class);
         $this->get('/apps/{appId}/channels', LaravelEcho\Http\Controllers\StatusController::class);
         $this->get('/apps/{appId}/channels/{channelName}', LaravelEcho\Http\Controllers\FetchChannel::class);
-        $this->get('/apps/{appId}/channels/{channelName}/users', LaravelEcho\Http\Controllers\StatusController::class);
+        $this->get('/apps/{appId}/channels/{channelName}/users', LaravelEcho\Http\Controllers\FetchUsers::class);
 
         $this->post('/apps/{appId}/events', LaravelEcho\Http\Controllers\TriggerEvent::class);
     }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function echo()`
`72`	`72`	`$this->get('/apps/{appId}/status', LaravelEcho\Http\Controllers\StatusController::class);`
`73`	`73`	`$this->get('/apps/{appId}/channels', LaravelEcho\Http\Controllers\StatusController::class);`
`74`	`74`	`$this->get('/apps/{appId}/channels/{channelName}', LaravelEcho\Http\Controllers\FetchChannel::class);`
`75`		`- $this->get('/apps/{appId}/channels/{channelName}/users', LaravelEcho\Http\Controllers\StatusController::class);`
	`75`	`+ $this->get('/apps/{appId}/channels/{channelName}/users', LaravelEcho\Http\Controllers\FetchUsers::class);`
`76`	`76`
`77`	`77`	`$this->post('/apps/{appId}/events', LaravelEcho\Http\Controllers\TriggerEvent::class);`
`78`	`78`	`}`