From 4c7d18c6b0eee740754a93812c38b4e0ee5b0549 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 4 Sep 2022 10:52:55 +1000 Subject: [PATCH] App::environment is now 'local' not 'dev', consistent use of slack queue 'slack' --- src/API.php | 4 ++-- src/Base.php | 5 +++++ src/Message.php | 2 +- src/Options/Factory.php | 2 +- src/Response/Base.php | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/API.php b/src/API.php index a8f9a5d..499fb1c 100644 --- a/src/API.php +++ b/src/API.php @@ -399,7 +399,7 @@ final class API $parameters['token'] = $this->_token->token; $request = $this->prepareRequest( $url, - $parameters + json_encode($parameters) ); // If we are json, then we'll do an application/json post @@ -448,7 +448,7 @@ final class API throw new SlackChannelNotFoundException('Channel Not Found',curl_getinfo($request,CURLINFO_HTTP_CODE)); case 'hash_conflict': - if (App::environment() == 'dev') + if (App::environment() == 'local') file_put_contents('/tmp/hash_conflict.'.$method,print_r(json_decode(json_decode($parameters)->view),TRUE)); throw new SlackHashConflictException('Hash Conflict',curl_getinfo($request,CURLINFO_HTTP_CODE)); diff --git a/src/Base.php b/src/Base.php index 93c081d..29a3397 100644 --- a/src/Base.php +++ b/src/Base.php @@ -63,6 +63,11 @@ abstract class Base return $o->exists ? $o : NULL; } + /** + * Return the Eneterprise object that a Response is related to + * + * @return Enterprise + */ final public function enterprise(): Enterprise { $class = class_exists(AppEnterprise::class) ? AppEnterprise::class : Enterprise::class; diff --git a/src/Message.php b/src/Message.php index 6ebb981..8e27917 100644 --- a/src/Message.php +++ b/src/Message.php @@ -170,7 +170,7 @@ final class Message extends BlockKit Log::debug(sprintf('%s:Scheduling Delete of [%s:%s] on [%s]',static::LOGKEY,object_get($this->o,'channel_id',$this->o->id),$response->ts,$delete->format('Y-m-d')),['m'=>__METHOD__]); // Queue the delete of the message if requested - dispatch((new DeleteChat($this->o,$response->ts))->onQueue('low')->delay($delete)); + dispatch((new DeleteChat($this->o,$response->ts))->onQueue('slack')->delay($delete)); } return $response; diff --git a/src/Options/Factory.php b/src/Options/Factory.php index f09c64d..3858a7c 100644 --- a/src/Options/Factory.php +++ b/src/Options/Factory.php @@ -34,7 +34,7 @@ class Factory { Log::debug(sprintf('%s:Working out Interactive Options Event Class for [%s] as [%s]',static::LOGKEY,$type,$class),['m'=>__METHOD__]); if (App::environment() == 'local') - file_put_contents('/tmp/option.'.$type,print_r(json_decode($request->input('payload')),TRUE)); + file_put_contents('/tmp/option.'.$type,print_r($request,TRUE)); return new $class($request); } diff --git a/src/Response/Base.php b/src/Response/Base.php index 8e5e054..bb54da0 100644 --- a/src/Response/Base.php +++ b/src/Response/Base.php @@ -29,7 +29,7 @@ abstract class Base extends SlackBase implements \JsonSerializable if (get_class($this) == Base::class) { Log::debug(sprintf('%s:Slack RESPONSE Initialised [%s]',static::LOGKEY,get_class($this)),['m'=>__METHOD__]); - if (App::environment() == 'dev') + if (App::environment() == 'local') file_put_contents('/tmp/response',print_r($this,TRUE),FILE_APPEND); } }