Bump to core version 0.74.0

Author: noplanman

commands/NewchatmembersCommand.php

@@ -16,7 +16,8 @@
 use LitEmoji\LitEmoji;
 use Longman\TelegramBot\Commands\SystemCommand;
 use Longman\TelegramBot\DB;
-use Longman\TelegramBot\Entities\ChatMember;
+use Longman\TelegramBot\Entities\ChatMember\ChatMemberAdministrator;
+use Longman\TelegramBot\Entities\ChatMember\ChatMemberOwner;
 use Longman\TelegramBot\Entities\ChatPermissions;
 use Longman\TelegramBot\Entities\InlineKeyboard;
 use Longman\TelegramBot\Entities\Message;
@@ -25,10 +26,7 @@
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Request;
 use TelegramBot\SupportBot\Helpers;
-use Longman\TelegramBot\Entities\ChatMember\ChatMember;
-use Longman\TelegramBot\Entities\ChatMember\ChatMemberOwner;
-use Longman\TelegramBot\Entities\ChatMember\ChatMemberAdministrator
-    
+
 /**
  * Send a welcome message to new chat members.
  */
@@ -47,7 +45,7 @@ class NewchatmembersCommand extends SystemCommand
     /**
      * @var string
      */
-    protected $version = '0.5.0';
+    protected $version = '0.6.0';
 
     /**
      * @var Message
@@ -157,11 +155,8 @@ private function isUserAllowedToAddBot(): bool
             'user_id' => $this->user_id,
         ])->getResult();
 
-        if ($chat_member instanceof ChatMember) {
-            return in_array($chat_member->getStatus(), ['creator', 'administrator'], true);
-        }
-
-        return false;
+        return $chat_member instanceof ChatMemberOwner
+            || $chat_member instanceof ChatMemberAdministrator;
     }
 
     /**
@@ -200,7 +195,7 @@ private function kickDisallowedBots(array $bots): void
         }
 
         foreach ($bots as $bot) {
-            Request::kickChatMember([
+            Request::banChatMember([
                 'chat_id' => $this->chat_id,
                 'user_id' => $bot->getId(),
             ]);
@@ -222,7 +217,7 @@ private function updateUsersJoinedDate(array $new_users): bool
 
         // Update "Joined Date" for new users.
         return DB::getPdo()->prepare("
-            UPDATE " . TB_USER . "
+            UPDATE `user`
             SET `joined_at` = ?
             WHERE `id` IN (?)
         ")->execute([date('Y-m-d H:i:s'), implode(',', $new_users_ids)]);

commands/RulesCommand.php

@@ -44,7 +44,7 @@ class RulesCommand extends UserCommand
     /**
      * @var string
      */
-    protected $version = '0.2.0';
+    protected $version = '0.2.1';
 
     /**
      * @var string
@@ -65,7 +65,7 @@ public static function handleCallbackQuery(CallbackQuery $callback_query, array
 
             // If the user is already activated, keep the initial activation date.
             $activated = DB::getPdo()->prepare("
-                UPDATE " . TB_USER . "
+                UPDATE `user`
                 SET `activated_at` = ?
                 WHERE `id` = ?
                   AND `activated_at` IS NULL
@@ -155,7 +155,7 @@ protected static function hasUserAgreedToRules(int $user_id): bool
     {
         $statement = DB::getPdo()->prepare('
             SELECT `activated_at`
-            FROM `' . TB_USER . '`
+            FROM `user`
             WHERE `id` = ?
               AND `activated_at` IS NOT NULL
         ');

composer.json

@@ -21,7 +21,7 @@
         "ext-json": "*",
         "ext-pdo": "*",
         "php-telegram-bot/telegram-bot-manager": "^1.7",
-        "longman/telegram-bot": "0.73.0 as 0.73",
+        "longman/telegram-bot": "0.74.0 as 0.73",
         "noplanman/service-webhook-handler": "^0.2",
         "vlucas/phpdotenv": "^5.3",
         "elvanto/litemoji": "^4.0",