Merge pull request #647 from noplanman/finalise_payments_implementation

Add missing Payment properties to Message entity

CHANGELOG.md

@@ -5,6 +5,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 
 ## [Unreleased]
 ### Added
+- Finish implementing payments, adding all missing type checks and docblock methods.
 ### Changed
 ### Deprecated
 ### Removed

src/Entities/Message.php

@@ -10,6 +10,9 @@
 
 namespace Longman\TelegramBot\Entities;
 
+use Longman\TelegramBot\Entities\Payments\Invoice;
+use Longman\TelegramBot\Entities\Payments\SuccessfulPayment;
+
 /**
  * Class Message
  *
@@ -46,6 +49,8 @@ namespace Longman\TelegramBot\Entities;
  * @method int               getMigrateToChatId()       Optional. The group has been migrated to a supergroup with the specified identifier. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
  * @method int               getMigrateFromChatId()     Optional. The supergroup has been migrated from a group with the specified identifier. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
  * @method Message           getPinnedMessage()         Optional. Specified message was pinned. Note that the Message object in this field will not contain further reply_to_message fields even if it is itself a reply.
+ * @method Invoice           getInvoice()               Optional. Message is an invoice for a payment, information about the invoice.
+ * @method SuccessfulPayment getSuccessfulPayment()     Optional. Message is a service message about a successful payment, information about the payment.
  */
 class Message extends Entity
 {
@@ -75,6 +80,8 @@ class Message extends Entity
             'left_chat_member'   => User::class,
             'new_chat_photo'     => PhotoSize::class,
             'pinned_message'     => Message::class,
+            'invoice'            => Invoice::class,
+            'successful_payment' => SuccessfulPayment::class,
         ];
     }
 
@@ -244,7 +251,7 @@ class Message extends Entity
     /**
      * Detect type based on properties.
      *
-     * @return string|null
+     * @return string
      */
     public function getType()
     {
@@ -270,6 +277,8 @@ class Message extends Entity
             'migrate_to_chat_id',
             'migrate_from_chat_id',
             'pinned_message',
+            'invoice',
+            'successful_payment',
         ];
 
         foreach ($types as $type) {

src/Telegram.php

@@ -420,9 +420,7 @@ class Telegram
         $command = 'genericmessage';
 
         $update_type = $this->update->getUpdateType();
-        if (in_array($update_type, ['edited_message', 'channel_post', 'edited_channel_post', 'inline_query', 'chosen_inline_result', 'callback_query'], true)) {
-            $command = $this->getCommandFromType($update_type);
-        } elseif ($update_type === 'message') {
+        if ($update_type === 'message') {
             $message = $this->update->getMessage();
 
             //Load admin commands
@@ -434,21 +432,25 @@ class Telegram
             if ($type === 'command') {
                 $command = $message->getCommand();
             } elseif (in_array($type, [
-                'channel_chat_created',
+                'new_chat_members',
+                'left_chat_member',
+                'new_chat_title',
+                'new_chat_photo',
                 'delete_chat_photo',
                 'group_chat_created',
-                'left_chat_member',
-                'migrate_from_chat_id',
+                'supergroup_chat_created',
+                'channel_chat_created',
                 'migrate_to_chat_id',
-                'new_chat_members',
-                'new_chat_photo',
-                'new_chat_title',
+                'migrate_from_chat_id',
                 'pinned_message',
-                'supergroup_chat_created',
+                'invoice',
+                'successful_payment',
             ], true)
             ) {
                 $command = $this->getCommandFromType($type);
             }
+        } else {
+            $command = $this->getCommandFromType($update_type);
         }
 
         //Make sure we have an up-to-date command list