Merge pull request #79 from prog-time/issues-77

Issues 77

Author: prog-time

app/Http/Controllers/SimplePage.php

@@ -9,12 +9,17 @@ class SimplePage
     /**
      * @return View
      */
-    public function index()
+    public function index(): View
     {
         if (config('app.url') === 'https://tg-support-bot.ru') {
             return view('site.home');
         } else {
             return view('site.home_client_version');
         }
     }
+
+    public function liveChatPromo(): View
+    {
+        return view('site.live_chat_promo');
+    }
 }

app/Http/Controllers/VkBotController.php

@@ -8,46 +8,51 @@
 use App\Services\VK\VkEditService;
 use App\Services\VK\VkMessageService;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Cache;
 
 class VkBotController
 {
-    private VkUpdateDto $dataHook;
-
-    private ?BotUser $botUser;
-
-    public function __construct(Request $request)
+    /**
+     * @return Response
+     *
+     * @throws \Exception
+     */
+    public function bot_query(Request $request): Response
     {
-        if (request()->type === 'confirmation') {
-            echo config('traffic_source.settings.vk.confirm_code');
-            die();
+        if ($request->type === 'confirmation') {
+            return response(config('traffic_source.settings.vk.confirm_code'), 200);
         }
 
         $dataHook = VkUpdateDto::fromRequest($request);
-        $this->dataHook = !empty($dataHook) ? $dataHook : die('ok');
+        if (empty($dataHook)) {
+            return response('ok', 200);
+        }
 
-        $this->botUser = (new BotUser())->getUserByChatId($this->dataHook->from_id, 'vk');
-    }
+        $cacheKey = 'vk_event_' . $dataHook->event_id;
+        if (Cache::has($cacheKey)) {
+            return response('ok', 200);
+        }
+        Cache::put($cacheKey, true, 600);
 
-    /**
-     * @return void
-     *
-     * @throws \Exception
-     */
-    public function bot_query(): void
-    {
-        if ($this->botUser->isBanned()) {
-            (new SendBannedMessageVk())->execute($this->botUser);
-            die('ok');
+        $botUser = (new BotUser())->getUserByChatId($dataHook->from_id, 'vk');
+
+        if ($botUser->isBanned()) {
+            (new SendBannedMessageVk())->execute($botUser);
+
+            return response('ok', 200);
         }
 
-        switch ($this->dataHook->type) {
+        switch ($dataHook->type) {
             case 'message_new':
-                (new VkMessageService($this->dataHook))->handleUpdate();
+                (new VkMessageService($dataHook))->handleUpdate();
                 break;
 
             case 'message_edit':
-                (new VkEditService($this->dataHook))->handleUpdate();
+                (new VkEditService($dataHook))->handleUpdate();
                 break;
         }
+
+        return response('ok', 200);
     }
 }

app/Jobs/SendMessage/AbstractSendMessageJob.php

@@ -75,7 +75,6 @@ protected function telegramResponseHandler(TelegramAnswerDto $response): void
         if ($response->response_code === 429) {
             $retryAfter = $response->parameters->retry_after ?? 3;
             (new LokiLogger())->log('warning', "429 Too Many Requests. Replay {$retryAfter}");
-            sleep(10);
             $this->release($retryAfter);
             return;
         }

app/Services/VK/VkMessageService.php

@@ -46,7 +46,6 @@ public function handleUpdate(): void
                 $this->sendLocation();
             }
 
-            echo 'ok';
         } catch (\Throwable $e) {
             (new LokiLogger())->logException($e);
         }

docker/nginx/default.conf.template

@@ -44,6 +44,21 @@ server {
 
     # Socket.IO
     location /socket.io/ {
+        # CORS headers
+        add_header 'Access-Control-Allow-Origin' $http_origin always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization' always;
+        add_header 'Access-Control-Allow-Credentials' 'true' always;
+
+        if ($request_method = OPTIONS) {
+            add_header 'Access-Control-Allow-Origin' $http_origin;
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization';
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Max-Age' 86400;
+            return 204;
+        }
+
         proxy_pass http://node_server:3000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;