Fix buttons with screens

he110 · Jan 16, 2020 · c59c83e · c59c83e
1 parent 94014ad
commit c59c83e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Telegram/Messenger.php b/src/Telegram/Messenger.php
@@ -170,12 +170,15 @@ public function sendScreen(MessengerScreen $screen): bool
         $buttons = array();
         $current = null;
         $result = true;
-
         foreach ($screen->fixItemsOrder() as $index => $item) {
             if ($item instanceof Button)
                 $buttons[] = $item;
-            else {
-                list($current, $result, $buttons) = $this->sendScreenHelper($current, $item, $result, $buttons);
+        }
+        foreach ($screen->fixItemsOrder() as $index => $item) {
+            if (!($item instanceof Button)) {
+                list($current, $result, $btns) = $this->sendScreenHelper($current, $item, $result, $buttons);
+                $buttons = array_merge($buttons, $btns);
+                $buttons = array_unique($buttons);
             }
         }
         $this->workWithScreenItem($current, $buttons);
@@ -311,6 +314,9 @@ private function buttonToArray(Button $button): array
      * @param $result
      * @param $buttons
      * @return array
+     * @throws AccessTokenException
+     * @throws AttachmentNotFoundException
+     * @throws TargetUserException
      */
     private function sendScreenHelper($current, $item, $result, $buttons): array
     {