remove(admin/telegram-tasks+telegram-bot-auto-delete)

todo: Bot rewrite in a stand alone program + Remove telegram bot function from panel entirely

src/Command/Job.php

@@ -21,7 +21,6 @@ use App\Models\DetectBanLog;
 use App\Models\EmailQueue;
 use App\Models\NodeInfoLog;
 use App\Models\NodeOnlineLog;
-use App\Models\TelegramTasks;
 use App\Models\TelegramSession;
 use App\Models\UserSubscribeLog;
 use App\Services\Config;

src/Models/User.php

@@ -362,7 +362,6 @@ class User extends Model
         PasswordReset::where('email', '=', $email)->delete();
         UserSubscribeLog::where('user_id', '=', $uid)->delete();
         DetectBanLog::where('user_id', '=', $uid)->delete();
-        TelegramTasks::where('userid', '=', $uid)->delete();
 
         $this->delete();
 

src/Utils/Telegram/Commands/CheckinCommand.php

@@ -34,13 +34,6 @@ class CheckinCommand extends Command
         $ChatID = $Message->getChat()->getId();
 
         if ($ChatID < 0) {
-            // 群组
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $Message->getMessageId(),
-                ]);
-            }
             if ($_ENV['telegram_group_quiet'] === true) {
                 // 群组中不回应
                 return;
@@ -81,13 +74,6 @@ class CheckinCommand extends Command
                 ]
             );
         }
-        if ($ChatID < 0) {
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-            ]);
-        }
         return $response;
     }
 }

src/Utils/Telegram/Commands/HelpCommand.php

@@ -30,12 +30,6 @@ class HelpCommand extends Command
         $Update  = $this->getUpdate();
         $Message = $Update->getMessage();
         if ($Message->getChat()->getId() < 0) {
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $Message->getChat()->getId(),
-                    'messageid'   => $Message->getMessageId(),
-                ]);
-            }
             if ($_ENV['telegram_group_quiet'] === true) {
                 return;
             }
@@ -61,11 +55,5 @@ class HelpCommand extends Command
                 'reply_markup'              => null,
             ]
         );
-        if ($Message->getChat()->getId() < 0) {
-            TelegramTools::DeleteMessage([
-                'chatid'      => $Message->getChat()->getId(),
-                'messageid'   => $response->getMessageId(),
-            ]);
-        }
     }
 }

src/Utils/Telegram/Commands/InfoCommand.php

@@ -38,13 +38,6 @@ class InfoCommand extends Command
         $MessageID = $Message->getMessageId();
 
         if ($ChatID < 0) {
-            // 群组
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $MessageID,
-                ]);
-            }
             // 发送 '输入中' 会话状态
             $this->replyWithChatAction(['action' => Actions::TYPING]);
             // 触发用户
@@ -65,11 +58,6 @@ class InfoCommand extends Command
                                 'reply_to_message_id'   => $MessageID,
                             ]
                         );
-                        // 消息删除任务
-                        TelegramTools::DeleteMessage([
-                            'chatid'      => $ChatID,
-                            'messageid'   => $response->getMessageId(),
-                        ]);
                     }
                     return;
                 }
@@ -105,12 +93,6 @@ class InfoCommand extends Command
                     ]
                 );
             }
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-                'executetime' => $_ENV['delete_admin_message_time']
-            ]);
         }
     }
 }

src/Utils/Telegram/Commands/MenuCommand.php

@@ -69,13 +69,6 @@ class MenuCommand extends Command
                     ),
                 ]
             );
-        } else {
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $MessageID,
-                ]);
-            }
         }
     }
 }

src/Utils/Telegram/Commands/MyCommand.php

@@ -39,13 +39,6 @@ class MyCommand extends Command
         $ChatID = $Message->getChat()->getId();
 
         if ($ChatID < 0) {
-            // 群组
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $MessageID,
-                ]);
-            }
             if ($_ENV['telegram_group_quiet'] === true) {
                 // 群组中不回应
                 return;
@@ -83,11 +76,6 @@ class MyCommand extends Command
             } else {
                 // 群组
                 $response = self::Group($User, $SendUser, $ChatID, $Message, $MessageID);
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                ]);
             }
         }
 

src/Utils/Telegram/Commands/PingCommand.php

@@ -51,15 +51,6 @@ class PingCommand extends Command
                 ]
             );
         } else {
-            // 群组
-
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $Message->getMessageId(),
-                ]);
-            }
-
             if ($_ENV['telegram_group_quiet'] === true) {
                 // 群组中不回应
                 return;
@@ -80,11 +71,6 @@ class PingCommand extends Command
                     'text' => implode(PHP_EOL, $text),
                 ]
             );
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-            ]);
         }
     }
 }

src/Utils/Telegram/Commands/SetuserCommand.php

@@ -44,13 +44,6 @@ class SetuserCommand extends Command
             'username' => $Message->getFrom()->getUsername(),
         ];
 
-        if ($_ENV['enable_delete_user_cmd'] === true) {
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $Message->getMessageId(),
-            ]);
-        }
-
         if (!in_array($SendUser['id'], $_ENV['telegram_admins'])) {
             $AdminUser = User::where('is_admin', 1)->where('telegram_id', $SendUser['id'])->first();
             if ($AdminUser == null) {
@@ -63,11 +56,6 @@ class SetuserCommand extends Command
                             'reply_to_message_id'   => $MessageID,
                         ]
                     );
-                    // 消息删除任务
-                    TelegramTools::DeleteMessage([
-                        'chatid'      => $ChatID,
-                        'messageid'   => $response->getMessageId(),
-                    ]);
                 }
                 return;
             }
@@ -101,12 +89,6 @@ class SetuserCommand extends Command
                         'reply_to_message_id'   => $MessageID,
                     ]
                 );
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                    'executetime' => $_ENV['delete_admin_message_time']
-                ]);
                 return;
             }
 
@@ -118,18 +100,6 @@ class SetuserCommand extends Command
                         'reply_to_message_id'   => $MessageID,
                     ]
                 );
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                    'executetime' => $_ENV['delete_admin_message_time']
-                ]);
-                // 储存 Bot 所发的 Message ID
-                TelegramTools::FindUserSave([
-                    'userid'      => $User->id,
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                ]);
                 return;
             }
         }
@@ -156,12 +126,6 @@ class SetuserCommand extends Command
                     'reply_to_message_id'   => $MessageID,
                 ]
             );
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-                'executetime' => $_ENV['delete_admin_message_time']
-            ]);
             return;
         }
 
@@ -180,12 +144,6 @@ class SetuserCommand extends Command
                         'reply_to_message_id'   => $MessageID,
                     ]
                 );
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                    'executetime' => $_ENV['delete_admin_message_time']
-                ]);
                 return;
             }
             // 用户识别码
@@ -204,12 +162,6 @@ class SetuserCommand extends Command
                         'reply_to_message_id'   => $MessageID,
                     ]
                 );
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                    'executetime' => $_ENV['delete_admin_message_time']
-                ]);
                 return;
             }
             // 选项
@@ -244,12 +196,6 @@ class SetuserCommand extends Command
                         'reply_to_message_id'   => $MessageID,
                     ]
                 );
-                // 消息删除任务
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $response->getMessageId(),
-                    'executetime' => $_ENV['delete_admin_message_time']
-                ]);
                 return;
             }
         }
@@ -266,12 +212,6 @@ class SetuserCommand extends Command
                     'reply_to_message_id'   => $MessageID,
                 ]
             );
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-                'executetime' => $_ENV['delete_admin_message_time']
-            ]);
             return;
         }
         // ############## 字段选项处理 ##############
@@ -284,12 +224,6 @@ class SetuserCommand extends Command
                 'reply_to_message_id'   => $MessageID,
             ]
         );
-        // 消息删除任务
-        TelegramTools::DeleteMessage([
-            'chatid'      => $ChatID,
-            'messageid'   => $response->getMessageId(),
-            'executetime' => $_ENV['delete_admin_message_time']
-        ]);
         return;
     }
 }

src/Utils/Telegram/Commands/StartCommand.php

@@ -64,20 +64,10 @@ class StartCommand extends Command
                 ]
             );
         } else {
-            // 群组
-
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $Message->getMessageId(),
-                ]);
-            }
-
             if ($_ENV['telegram_group_quiet'] === true) {
                 // 群组中不回应
                 return;
             }
-
             // 发送 '输入中' 会话状态
             $this->replyWithChatAction(['action' => Actions::TYPING]);
             // 回送信息
@@ -86,11 +76,6 @@ class StartCommand extends Command
                     'text' => '喵喵喵.',
                 ]
             );
-            // 消息删除任务
-            TelegramTools::DeleteMessage([
-                'chatid'      => $ChatID,
-                'messageid'   => $response->getMessageId(),
-            ]);
         }
     }
 

src/Utils/Telegram/Commands/UnbindCommand.php

@@ -91,13 +91,6 @@ class UnbindCommand extends Command
                     'parse_mode'            => 'Markdown',
                 ]
             );
-        } else {
-            if ($_ENV['enable_delete_user_cmd'] === true) {
-                TelegramTools::DeleteMessage([
-                    'chatid'      => $ChatID,
-                    'messageid'   => $MessageID,
-                ]);
-            }
         }
     }
 

src/Utils/Telegram/TelegramTools.php

@@ -2,7 +2,7 @@
 
 namespace App\Utils\Telegram;
 
-use App\Models\{TelegramTasks, User};
+use App\Models\User;
 use App\Utils\Tools;
 
 class TelegramTools
@@ -528,61 +528,4 @@ class TelegramTools
             )
         );
     }
-
-    /**
-     * 删除消息
-     *
-     * <code>
-     * $Params = [
-     *   'chatid'      => '',
-     *   'messageid'   => '',
-     *   'executetime' => '',
-     * ];
-     * </code>
-     *
-     * @return void
-     */
-    public static function DeleteMessage($Params)
-    {
-        if (isset($Params['executetime']) && is_numeric($Params['executetime'])) {
-            $executetime = $Params['executetime'];
-        } else {
-            $executetime = $_ENV['delete_message_time'];
-        }
-        if ($executetime != 0) {
-            $executetime += time();
-            $task = new TelegramTasks();
-            $task->type          = 1;
-            $task->chatid        = $Params['chatid'];
-            $task->messageid     = $Params['messageid'];
-            $task->executetime   = $executetime;
-            $task->datetime      = time();
-            $task->save();
-        }
-    }
-
-    /**
-     * 储存 /setuser 操作产生的 messageid
-     *
-     * <code>
-     * $Params = [
-     *   'chatid'      => '',
-     *   'messageid'   => '',
-     *   'userid'      => '',
-     * ];
-     * </code>
-     *
-     * @return void
-     */
-    public static function FindUserSave($Params)
-    {
-        $task = new TelegramTasks();
-        $task->type          = 2;
-        $task->chatid        = $Params['chatid'];
-        $task->messageid     = $Params['messageid'];
-        $task->executetime   = 0;
-        $task->userid        = $Params['userid'];
-        $task->datetime      = time();
-        $task->save();
-    }
 }