Merge pull request #333 from jacklul/fixes

Fixes for #331 and #332

Author: noplanman

src/DB.php

@@ -720,7 +720,9 @@ public static function insertMessageRequest(Message $message)
         self::insertChat($chat, $date, $migrate_to_chat_id);
 
         //Insert user and the relation with the chat
-        self::insertUser($from, $date, $chat);
+        if (is_object($from)) {
+            self::insertUser($from, $date, $chat);
+        }
 
         //Insert the forwarded message user in users table
         if ($forward_from instanceof User) {
@@ -769,7 +771,12 @@ public static function insertMessageRequest(Message $message)
             ');
 
             $message_id = $message->getMessageId();
-            $from_id    = $from->getId();
+
+            if (is_object($from)) {
+                $from_id = $from->getId();
+            } else {
+                $from_id = null;
+            }
 
             $reply_to_message    = $message->getReplyToMessage();
             $reply_to_message_id = null;
@@ -871,7 +878,9 @@ public static function insertEditedMessageRequest(Message $edited_message)
         self::insertChat($chat, $edit_date);
 
         //Insert user and the relation with the chat
-        self::insertUser($from, $edit_date, $chat);
+        if (is_object($from)) {
+            self::insertUser($from, $edit_date, $chat);
+        }
 
         try {
             $sth = self::$pdo->prepare('
@@ -882,7 +891,12 @@ public static function insertEditedMessageRequest(Message $edited_message)
             ');
 
             $message_id = $edited_message->getMessageId();
-            $from_id    = $from->getId();
+
+            if (is_object($from)) {
+                $from_id = $from->getId();
+            } else {
+                $from_id = null;
+            }
 
             $text    = $edited_message->getText();
             $caption = $edited_message->getCaption();

src/Entities/ServerResponse.php

@@ -101,8 +101,8 @@ private function createResultObject($result, $bot_name)
         $result_object_types = [
             'total_count' => 'UserProfilePhotos', //Response from getUserProfilePhotos
             'file_id'     => 'File',              //Response from getFile
+            'title'       => 'Chat',              //Response from getChat
             'username'    => 'User',              //Response from getMe
-            'id'          => 'Chat',              //Response from getChat
             'user'        => 'ChatMember',        //Response from getChatMember
             'url'         => 'WebhookInfo',       //Response from getWebhookInfo
         ];