From 91b3c00c5aadde33759396f00c60a67fc5a0464e Mon Sep 17 00:00:00 2001 From: lucascardo12 Date: Tue, 21 Dec 2021 13:46:23 -0400 Subject: [PATCH] ajustes no metodos listarFilas e enviar msg --- app/Core/CoreMedia.php | 5 +---- app/Middleware/ApiAgente.php | 27 +++++++++++++++++++++++++-- app/Providers/Positus.php | 16 +++++++++------- app/Providers/RequestURL.php | 9 ++++++--- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/app/Core/CoreMedia.php b/app/Core/CoreMedia.php index 32ffe7a..e2b157c 100644 --- a/app/Core/CoreMedia.php +++ b/app/Core/CoreMedia.php @@ -65,15 +65,12 @@ class CoreMedia { /** Validate $data */ $this->build($data); - + logger('debuge')->debug(var_export($data, true)); $this->api = $api; $this->api->setHook($this->request); $msg = $this->api->getIsValidMessage(); // logger('deburguer')->info(var_export($msg, true)); $this->ws->enviaMsg('att'); - if (empty($msg)) { - return; - } if (!$this->api->baixarMidia()) { $this->api->enviarMsg($this->api->getPhone(), utf8_encode("Não foi possivel entregar o aquivo para o agente. Envie novamente!")); } diff --git a/app/Middleware/ApiAgente.php b/app/Middleware/ApiAgente.php index 5068c60..d574f85 100644 --- a/app/Middleware/ApiAgente.php +++ b/app/Middleware/ApiAgente.php @@ -8,6 +8,7 @@ use app\Controllers\QueueController; use app\Models\Agent; use app\Models\Atendimento; use app\Models\Evento; +use app\Models\ListaNegraPalavras; use app\Models\Message; use app\Models\Parametros; use app\Models\Pause; @@ -255,7 +256,11 @@ class ApiAgente { $queue = new QueueController(); $search = $queue->listaAllFilas(); - echo json_encode($search); + $this->retorno( + $search ? "Sucesso" : "Erro", + $search ? $search : null, + $search ? $search : null + ); return null; } @@ -317,7 +322,10 @@ class ApiAgente $modelMensagem = new Message(); if ($mensagem['type'] == 'text') { // logger('enviaMsg')->info(print_r($mensagem, true)); - $retuno = $provider->enviarMsg($mensagem['dst'], $mensagem['content']); + $retuno = $provider->enviarMsg( + $mensagem['dst'], + $this->validaPalavroes($mensagem['content']) + ); } else { $anmeArquivo = __DIR__ . "/../../storage/files/" . $mensagem['id_provedor']; $texto = base64_decode($mensagem['content']); @@ -598,4 +606,19 @@ class ApiAgente logger('monitora')->info($th->getMessage(), debug_backtrace()); } } + + public function validaPalavroes($msg) + { + try { + $palavroes = new ListaNegraPalavras(); + $palavras = $palavroes->getAll(); + foreach ($palavras as $key => $value) { + $pattern = "/\b($value->palavra)\b/i"; + $msg = preg_replace($pattern, '*' . str_repeat('*', strlen($value->palavra)) . '*', $msg); + } + } catch (\Throwable $th) { + logger('telegram')->info(print_r($th, true), true); + } + return $msg; + } } \ No newline at end of file diff --git a/app/Providers/Positus.php b/app/Providers/Positus.php index ee2c7c2..fd4fa72 100644 --- a/app/Providers/Positus.php +++ b/app/Providers/Positus.php @@ -244,7 +244,9 @@ class Positus implements IApiMedia $this->requestType("GET"); $this->setMetodo('media/' . $name); $pathfile = $this->storage . $name; - file_put_contents($pathfile, $this->exec()); + $retorno = $this->exec(); + logger('debuge')->debug(var_export($retorno, true)); + file_put_contents($pathfile, $retorno); if (file_exists($pathfile)) { return true; } @@ -462,27 +464,27 @@ class Positus implements IApiMedia } $this->request->header($header); $this->request->method_request($this->requestType); - return $this->request->exec_request(); + $response = $this->request->exec_request(); + return $this->response($response); } function response($result) { - // logger('deburguer')->info(print_r($result, true)); + logger('deburguer')->info(gettype($result)); if ($result) { try { if (json_decode($result, true) !== null) { return json_decode($result, true); } - return json_decode($result, true); - } catch (\Exception $th) { - logger('deburguer')->info($th->getMessage()); + return $result; + } catch (\Throwable $th) { + logger('deburguer')->info(print_r($result, true)); return false; } } else { return false; } } - /** * Create file and download in browser */ diff --git a/app/Providers/RequestURL.php b/app/Providers/RequestURL.php index afe3811..9a4925d 100644 --- a/app/Providers/RequestURL.php +++ b/app/Providers/RequestURL.php @@ -71,9 +71,12 @@ class RequestURL private function response($result) { // logger('deburguer')->info(print_r($result, true)); - try { - return json_decode($result, true); - } catch (\Throwable $th) { + if ($result) { + if (json_decode($result, true) !== null) { + return json_decode($result, true); + } + return $result; + } else { return false; } }