Fix up initial code for the Bot API 5.1 implementation

Author: noplanman

src/Entities/ChatInviteLink.php

@@ -33,7 +33,7 @@ class ChatInviteLink extends Entity
     protected function subEntities(): array
     {
         return [
-            'creator' => User::class
+            'creator' => User::class,
         ];
     }
 }

src/Entities/ChatMemberUpdated.php

@@ -19,7 +19,7 @@
  * @link https://core.telegram.org/bots/api#chatmemberupdated
  *
  * @method Chat            getChat()              Chat the user belongs to
- * @method User            getUser()              Performer of the action, which resulted in the change
+ * @method User            getFrom()              Performer of the action, which resulted in the change
  * @method int             getDate()              Date the change was done in Unix time
  * @method ChatMember      getOldChatMember()     Previous information about the chat member
  * @method ChatMember      getNewChatMember()     New information about the chat member
@@ -33,11 +33,11 @@ class ChatMemberUpdated extends Entity
     protected function subEntities(): array
     {
         return [
-            'chat'              => Chat::class,
-            'from'              => User::class,
-            'old_chat_member'   => ChatMember::class,
-            'new_chat_member'   => ChatMember::class,
-            'invite_link'       => ChatInviteLink::class,
+            'chat'            => Chat::class,
+            'from'            => User::class,
+            'old_chat_member' => ChatMember::class,
+            'new_chat_member' => ChatMember::class,
+            'invite_link'     => ChatInviteLink::class,
         ];
     }
 }

src/Entities/Message.php

@@ -22,4 +22,5 @@
  */
 class MessageAutoDeleteTimerChanged extends Entity
 {
+
 }

src/Entities/MessageAutoDeleteTimerChanged.php

@@ -78,7 +78,7 @@ public function getUpdateType(): ?string
     /**
      * Get update content
      *
-     * @return CallbackQuery|ChosenInlineResult|InlineQuery|Message
+     * @return CallbackQuery|ChatMemberUpdated|ChosenInlineResult|InlineQuery|Message|PollAnswer|Poll|PreCheckoutQuery|ShippingQuery
      */
     public function getUpdateContent()
     {

src/Entities/Update.php

@@ -22,4 +22,5 @@
  */
 class VoiceChatEnded extends Entity
 {
+
 }

src/Entities/VoiceChatEnded.php

@@ -28,7 +28,7 @@ class VoiceChatParticipantsInvited extends Entity
     protected function subEntities(): array
     {
         return [
-            'users'    => [User::class],
+            'users' => [User::class],
         ];
     }
 }

src/Entities/VoiceChatParticipantsInvited.php

@@ -20,4 +20,5 @@
  */
 class VoiceChatStarted extends Entity
 {
+
 }

src/Entities/VoiceChatStarted.php

@@ -38,6 +38,21 @@ CREATE TABLE IF NOT EXISTS `user_chat` (
   FOREIGN KEY (`chat_id`) REFERENCES `chat` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
+CREATE TABLE IF NOT EXISTS `chat_invite_link` (
+  `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry',
+  `invite_link` VARCHAR(2083) CHARACTER SET 'ascii' COLLATE 'ascii_general_ci' NOT NULL COMMENT 'The invite link. If the link was created by another chat administrator, then the second part of the link will be replaced with “…”',
+  # IE7 has a 2083 character limit for HTTP GET operations: http://support.microsoft.com/kb/208427
+  `creator_id` BIGINT NOT NULL COMMENT 'Creator of the link',
+  `is_primary` BOOLEAN NOT NULL COMMENT 'True, if the link is primary',
+  `is_revoked` BOOLEAN NOT NULL COMMENT 'True, if the link is revoked',
+  `expire_date` TIMESTAMP NULL COMMENT 'Point in time (Unix TIMESTAMP) when the link will expire or has been expired',
+  `member_limit` MEDIUMINT UNSIGNED NULL COMMENT 'Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999',
+
+  PRIMARY KEY (`id`),
+
+  FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
+
 CREATE TABLE IF NOT EXISTS `inline_query` (
   `id` bigint UNSIGNED COMMENT 'Unique identifier for this query',
   `user_id` bigint NULL COMMENT 'Unique user identifier',
@@ -111,6 +126,7 @@ CREATE TABLE IF NOT EXISTS `message` (
   `group_chat_created` tinyint(1) DEFAULT 0 COMMENT 'Informs that the group has been created',
   `supergroup_chat_created` tinyint(1) DEFAULT 0 COMMENT 'Informs that the supergroup has been created',
   `channel_chat_created` tinyint(1) DEFAULT 0 COMMENT 'Informs that the channel chat has been created',
+  `message_auto_delete_timer_changed` TEXT COMMENT 'MessageAutoDeleteTimerChanged object. Message is a service message: auto-delete timer settings changed in the chat',
   `migrate_to_chat_id` bigint NULL DEFAULT NULL COMMENT 'Migrate to chat identifier. The group has been migrated to a supergroup with the specified identifier',
   `migrate_from_chat_id` bigint NULL DEFAULT NULL COMMENT 'Migrate from chat identifier. The supergroup has been migrated from a group with the specified identifier',
   `pinned_message` TEXT NULL COMMENT 'Message object. Specified message was pinned',
@@ -119,6 +135,9 @@ CREATE TABLE IF NOT EXISTS `message` (
   `connected_website` TEXT NULL COMMENT 'The domain name of the website on which the user has logged in.',
   `passport_data` TEXT NULL COMMENT 'Telegram Passport data',
   `proximity_alert_triggered` TEXT NULL COMMENT 'Service message. A user in the chat triggered another user''s proximity alert while sharing Live Location.',
+  `voice_chat_started` TEXT COMMENT 'VoiceChatStarted object. Message is a service message: voice chat started',
+  `voice_chat_ended` TEXT COMMENT 'VoiceChatEnded object. Message is a service message: voice chat ended',
+  `voice_chat_participants_invited` TEXT COMMENT 'VoiceChatParticipantsInvited object. Message is a service message: new participants invited to a voice chat',
   `reply_markup` TEXT NULL COMMENT 'Inline keyboard attached to the message',
 
   PRIMARY KEY (`chat_id`, `id`),
@@ -239,6 +258,21 @@ CREATE TABLE IF NOT EXISTS `poll_answer` (
   FOREIGN KEY (`poll_id`) REFERENCES `poll` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
+CREATE TABLE IF NOT EXISTS `chat_member_updated` (
+  `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry',
+  `chat_id` BIGINT NOT NULL COMMENT 'Chat the user belongs to',
+  `user_id` BIGINT NOT NULL COMMENT 'Performer of the action, which resulted in the change',
+  `date` TIMESTAMP NOT NULL COMMENT 'Date the change was done in Unix time',
+  `old_chat_member` TEXT NOT NULL COMMENT 'Previous information about the chat member',
+  `new_chat_member` TEXT NOT NULL COMMENT 'New information about the chat member',
+  `chat_invite_link_id` BIGINT UNSIGNED NULL COMMENT 'Chat invite link, which was used by the user to join the chat; for joining by invite link events only',
+
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`chat_id`) REFERENCES `chat` (`id`),
+  FOREIGN KEY (`user_id`) REFERENCES `user` (`id`),
+  FOREIGN KEY (`chat_invite_link_id`) REFERENCES `chat_invite_link` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
+
 CREATE TABLE IF NOT EXISTS `telegram_update` (
   `id` bigint UNSIGNED COMMENT 'Update''s unique identifier',
   `chat_id` bigint NULL DEFAULT NULL COMMENT 'Unique chat identifier',
@@ -253,6 +287,8 @@ CREATE TABLE IF NOT EXISTS `telegram_update` (
   `pre_checkout_query_id` bigint UNSIGNED DEFAULT NULL COMMENT 'New incoming pre-checkout query. Contains full information about checkout',
   `poll_id` bigint UNSIGNED DEFAULT NULL COMMENT 'New poll state. Bots receive only updates about polls, which are sent or stopped by the bot',
   `poll_answer_poll_id` bigint UNSIGNED DEFAULT NULL COMMENT 'A user changed their answer in a non-anonymous poll. Bots receive new votes only in polls that were sent by the bot itself.',
+  `my_chat_member_update_id` BIGINT UNSIGNED NULL COMMENT 'The bot''s chat member status was updated in a chat. For private chats, this update is received only when the bot is blocked or unblocked by the user.',
+  `chat_member_update_id` BIGINT UNSIGNED NULL COMMENT 'A chat member''s status was updated in a chat. The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowed_updates to receive these updates.',
 
   PRIMARY KEY (`id`),
   KEY `message_id` (`message_id`),
@@ -267,6 +303,8 @@ CREATE TABLE IF NOT EXISTS `telegram_update` (
   KEY `pre_checkout_query_id` (`pre_checkout_query_id`),
   KEY `poll_id` (`poll_id`),
   KEY `poll_answer_poll_id` (`poll_answer_poll_id`),
+  KEY `my_chat_member_update_id` (`my_chat_member_update_id`),
+  KEY `chat_member_update_id` (`chat_member_update_id`),
 
   FOREIGN KEY (`chat_id`, `message_id`) REFERENCES `message` (`chat_id`, `id`),
   FOREIGN KEY (`edited_message_id`) REFERENCES `edited_message` (`id`),
@@ -278,7 +316,9 @@ CREATE TABLE IF NOT EXISTS `telegram_update` (
   FOREIGN KEY (`shipping_query_id`) REFERENCES `shipping_query` (`id`),
   FOREIGN KEY (`pre_checkout_query_id`) REFERENCES `pre_checkout_query` (`id`),
   FOREIGN KEY (`poll_id`) REFERENCES `poll` (`id`),
-  FOREIGN KEY (`poll_answer_poll_id`) REFERENCES `poll_answer` (`poll_id`)
+  FOREIGN KEY (`poll_answer_poll_id`) REFERENCES `poll_answer` (`poll_id`),
+  FOREIGN KEY (`my_chat_member_update_id`) REFERENCES `chat_member_updated` (`id`),
+  FOREIGN KEY (`chat_member_update_id`) REFERENCES `chat_member_updated` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
 CREATE TABLE IF NOT EXISTS `conversation` (

structure.sql

@@ -1,7 +1,6 @@
 # Invite Links
 CREATE TABLE IF NOT EXISTS `chat_invite_link` (
-    `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry'
-        PRIMARY KEY,
+    `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry',
     `invite_link` VARCHAR(2083) CHARACTER SET 'ascii' COLLATE 'ascii_general_ci' NOT NULL COMMENT 'The invite link. If the link was created by another chat administrator, then the second part of the link will be replaced with “…”',
     # IE7 has a 2083 character limit for HTTP GET operations: http://support.microsoft.com/kb/208427
     `creator_id` BIGINT NOT NULL COMMENT 'Creator of the link',
@@ -10,39 +9,36 @@ CREATE TABLE IF NOT EXISTS `chat_invite_link` (
     `expire_date` TIMESTAMP NULL COMMENT 'Point in time (Unix TIMESTAMP) when the link will expire or has been expired',
     `member_limit` MEDIUMINT UNSIGNED NULL COMMENT 'Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999',
 
+    PRIMARY KEY (`id`),
+
     FOREIGN KEY (`creator_id`) REFERENCES `user` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
 # New update type
 CREATE TABLE IF NOT EXISTS `chat_member_updated` (
-    `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry'
-        PRIMARY KEY,
+    `id` BIGINT UNSIGNED COMMENT 'Unique identifier for this entry',
     `chat_id` BIGINT NOT NULL COMMENT 'Chat the user belongs to',
     `user_id` BIGINT NOT NULL COMMENT 'Performer of the action, which resulted in the change',
     `date` TIMESTAMP NOT NULL COMMENT 'Date the change was done in Unix time',
     `old_chat_member` TEXT NOT NULL COMMENT 'Previous information about the chat member',
     `new_chat_member` TEXT NOT NULL COMMENT 'New information about the chat member',
     `chat_invite_link_id` BIGINT UNSIGNED NULL COMMENT 'Chat invite link, which was used by the user to join the chat; for joining by invite link events only',
 
+    PRIMARY KEY (`id`),
+
     FOREIGN KEY (`chat_id`) REFERENCES `chat` (`id`),
     FOREIGN KEY (`user_id`) REFERENCES `user` (`id`),
     FOREIGN KEY (`chat_invite_link_id`) REFERENCES `chat_invite_link` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 
 # Updates about member status changes in chats
-ALTER TABLE `telegram_update` ADD COLUMN `my_chat_member_update_id`
-    BIGINT UNSIGNED NULL COMMENT 'The bot''s chat member status was updated in a chat. For private chats, this update is received only when the bot is blocked or unblocked by the user.';
+ALTER TABLE `telegram_update` ADD COLUMN `my_chat_member_update_id` BIGINT UNSIGNED NULL COMMENT 'The bot''s chat member status was updated in a chat. For private chats, this update is received only when the bot is blocked or unblocked by the user.';
 ALTER TABLE `telegram_update` ADD FOREIGN KEY (`my_chat_member_update_id`) REFERENCES `chat_member_updated` (`id`);
-ALTER TABLE `telegram_update` ADD COLUMN `chat_member_update_id`
-    BIGINT UNSIGNED NULL COMMENT 'A chat member''s status was updated in a chat. The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowed_updates to receive these updates.';
+ALTER TABLE `telegram_update` ADD COLUMN `chat_member_update_id` BIGINT UNSIGNED NULL COMMENT 'A chat member''s status was updated in a chat. The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowed_updates to receive these updates.';
 ALTER TABLE `telegram_update` ADD FOREIGN KEY (`chat_member_update_id`) REFERENCES `chat_member_updated` (`id`);
 
 # New service messages
-ALTER TABLE `message` ADD COLUMN `message_auto_delete_timer_changed`
-    TEXT COMMENT 'MessageAutoDeleteTimerChanged object. Message is a service message: auto-delete timer settings changed in the chat' AFTER `channel_chat_created`;
-ALTER TABLE `message` ADD COLUMN `voice_chat_started`
-    TEXT COMMENT 'VoiceChatStarted object. Message is a service message: voice chat started' AFTER `proximity_alert_triggered`;
-ALTER TABLE `message` ADD COLUMN `voice_chat_ended`
-    TEXT COMMENT 'VoiceChatEnded object. Message is a service message: voice chat ended' AFTER `voice_chat_started`;
-ALTER TABLE `message` ADD COLUMN `voice_chat_participants_invited`
-    TEXT COMMENT 'VoiceChatParticipantsInvited object. Message is a service message: new participants invited to a voice chat' AFTER `voice_chat_ended`;
+ALTER TABLE `message` ADD COLUMN `message_auto_delete_timer_changed` TEXT COMMENT 'MessageAutoDeleteTimerChanged object. Message is a service message: auto-delete timer settings changed in the chat' AFTER `channel_chat_created`;
+ALTER TABLE `message` ADD COLUMN `voice_chat_started` TEXT COMMENT 'VoiceChatStarted object. Message is a service message: voice chat started' AFTER `proximity_alert_triggered`;
+ALTER TABLE `message` ADD COLUMN `voice_chat_ended` TEXT COMMENT 'VoiceChatEnded object. Message is a service message: voice chat ended' AFTER `voice_chat_started`;
+ALTER TABLE `message` ADD COLUMN `voice_chat_participants_invited` TEXT COMMENT 'VoiceChatParticipantsInvited object. Message is a service message: new participants invited to a voice chat' AFTER `voice_chat_ended`;