From bab2ef203cb2aa577705c409d9eb9c201663a7dd Mon Sep 17 00:00:00 2001
From: Alex Renoki <rennokki@gmail.com>
Date: Fri, 18 Sep 2020 11:57:39 +0300
Subject: [PATCH] Changed order of fields to match the pusher docs

---
 src/API/TriggerEvent.php                       | 4 ++--
 src/Dashboard/Http/Controllers/SendMessage.php | 2 +-
 src/DashboardLogger.php                        | 2 +-
 src/Server/Messages/PusherClientMessage.php    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/API/TriggerEvent.php b/src/API/TriggerEvent.php
index 853274e..53cb537 100644
--- a/src/API/TriggerEvent.php
+++ b/src/API/TriggerEvent.php
@@ -32,8 +32,8 @@ class TriggerEvent extends Controller
             );
 
             $payload = [
-                'channel' => $channelName,
                 'event' => $request->name,
+                'channel' => $channelName,
                 'data' => $request->data,
             ];
 
@@ -52,8 +52,8 @@ class TriggerEvent extends Controller
             StatisticsCollector::apiMessage($request->appId);
 
             DashboardLogger::log($request->appId, DashboardLogger::TYPE_API_MESSAGE, [
-                'channel' => $channelName,
                 'event' => $request->name,
+                'channel' => $channelName,
                 'payload' => $request->data,
             ]);
         }
diff --git a/src/Dashboard/Http/Controllers/SendMessage.php b/src/Dashboard/Http/Controllers/SendMessage.php
index 452a5b0..781cbaf 100644
--- a/src/Dashboard/Http/Controllers/SendMessage.php
+++ b/src/Dashboard/Http/Controllers/SendMessage.php
@@ -23,8 +23,8 @@ class SendMessage
             'appId' => ['required', new AppId],
             'key' => 'required|string',
             'secret' => 'required|string',
-            'channel' => 'required|string',
             'event' => 'required|string',
+            'channel' => 'required|string',
             'data' => 'required|json',
         ]);
 
diff --git a/src/DashboardLogger.php b/src/DashboardLogger.php
index 07e8547..3309571 100644
--- a/src/DashboardLogger.php
+++ b/src/DashboardLogger.php
@@ -67,8 +67,8 @@ class DashboardLogger
         $channelName = static::LOG_CHANNEL_PREFIX.$type;
 
         $payload = [
-            'channel' => $channelName,
             'event' => 'log-message',
+            'channel' => $channelName,
             'data' => [
                 'type' => $type,
                 'time' => strftime('%H:%M:%S'),
diff --git a/src/Server/Messages/PusherClientMessage.php b/src/Server/Messages/PusherClientMessage.php
index afb74dc..7b4dc64 100644
--- a/src/Server/Messages/PusherClientMessage.php
+++ b/src/Server/Messages/PusherClientMessage.php
@@ -71,8 +71,8 @@ class PusherClientMessage implements PusherMessage
 
         DashboardLogger::log($this->connection->app->id, DashboardLogger::TYPE_WS_MESSAGE, [
             'socketId' => $this->connection->socketId,
-            'channel' => $this->payload->channel,
             'event' => $this->payload->event,
+            'channel' => $this->payload->channel,
             'data' => $this->payload,
         ]);
     }