Only fetch message items when set on query

Author: stevebauman

src/MessageQuery.php

@@ -261,21 +261,37 @@ protected function fetch(Collection $messages): array
             'desc' => $messages->sortDesc(SORT_NUMERIC),
         };
 
-        $uids = $messages->forPage($this->page, $this->limit)
-            ->values()
-            ->all();
+        $uids = $messages->forPage($this->page, $this->limit)->values();
 
-        $response = $this->connection()->fetch(array_filter([
-            $this->fetchFlags ? 'FLAGS' : null,
-            $this->fetchBody ? $this->fetchAsUnread
+        $fetch = [];
+
+        if ($this->fetchFlags) {
+            $fetch[] = 'FLAGS';
+        }
+
+        if ($this->fetchBody) {
+            $fetch[] = $this->fetchAsUnread
                 ? 'BODY.PEEK[TEXT]'
-                : 'BODY[TEXT]' : null,
-            $this->fetchHeaders ? $this->fetchAsUnread
+                : 'BODY[TEXT]';
+        }
+
+        if ($this->fetchHeaders) {
+            $fetch[] = $this->fetchAsUnread
                 ? 'BODY.PEEK[HEADER]'
-                : 'BODY[HEADER]' : null,
-        ]), $uids);
+                : 'BODY[HEADER]';
+        }
+
+        if (empty($fetch)) {
+            return $uids->mapWithKeys(fn (string|int $uid) => [
+                $uid => [
+                    'flags' => [],
+                    'headers' => '',
+                    'contents' => '',
+                ],
+            ])->all();
+        }
 
-        return $response->mapWithKeys(function (UntaggedResponse $response) {
+        return $this->connection()->fetch($fetch, $uids->all())->mapWithKeys(function (UntaggedResponse $response) {
             $data = $response->tokenAt(3);
 
             $uid = $data->lookup('UID')->value;