Added Default Updates

Author: SebaOfficial

docs/01-updates.md

@@ -26,4 +26,15 @@ $bot2 = new Bot("YOUR_BOT_TOKEN", Bot::UPDATES_FROM_WEBHOOK);
 
 $update = $bot2->updates();
 echo (json_encode($update) ?? "No updates found.") . "\n";
-```
+```
+
+## Default Updates
+The library provides general default updates to use
+
+```php
+$updates = $bot->updates(true);
+```
+
+Here's a list of the currently available general updates:
+* [`user`](https://core.telegram.org/bots/api#user): The user that performed the action.
+* [`chat`](https://core.telegram.org/bots/api#chat): The chat where the action was performed.

examples/echobot-webhook.php

@@ -6,14 +6,14 @@
 
 $bot = new Bot("YOUR_BOT_TOKEN", Bot::UPDATES_FROM_WEBHOOK);
 
-$update = $bot->updates();
+$update = $bot->updates(true);
 
 if(isset($update->update_id)){
 
     if(isset($update->message)){
         $bot->copyMessage([
-            "chat_id" => $update->message->chat->id,
-            "from_chat_id" => $update->message->chat->id,
+            "chat_id" => $update->chat->id,
+            "from_chat_id" => $update->chat->id,
             "message_id" => $update->message->message_id
         ]);
     }

examples/echobot.php

@@ -12,20 +12,20 @@
 echo GREEN_TEXT . "Bot Started!\n" . DEFAULT_TEXT;
 
 while(true){
-    $updates = $bot->updates($updates->lastUpdateID ?? null);
+    $updates = $bot->updates(true, $updates->lastUpdateID ?? null);
 
     foreach($updates->result as $update){
         if(isset($update->message)){
             $res = $bot->copyMessage([
-                "chat_id" => $update->message->chat->id,
-                "from_chat_id" => $update->message->chat->id,
+                "chat_id" => $update->chat->id,
+                "from_chat_id" => $update->chat->id,
                 "message_id" => $update->message->message_id
             ]);
 
             if($res->body->ok){
-                echo GREEN_TEXT . "Replied to " . $update->message->chat->id . "\n" . DEFAULT_TEXT;
+                echo GREEN_TEXT . "Replied to " . $update->chat->id . "\n" . DEFAULT_TEXT;
             } else{
-                echo RED_TEXT . "Coulnd't reply to " . $update->message->chat->id . ": " . $res->body->error . "\n" . DEFAULT_TEXT;
+                echo RED_TEXT . "Coulnd't reply to " . $update->chat->id . ": " . $res->body->error . "\n" . DEFAULT_TEXT;
             }
         }
     }

src/Telegram/Bot.php

@@ -98,16 +98,17 @@ private function sendRequest(string $method, array|object|null $arguments = null
     /**
      * Retrieves updates from the Telegram API.
      *
-     * @param int|null $offset   The updates offset, only in UPDATES_FROM_WEBHOOK mode.
+     * @param bool $enableDefaultUpdates   Whether the default updates should be enabled or not.
+     * @param int|null $offset             The updates offset, only in UPDATES_FROM_WEBHOOK mode.
      *
-     * @return Updates|null      The retrieved updates, null on NO_UPDATES mode.
+     * @return Updates|null                The retrieved updates, null on NO_UPDATES mode.
      */
-    public function updates(?int $offset = null): ?Updates{
+    public function updates(bool $enableDefaultUpdates = false, ?int $offset = null): ?Updates{
         if($this->updatesMethod === self::UPDATES_FROM_GET_UPDATES){
 
             return new Updates($this->getUpdates([
-                "offset" => $offset + 1
-            ])->body);
+                "offset" => isset($offset) ? $offset + 1 : null
+            ])->body, $enableDefaultUpdates);
 
         }else if($this->updatesMethod === self::UPDATES_FROM_WEBHOOK){
 

src/Telegram/Updates.php

@@ -22,16 +22,43 @@ class Updates{
     /**
      * Updates constructor.
      *
-     * @param object|null $data The data object containing Telegram updates.
+     * @param object|null $data            The data object containing Telegram updates.
+     * @param bool $enableDefaultUpdates   Whether the default updates should be enabled or not.
      */
-    public function __construct(?object $data){
+    public function __construct(?object $data, bool $enableDefaultUpdates = false){
         if($data !== NULL){
 
             if(isset($data->result[0]))
                 $this->lastUpdateID = $data->result[array_key_last($data->result)]->update_id ?? null;
             else
                 $this->lastUpdateID = null;
 
+            if($enableDefaultUpdates){
+
+                foreach($data->result ?? [$data] as &$upd){
+                    $upd->user = $upd->message->from ??
+                        $upd->message->sender_chat ??
+                        $upd->edited_message->from ??
+                        $upd->inline_query->from ??
+                        $upd->chosen_inline_result->from ??
+                        $upd->callback_query->from ??
+                        $upd->shipping_query->from ??
+                        $upd->poll_answer->user ??
+                        $upd->chat_member->from ??
+                        $upd->chat_join_request->from ??
+                        null;
+
+                    $upd->chat = $upd->message->chat ??
+                        $upd->edited_message->chat ??
+                        $upd->channel_post->chat ??
+                        $upd->edited_channel_post->chat ??
+                        $upd->callback_query->message->chat ??
+                        $upd->my_chat_member->chat ??
+                        $upd->chat_member->chat ??
+                        $upd->chat_join_request->chat ??
+                        null;
+                }
+            }
 
             foreach($data as $key => $value)
                 $this->$key = $value;