Merge pull request #1 from devrabie/remove-database-feature

المهام المنجزة:

Author: devrabie

README.md

@@ -86,8 +86,7 @@ The Bot can:
 - Manage Channel from the bot admin interface.
 - Full support for **inline bots**.
 - Inline keyboard.
-- Messages, InlineQuery and ChosenInlineQuery are stored in the Database.
-- Conversation feature.
+- Conversation feature (Currently disabled due to database removal).
 
 ---
 
@@ -201,7 +200,7 @@ The bot can handle updates with [**Webhook**](#webhook-installation) or [**getUp
 | ---- | :----: | :----: |
 | Description | Telegram sends the updates directly to your host | You have to fetch Telegram updates manually |
 | Host with https | Required | Not required |
-| MySQL | Not required | ([Not](#getupdates-without-database)) Required  |
+| MySQL | Not required | Not Required  |
 
 ## Using a custom Bot API server
 
@@ -290,8 +289,6 @@ Edit *[unset.php]* with your bot credentials and execute it.
 
 ## getUpdates installation
 
-For best performance, the MySQL database should be enabled for the `getUpdates` method!
-
 Create *[getUpdatesCLI.php]* with the following contents:
 ```php
 #!/usr/bin/env php
@@ -301,21 +298,10 @@ require __DIR__ . '/vendor/autoload.php';
 $bot_api_key  = 'your:bot_api_key';
 $bot_username = 'username_bot';
 
-$mysql_credentials = [
-   'host'     => 'localhost',
-   'port'     => 3306, // optional
-   'user'     => 'dbuser',
-   'password' => 'dbpass',
-   'database' => 'dbname',
-];
-
 try {
     // Create Telegram API object
     $telegram = new Longman\TelegramBot\Telegram($bot_api_key, $bot_username);
 
-    // Enable MySQL
-    $telegram->enableMySql($mysql_credentials);
-
     // Handle telegram getUpdates request
     $telegram->handleGetUpdates();
 } catch (Longman\TelegramBot\Exception\TelegramException $e) {
@@ -334,13 +320,6 @@ Lastly, run it!
 $ ./getUpdatesCLI.php
 ```
 
-### getUpdates without database
-
-If you choose to / or are obliged to use the `getUpdates` method without a database, you can replace the `$telegram->enableMySql(...);` line above with:
-```php
-$telegram->useGetUpdatesWithoutDatabase();
-```
-
 ## Filter Update
 
 :exclamation: Note that by default, Telegram will send any new update types that may be added in the future. This may cause commands that don't take this into account to break!
@@ -463,59 +442,14 @@ Get the file path and download it. (see *[WhoamiCommand.php]* for a full example
 
 #### Send message to all active chats
 
-To do this you have to enable the MySQL connection.
-Here's an example of use (check [`DB::selectChats()`][DB::selectChats] for parameter usage):
-
-```php
-$results = Request::sendToActiveChats(
-    'sendMessage', // Callback function to execute (see Request.php methods)
-    ['text' => 'Hey! Check out the new features!!'], // Param to evaluate the request
-    [
-        'groups'      => true,
-        'supergroups' => true,
-        'channels'    => false,
-        'users'       => true,
-    ]
-);
-```
-
-You can also broadcast a message to users, from the private chat with your bot. Take a look at the [admin commands](#admin-commands) below.
+This feature is currently disabled due to the removal of database functionality.
 
 ## Utils
 
 ### MySQL storage (Recommended)
 
-If you want to save messages/users/chats for further usage in commands, create a new database (`utf8mb4_unicode_520_ci`), import *[structure.sql]* and enable MySQL support BEFORE `handle()` method:
+Database storage functionality has been removed from this library.
 
-```php
-$mysql_credentials = [
-   'host'     => 'localhost',
-   'port'     => 3306, // optional
-   'user'     => 'dbuser',
-   'password' => 'dbpass',
-   'database' => 'dbname',
-];
-
-$telegram->enableMySql($mysql_credentials);
-```
-
-You can set a custom prefix to all the tables while you are enabling MySQL:
-
-```php
-$telegram->enableMySql($mysql_credentials, $bot_username . '_');
-```
-
-You can also store inline query and chosen inline query data in the database.
-
-#### External Database connection
-
-It is possible to provide the library with an external MySQL PDO connection.
-Here's how to configure it:
-
-```php
-$telegram->enableExternalMySql($external_pdo_connection);
-//$telegram->enableExternalMySql($external_pdo_connection, $table_prefix)
-```
 ### Channels Support
 
 All methods implemented can be used to manage channels.
@@ -566,13 +500,13 @@ $telegram->setCommandConfig('weather', [
 
 ### Admin Commands
 
-Enabling this feature, the bot admin can perform some super user commands like:
-- List all the chats started with the bot */chats*
-- Clean up old database entries */cleanup*
+Some admin commands that relied on database functionality have been disabled or removed:
+- List all the chats started with the bot */chats* (Disabled)
+- Clean up old database entries */cleanup* (Disabled)
 - Show debug information about the bot */debug*
 - Send message to all chats */sendtoall*
 - Post any content to your channels */sendtochannel*
-- Inspect a user or a chat with */whois*
+- Inspect a user or a chat with */whois* (Removed)
 
 Take a look at all default admin commands stored in the *[src/Commands/AdminCommands/][AdminCommands-folder]* folder.
 
@@ -711,8 +645,8 @@ Credit list in [CREDITS](CREDITS)
 [WhoamiCommand.php]: https://github.com/php-telegram-bot/example-bot/blob/master/Commands/WhoamiCommand.php "example /whoami command"
 [HelpCommand.php]: https://github.com/php-telegram-bot/example-bot/blob/master/Commands/HelpCommand.php "example /help command"
 [SendtochannelCommand.php]: https://github.com/php-telegram-bot/core/blob/master/src/Commands/AdminCommands/SendtochannelCommand.php "/sendtochannel admin command"
-[DB::selectChats]: https://github.com/php-telegram-bot/core/blob/0.70.0/src/DB.php#L1148 "DB::selectChats() parameters"
-[structure.sql]: https://github.com/php-telegram-bot/core/blob/master/structure.sql "DB structure for importing"
+[DB::selectChats]: # "DB::selectChats() parameters (Removed)"
+[structure.sql]: # "DB structure for importing (Removed)"
 [Wiki]: https://github.com/php-telegram-bot/core/wiki "PHP Telegram Bot Wiki"
 [wiki-create-your-own-commands]: https://github.com/php-telegram-bot/core/wiki/Create-your-own-commands "Create your own commands"
 [issues]: https://github.com/php-telegram-bot/core/issues "PHP Telegram Bot Issues"

src/Commands/AdminCommands/ChatsCommand.php

@@ -13,7 +13,6 @@
 
 use Longman\TelegramBot\Commands\AdminCommand;
 use Longman\TelegramBot\DB;
-use Longman\TelegramBot\Entities\Chat;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Request;
@@ -53,91 +52,8 @@ class ChatsCommand extends AdminCommand
      */
     public function execute(): ServerResponse
     {
-        $message = $this->getMessage() ?: $this->getEditedMessage() ?: $this->getChannelPost() ?: $this->getEditedChannelPost();
+        $usage = $this->getUsage();
 
-        $chat_id = $message->getChat()->getId();
-        $text    = trim($message->getText(true));
-
-        $results = DB::selectChats([
-            'groups'      => true,
-            'supergroups' => true,
-            'channels'    => true,
-            'users'       => true,
-            'text'        => ($text === '' || $text === '*') ? null : $text //Text to search in user/group name
-        ]);
-
-        $user_chats       = 0;
-        $group_chats      = 0;
-        $supergroup_chats = 0;
-        $channel_chats    = 0;
-
-        if ($text === '') {
-            $text_back = '';
-        } elseif ($text === '*') {
-            $text_back = 'List of all bot chats:' . PHP_EOL;
-        } else {
-            $text_back = 'Chat search results:' . PHP_EOL;
-        }
-
-        if (is_array($results)) {
-            foreach ($results as $result) {
-                //Initialize a chat object
-                $result['id'] = $result['chat_id'];
-                $chat         = new Chat($result);
-
-                $whois = $chat->getId();
-                if ($this->telegram->getCommandObject('whois')) {
-                    // We can't use '-' in command because part of it will become unclickable
-                    $whois = '/whois' . str_replace('-', 'g', $chat->getId());
-                }
-
-                if ($chat->isPrivateChat()) {
-                    if ($text !== '') {
-                        $text_back .= '- P ' . $chat->tryMention() . ' [' . $whois . ']' . PHP_EOL;
-                    }
-
-                    ++$user_chats;
-                } elseif ($chat->isSuperGroup()) {
-                    if ($text !== '') {
-                        $text_back .= '- S ' . $chat->getTitle() . ' [' . $whois . ']' . PHP_EOL;
-                    }
-
-                    ++$supergroup_chats;
-                } elseif ($chat->isGroupChat()) {
-                    if ($text !== '') {
-                        $text_back .= '- G ' . $chat->getTitle() . ' [' . $whois . ']' . PHP_EOL;
-                    }
-
-                    ++$group_chats;
-                } elseif ($chat->isChannel()) {
-                    if ($text !== '') {
-                        $text_back .= '- C ' . $chat->getTitle() . ' [' . $whois . ']' . PHP_EOL;
-                    }
-
-                    ++$channel_chats;
-                }
-            }
-        }
-
-        if (($user_chats + $group_chats + $supergroup_chats) === 0) {
-            $text_back = 'No chats found..';
-        } else {
-            $text_back .= PHP_EOL . 'Private Chats: ' . $user_chats;
-            $text_back .= PHP_EOL . 'Groups: ' . $group_chats;
-            $text_back .= PHP_EOL . 'Super Groups: ' . $supergroup_chats;
-            $text_back .= PHP_EOL . 'Channels: ' . $channel_chats;
-            $text_back .= PHP_EOL . 'Total: ' . ($user_chats + $group_chats + $supergroup_chats);
-
-            if ($text === '') {
-                $text_back .= PHP_EOL . PHP_EOL . 'List all chats: /' . $this->name . ' *' . PHP_EOL . 'Search for chats: /' . $this->name . ' <search string>';
-            }
-        }
-
-        $data = [
-            'chat_id' => $chat_id,
-            'text'    => $text_back,
-        ];
-
-        return Request::sendMessage($data);
+        return $this->replyToChat(sprintf('This command is not available because the database feature has been removed.%sUsage: %s', PHP_EOL, $usage));
     }
 }

src/Commands/AdminCommands/CleanupCommand.php

@@ -12,7 +12,6 @@
 namespace Longman\TelegramBot\Commands\AdminCommands;
 
 use Longman\TelegramBot\Commands\AdminCommand;
-use Longman\TelegramBot\DB;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Request;
@@ -365,71 +364,6 @@ public function executeNoDb(): ServerResponse
      */
     public function execute(): ServerResponse
     {
-        $message = $this->getMessage() ?: $this->getEditedMessage() ?: $this->getChannelPost() ?: $this->getEditedChannelPost();
-        $text    = $message->getText(true);
-
-        // Dry run?
-        $dry_run = strpos($text, 'dry') !== false;
-        $text    = trim(str_replace('dry', '', $text));
-
-        $settings = $this->getSettings($text);
-        $queries  = $this->getQueries($settings);
-
-        if ($dry_run) {
-            return $this->replyToUser('Queries:' . PHP_EOL . implode(PHP_EOL, $queries));
-        }
-
-        $infos = [];
-        foreach ($settings['tables_to_clean'] as $table) {
-            $info = "*{$table}*";
-
-            if (isset($settings['clean_older_than'][$table])) {
-                $info .= " ({$settings['clean_older_than'][$table]})";
-            }
-
-            $infos[] = $info;
-        }
-
-        $data = [
-            'chat_id'    => $message->getFrom()->getId(),
-            'parse_mode' => 'Markdown',
-        ];
-
-        $data['text'] = 'Cleaning up tables:' . PHP_EOL . implode(PHP_EOL, $infos);
-        Request::sendMessage($data);
-
-        $rows = 0;
-        $pdo  = DB::getPdo();
-        try {
-            $pdo->beginTransaction();
-
-            foreach ($queries as $query) {
-                // Delete in chunks to not block / improve speed on big tables.
-                $query .= ' LIMIT 10000';
-                while ($dbq = $pdo->query($query)) {
-                    if ($dbq->rowCount() === 0) {
-                        continue 2;
-                    }
-                    $rows += $dbq->rowCount();
-                }
-
-                TelegramLog::error('Error while executing query: ' . $query);
-            }
-
-            // commit changes to the database and end transaction
-            $pdo->commit();
-
-            $data['text'] = "*Database cleanup done!* _(removed {$rows} rows)_";
-        } catch (PDOException $e) {
-            $data['text'] = '*Database cleanup failed!* _(check your error logs)_';
-
-            // rollback changes on exception
-            // useful if you want to track down error you can't replicate it when some of the data is already deleted
-            $pdo->rollBack();
-
-            TelegramLog::error($e->getMessage());
-        }
-
-        return Request::sendMessage($data);
+        return $this->replyToChat('This command is not available because the database feature has been removed.' . PHP_EOL . 'Type /debug to see all available information.');
     }
 }

src/Commands/AdminCommands/DebugCommand.php

@@ -13,7 +13,6 @@
 
 use Exception;
 use Longman\TelegramBot\Commands\AdminCommand;
-use Longman\TelegramBot\DB;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Request;
@@ -51,7 +50,6 @@ class DebugCommand extends AdminCommand
      */
     public function execute(): ServerResponse
     {
-        $pdo     = DB::getPdo();
         $message = $this->getMessage() ?: $this->getEditedMessage() ?: $this->getChannelPost() ?: $this->getEditedChannelPost();
         $chat    = $message->getChat();
         $text    = strtolower($message->getText(true));
@@ -83,8 +81,7 @@ public function execute(): ServerResponse
         $debug_info[] = sprintf('*PHP version:* `%1$s%2$s; %3$s; %4$s`', PHP_VERSION, $php_bit, PHP_SAPI, PHP_OS);
         $debug_info[] = sprintf('*Maximum PHP script execution time:* `%d seconds`', ini_get('max_execution_time'));
 
-        $mysql_version = $pdo ? $pdo->query('SELECT VERSION() AS version')->fetchColumn() : null;
-        $debug_info[]  = sprintf('*MySQL version:* `%s`', $mysql_version ?: 'disabled');
+        $debug_info[]  = sprintf('*MySQL version:* `%s`', 'disabled');
 
         $debug_info[] = sprintf('*Operating System:* `%s`', php_uname());