refactor: interface of cfop pic and whois query

cmdRoute.php

@@ -31,10 +31,10 @@ function route($cmd, $rawParam) { // 命令请求路由
             $entry = new ntpCheckEntry;
             break;
         case 'cfop':
-            cfopPic($rawParam);
+            $entry = new cfopPicEntry;
             break;
         case 'whois':
-            whoisQuery($rawParam);
+            $entry = new whoisQueryEntry;
             break;
     }
     if ($entry) {

models/cfopPic.php

@@ -1,23 +1,19 @@
 <?php
 
-class cfopPic {
+class cfopPicEntry {
-    private function picList() {
+    private function getCfopMsg() {
         return array(
             'text' => 'CFOP魔方公式合集',
             'reply_markup' => json_encode(array(
                 'inline_keyboard' => array(
-                    array(
+                    array([
-                        array(
                         'text' => '网页下载',
                         'url' => 'https://res.dnomd343.top/Share/cfop/'
-                        )
+                    ]),
-                    ),
+                    array([
-                    array(
-                        array(
                         'text' => '获取全部',
                         'callback_data' => '/cfop all'
-                        )
+                    ]),
-                    ),
                     array(
                         array(
                             'text' => 'GAN',
@@ -37,58 +33,59 @@ class cfopPic {
         );
     }
 
-    private function sendPic($type) { // 返回图片文件ID
+    private function getPicId($type) { // 返回图片文件ID
         switch ($type) {
             case 'gan':
-                $fileId = 'BQACAgUAAxkBAAIBtGEOLnr4Q6D4Z_80bgfXq5xsZMeWAAKtAwACWy55VOU-SGKqc7aMIAQ';
+                return 'BQACAgUAAxkBAAIBtGEOLnr4Q6D4Z_80bgfXq5xsZMeWAAKtAwACWy55VOU-SGKqc7aMIAQ';
-                break;
             case 'mfg':
-                $fileId = 'BQACAgUAAxkBAAIB3WEOVHKeYrrGhFo-GffB0W-tQRKlAALQAwACWy55VGny8ArGMkfoIAQ';
+                return 'BQACAgUAAxkBAAIB3WEOVHKeYrrGhFo-GffB0W-tQRKlAALQAwACWy55VGny8ArGMkfoIAQ';
-                break;
             case 'yx':
-                $fileId = 'BQACAgUAAxkBAAIB32EOVISFQbgmir2abj6QkgqaSX1WAALRAwACWy55VMEuU9lCYTYWIAQ';
+                return 'BQACAgUAAxkBAAIB32EOVISFQbgmir2abj6QkgqaSX1WAALRAwACWy55VMEuU9lCYTYWIAQ';
-                break;
         }
-        return array(
-            'document' => $fileId
-        );
     }
 
-    public function getPic($type) {
+    private function getPic($type) { // 获取图片
         switch ($type) {
             case 'gan':
             case 'mfg':
             case 'yx':
-                return $this->sendPic($type);
+                return array(
+                    'document' => $this->getPicId($type)
+                );
             case '':
-                return $this->picList();
+                return $this->getCfopMsg();
             default:
                 return array(
                     'text' => '未知公式'
                 );
         }
     }
+
+    private function sendCfopPic($params) { // 发送图片或信息
+        if ($params['document']) {
+            tgApi::sendDocument($params);
+        } else {
+            tgApi::sendMessage($params);
+        }
     }
 
-function cfopPic($rawParam) { // 发送CFOP图片入口
+    public function query($rawParam) { // CFOP图片查询入口
-    global $chatId;
+        $this->sendCfopPic($this->getPic($rawParam));
-    sendAuto($chatId, (new cfopPic)->getPic($rawParam));
     }
 
-function cfopPicCallback($rawParam) { // 发送CFOP图片回调入口
+    public function callback($rawParam) { // CFOP图片回调入口
-    global $chatId, $messageId;
         if ($rawParam === 'all') {
-        sendAuto($chatId, (new cfopPic)->getPic('gan'));
+            global $tgEnv;
-        sendAuto($chatId, (new cfopPic)->getPic('mfg'));
+            tgApi::deleteMessage(array( // 删除源消息
-        sendAuto($chatId, (new cfopPic)->getPic('yx'));
+                'message_id' => $tgEnv['messageId']
-        sendPayload(array( // 删除源消息
-            'method' => 'deleteMessage',
-            'chat_id' => $chatId,
-            'message_id' => $messageId
             ));
+            $this->sendCfopPic($this->getPic('gan'));
+            $this->sendCfopPic($this->getPic('mfg'));
+            $this->sendCfopPic($this->getPic('yx'));
             return;
         }
-    sendAuto($chatId, (new cfopPic)->getPic($rawParam));
+        $this->sendCfopPic($this->getPic($rawParam));
+    }
 }
 
 ?>

models/whoisQuery.php

@@ -1,7 +1,7 @@
 <?php
 
-class whoisQuery {
+class whoisQueryEntry {
-    public function query($domain) {
+    public function getWhois($domain) {
         $temp = explode('.', $domain);
         $tld = $temp[count($temp) - 1];
         $servers = array(
@@ -162,15 +162,14 @@ class whoisQuery {
         }
         return $output;
     }
-}
 
-function whoisQuery($rawParam) {
+    public function query($rawParam) {
-    global $chatId;
+        $content = $this->getWhois($rawParam);
-    $content = (new whoisQuery)->query($rawParam);
+        tgApi::sendMessage(array(
-    sendMessage($chatId, array(
             'text' => $content,
             'disable_web_page_preview' => 'true' // 不显示页面预览
         ));
     }
+}
 
 ?>

tgInterface.php

@@ -7,6 +7,18 @@ class tgApi {
         ), $chatId);
     }
 
+    function sendDocument($params, $chatId = 0) { // 发送文件
+        if ($chatId === 0) { // 未指定chatId
+            global $tgEnv;
+            $chatId = $tgEnv['chatId'];
+        }
+        $params += array (
+            'method' => 'sendDocument',
+            'chat_id' => $chatId
+        );
+        return tgApi::sendPayload($params);
+    }
+
     public function sendMessage($params, $chatId = 0) { // 发送消息
         if ($chatId === 0) { // 未指定chatId
             global $tgEnv;