Исправлено получение данных об отправителе для входящего сообщения

Author: amoCRM-Schizo

src/Foundation/Core/Entities/Messages/MessageFields.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Hopex\VkSdk\Exceptions\Api\ApiException;
+use Hopex\VkSdk\Facades\VkApi;
 use Hopex\VkSdk\Foundation\Core\Entities\Users\UserProfileFields;
 use Hopex\VkSdk\Foundation\Core\Entities\Users\UserRequestFields;
 use Illuminate\Support\Collection;
@@ -52,21 +53,19 @@ public function getDate(): Carbon
 
     /**
      * @param string $token
+     * @param UserRequestFields $userRequestFields
      * @param array $userProfileFields
      * @return UserProfileFields
      * @throws ApiException
      * @throws Throwable
      */
-    public function getSender(string $token, UserRequestFields $userRequestFields): UserProfileFields
+    public function getSender(string $token, UserRequestFields $userRequestFields, array $userProfileFields = []): UserProfileFields
     {
-        return new UserProfileFields([]);
-//        return new UserProfileFields(collect(VkApi::user($token)
-//            ->get((new UserRequestFields())
-//                ->setUserIds([
-//                    $this->getSenderId()
-//                ])
-//                ->setProfileFields($userRequestFields->)
-//            )->first()));
+        return new UserProfileFields(
+            collect(VkApi::user($token)
+                ->get($userRequestFields->setProfileFields($userProfileFields))
+                ->first())
+        );
     }
 
     /**

src/Foundation/Core/Server/EventsHandler.php

@@ -3,6 +3,7 @@
 namespace Hopex\VkSdk\Foundation\Core\Server;
 
 use Hopex\VkSdk\Contracts\ServerEventsContract;
+use Hopex\VkSdk\Exceptions\Api\ApiException;
 use Hopex\VkSdk\Exceptions\SourceQuery\AuthenticationSourceQueryException;
 use Hopex\VkSdk\Exceptions\SourceQuery\InvalidArgumentSourceQueryException;
 use Hopex\VkSdk\Exceptions\SourceQuery\InvalidPacketSourceQueryException;
@@ -46,7 +47,10 @@ public function __construct()
     }
 
     /**
-     * @inheritDoc
+     * @param Message $message
+     * @return void
+     * @throws ApiException
+     * @throws Throwable
      */
     public function server_message_new(Message $message): void
     {
@@ -60,7 +64,10 @@ public function server_message_new(Message $message): void
     }
 
     /**
-     * @inheritDoc
+     * @param Mute $mute
+     * @return void
+     * @throws ApiException
+     * @throws Throwable
      */
     public function server_mute_new(Mute $mute): void
     {
@@ -78,7 +85,10 @@ public function server_mute_new(Mute $mute): void
     }
 
     /**
-     * @inheritDoc
+     * @param Ban $ban
+     * @return void
+     * @throws ApiException
+     * @throws Throwable
      */
     public function server_ban_new(Ban $ban): void
     {
@@ -140,26 +150,15 @@ public function requestStatistics(int $groupId): void
     public function messageSendToServer(int $groupId, int $peerId, string $name, string $text): void
     {
         $this->logger->info("ServerMessage \"$text\" from \"$name\" has been send to server by group $groupId");
-//        $this->sourceQueryCall($groupId, 'sm_chat_say "' . $name . '" "' . $text . '"');
         $this->sourceQueryCall($groupId, "sm_chat_say \"$name\" \"$text\"");
-
-        VkApi::message(Session::get('group_token'))
-            ->send((new MessageRequestFields())
-                ->setPeerId($peerId)
-                ->setDisableMentions(true)
-                ->setDontParseLinks(true)
-                ->setMessage(str_replace([
-                    '%PLAYER%',
-                    '%MESSAGE%'
-                ], [
-                    $name,
-                    $text
-                ], Note::get('server.messages.to-server')))
-            );
     }
 
     /**
-     * @inheritDoc
+     * @param ServerEvent $event
+     * @param string $message
+     * @return void
+     * @throws Throwable
+     * @throws ApiException
      */
     public function messageSendToVk(ServerEvent $event, string $message): void
     {