Merge branch 'develop' into 811-helper_for_media_groups

Author: noplanman

CHANGELOG.md

@@ -8,10 +8,13 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 - Helper for sending `InputMedia` objects using `Request::sendMediaGroup()` and `Request::editMediaMessage()` methods.
 - Allow passing absolute file path for InputFile fields, instead of `Request::encodeFile($path)`.
 ### Changed
+- All Message field types dynamically search for an existing Command class that can handle them.
 ### Deprecated
 - Botan.io service has been discontinued.
+- Most built-in System Commands will be handled by GenericmessageCommand by default in a future release and will require a custom implementation.
 ### Removed
 ### Fixed
+- Constraint errors in `/cleanup` command.
 - Return correct objects for requests.
 ### Security
 

src/Commands/AdminCommands/CleanupCommand.php

@@ -164,6 +164,7 @@ private function getQueries($settings)
                     SELECT `id`
                     FROM `%4$s`
                     WHERE `chat_id` = `%4$s`.`id`
+                    AND `updated_at` < \'%1$s\'
                   )
                   AND (
                     `message_id` IS NOT NULL
@@ -301,20 +302,38 @@ private function getQueries($settings)
         if (in_array('message', $tables_to_clean, true)) {
             $queries[] = sprintf(
                 'DELETE FROM `%1$s`
-                WHERE `date` < \'%2$s\'
-                  AND `id` NOT IN (
-                    SELECT `message_id`
-                    FROM `%3$s`
-                    WHERE `message_id` = `%1$s`.`id`
-                  )
-                  AND `id` NOT IN (
-                    SELECT `message_id`
-                    FROM `%4$s`
-                    WHERE `message_id` = `%1$s`.`id`
-                  )
+                WHERE id IN (
+                    SELECT id
+                    FROM (
+                        SELECT id
+                        FROM  `message`
+                        WHERE `date` < \'%2$s\'
+                          AND `id` NOT IN (
+                            SELECT `message_id`
+                            FROM `%3$s`
+                            WHERE `message_id` = `%1$s`.`id`
+                          )
+                          AND `id` NOT IN (
+                            SELECT `message_id`
+                            FROM `%4$s`
+                            WHERE `message_id` = `%1$s`.`id`
+                          )
+                          AND `id` NOT IN (
+                            SELECT `message_id`
+                            FROM `%5$s`
+                            WHERE `message_id` = `%1$s`.`id`
+                          )
+                          AND `id` NOT IN (
+                            SELECT a.`reply_to_message` FROM `%1$s` a
+                            INNER JOIN `%1$s` b ON b.`id` = a.`reply_to_message` AND b.`chat_id` = a.`reply_to_chat`
+                          )
+                        ORDER BY `id` DESC
+                     ) a
+                 )
             ',
                 TB_MESSAGE,
                 $clean_older_than['message'],
+                TB_EDITED_MESSAGE,
                 TB_TELEGRAM_UPDATE,
                 TB_CALLBACK_QUERY
             );

src/Commands/SystemCommands/ChannelchatcreatedCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Channel chat created command
+ *
+ * @todo Remove due to deprecation!
  */
 class ChannelchatcreatedCommand extends SystemCommand
 {
@@ -43,6 +45,8 @@ public function execute()
         //$message = $this->getMessage();
         //$channel_chat_created = $message->getChannelChatCreated();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/ChannelpostCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Channel post command
+ *
+ * @todo Remove due to deprecation!
  */
 class ChannelpostCommand extends SystemCommand
 {
@@ -42,6 +44,8 @@ public function execute()
     {
         //$channel_post = $this->getUpdate()->getChannelPost();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/ChoseninlineresultCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Chosen inline result command
+ *
+ * @todo Remove due to deprecation!
  */
 class ChoseninlineresultCommand extends SystemCommand
 {
@@ -45,6 +47,8 @@ public function execute()
         //$inline_query = $update->getChosenInlineResult();
         //$query = $inline_query->getQuery();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/DeletechatphotoCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Delete chat photo command
+ *
+ * @todo Remove due to deprecation!
  */
 class DeletechatphotoCommand extends SystemCommand
 {
@@ -43,6 +45,8 @@ public function execute()
         //$message = $this->getMessage();
         //$delete_chat_photo = $message->getDeleteChatPhoto();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/EditedchannelpostCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Edited channel post command
+ *
+ * @todo Remove due to deprecation!
  */
 class EditedchannelpostCommand extends SystemCommand
 {
@@ -42,6 +44,8 @@ public function execute()
     {
         //$edited_channel_post = $this->getUpdate()->getEditedChannelPost();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/EditedmessageCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Edited message command
+ *
+ * @todo Remove due to deprecation!
  */
 class EditedmessageCommand extends SystemCommand
 {
@@ -43,6 +45,8 @@ public function execute()
         //$update = $this->getUpdate();
         //$edited_message = $update->getEditedMessage();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/GroupchatcreatedCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Group chat created command
+ *
+ * @todo Remove due to deprecation!
  */
 class GroupchatcreatedCommand extends SystemCommand
 {
@@ -43,6 +45,8 @@ public function execute()
         //$message = $this->getMessage();
         //$group_chat_created = $message->getGroupChatCreated();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }

src/Commands/SystemCommands/LeftchatmemberCommand.php

@@ -14,6 +14,8 @@
 
 /**
  * Left chat member command
+ *
+ * @todo Remove due to deprecation!
  */
 class LeftchatmemberCommand extends SystemCommand
 {
@@ -43,6 +45,8 @@ public function execute()
         //$message = $this->getMessage();
         //$member = $message->getLeftChatMember();
 
+        trigger_error(__CLASS__ . ' is deprecated and will be removed and handled by ' . GenericmessageCommand::class . ' by default in a future release.', E_USER_DEPRECATED);
+
         return parent::execute();
     }
 }