Просмотр исходного кода

Merge branch 'master' of 47.76.126.2:seven/bot-28

seven 2 дней назад
Родитель
Сommit
a65a8b69ff
2 измененных файлов с 0 добавлено и 8 удалено
  1. 0 3
      app/Http/Controllers/api/TelegramWebHook.php
  2. 0 5
      app/Services/KeyboardService.php

+ 0 - 3
app/Http/Controllers/api/TelegramWebHook.php

@@ -104,8 +104,6 @@ class TelegramWebHook extends BaseController
                             } else {
                                 $this->telegram->sendMessage($returnMsg);
                             }
-                        } else {
-                            $this->telegram->sendMessage(['chat_id' => $chatId, 'text' => lang("消息格式错误!"), 'reply_to_message_id' => $messageId]);
                         }
                         DB::commit();
                     } //
@@ -120,7 +118,6 @@ class TelegramWebHook extends BaseController
                         $telegram->sendMessage(['chat_id' => $chatId, 'text' => '‼️‼️系统发生了错误,请联系客服']);
                     }
                 }
-
             }
         } //
         catch (Exception $e) {

+ 0 - 5
app/Services/KeyboardService.php

@@ -251,11 +251,6 @@ class KeyboardService extends BaseService
                     foreach ($item as $item1) {
                         if(static::isValidURL($item1['url'])){
                             $t[] = $item1;
-                        }else{
-                            $t[] = [
-                                'text' => $item1['text'],
-                                'callback_data' => $item1['url']
-                            ];
                         }
                     }
                     if (!empty($t)) $newKeyboard[] = $t;