Merge pull request #17 from WizardLoop/dev

3.0.4 -Peer filtering is now handled outside of broadcast execution

Author: WizardLoop

CHANGELOG.md

@@ -148,3 +148,12 @@ Added functionality to send initial status messages when gathering peers and sta
 ### Fixed:
 
 * Fix getDataDir() to handle uninitialized $dataDir
+
+---
+
+## [3.0.4] - 2026-01-13
+
+### Added & Fixed:
+
+* Extracted peer filtering from broadcast execution
+* Reduced unnecessary processing during broadcasts

README.md

@@ -102,14 +102,18 @@ use BroadcastTool\BroadcastManager;
 
 $manager = new BroadcastManager($api);
 
-$manager->broadcastWithProgress(
-    allUsers: $users,
-    messages: $messages,
-    chatId: $adminChatId,
-    filterType: 'users',
-    pin: true,
-    concurrency: 25
-);
+$manager->broadcastWithProgress($users, $messages, $adminChatId, true, 20);
+```
+
+---
+
+## Filer Peers
+
+```php
+$filterSub = $manager->filterPeers($users, 'users');
+$targets = $filterSub['targets']; # array
+$failed = $filterSub['failed']; # int
+$total = $filterSub['total']; # int
 ```
 
 ---
@@ -142,23 +146,15 @@ _default is: __DIR__ . '/../data'_
 ## 🧹 Delete Last Broadcast
 
 ```php
-$manager->deleteLastBroadcastForAll(
-    allUsers: $users,
-    chatId: $adminChatId,
-    concurrency: 20
-);
+$manager->deleteLastBroadcastForAll($users, $adminChatId, 20);
 ```
 
 ---
 
 ## ♻️ Delete All Broadcast
 
 ```php
-$manager->deleteAllBroadcastsForAll(
-    allUsers: $users,
-    chatId: $adminChatId,
-    concurrency: 20
-);
+$manager->deleteAllBroadcastsForAll($users, $adminChatId, 20);
 ```
 
 ---

src/BroadcastManager.php

@@ -54,7 +54,6 @@ public function broadcastWithProgress(
         array $allUsers,
         array $messages,
         $chatId,
-        string $filterType = 'users',
         bool $pin = false,
         int $concurrency = 20
     ): array {
@@ -68,36 +67,12 @@ public function broadcastWithProgress(
     ]);
     $statusId = $api->extractMessageId($status);
 
-    /* ===== FILTER TARGETS ===== */
-    $allowedTypes = [
-        'all'      => ['user','bot','chat','supergroup','channel'],
-        'users'    => ['user','bot'],
-        'groups'   => ['chat','supergroup'],
-        'channels' => ['channel'],
-    ];
-
-    $targets = [];
-    $failedCount = 0;
-
-    foreach ($allUsers as $peer) {
-        try {
-            $info = $api->getInfo($peer);
-            $type = $info['type'] ?? 'user';
-            if (in_array($type, $allowedTypes[$filterType] ?? ['user','bot'], true)) {
-                $targets[] = (string)$peer;
-            }
-        } catch (\Throwable) {
-            if ($filterType === 'all') $targets[] = (string)$peer;
-            else $failedCount++;
-        }
-    }
-
-    $total = count($targets);
+    $total = count($allUsers);
 
     /* ===== STATE ===== */
     $state = [
         'sent' => 0,
-        'failed' => $failedCount,
+        'failed' => 0,
         'queue' => new \SplQueue(),
         'inFlight' => [],
         'lastMessageIds' => [],
@@ -110,7 +85,7 @@ public function broadcastWithProgress(
 /* ===== SET CURRENT BROADCAST STATE FOR PAUSE/CANCEL ===== */
     $this->currentBroadcastState = &$state;
 
-    foreach ($targets as $peer) {
+    foreach ($allUsers as $peer) {
         $state['queue']->enqueue([
             'peer' => $peer,
             'attempts' => 0,
@@ -711,7 +686,6 @@ public function deleteAllBroadcastsForAll(
     public function unpinAllMessagesForAll(
         array $allUsers,
         $chatId,
-        string $filterType = 'users',
         int $concurrency = 20
     ): array {
     $api = $this->api;
@@ -724,37 +698,12 @@ public function unpinAllMessagesForAll(
     ]);
     $statusId = $api->extractMessageId($status);
 
-    /* ===== FILTER TARGETS ===== */
-    $allowedTypesByFilter = [
-        'all' => ['user','bot','chat','supergroup','channel'],
-        'users' => ['user','bot'],
-        'groups' => ['chat','supergroup'],
-        'channels' => ['channel'],
-    ];
-
-    $targets = [];
-    $failedCount = 0;
-
-    foreach ($allUsers as $peer) {
-        try {
-            $info = $api->getInfo($peer);
-            $type = $info['type'] ?? 'user';
-
-            if (in_array($type, $allowedTypesByFilter[$filterType] ?? ['user','bot'], true)) {
-                $targets[] = (string)$peer;
-            }
-        } catch (\Throwable) {
-            if ($filterType === 'all') $targets[] = (string)$peer;
-            else $failedCount++;
-        }
-    }
-
-    $total = count($targets);
+    $total = count($allUsers);
 
     /* ===== STATE ===== */
     $state = [
         'unpin' => 0,
-        'failed' => $failedCount,
+        'failed' => 0,
         'flood' => 0,
         'queue' => new \SplQueue(),
         'inFlight' => [],
@@ -763,7 +712,7 @@ public function unpinAllMessagesForAll(
         'startedAt' => microtime(true),
     ];
 
-    foreach ($targets as $peer) {
+    foreach ($allUsers as $peer) {
         $state['queue']->enqueue([
             'peer' => $peer,
             'attempts' => 0,
@@ -953,6 +902,7 @@ public function resume(): void {
     public function cancel(): void {
         if ($this->currentBroadcastState) {
             $this->currentBroadcastState['cancel'] = true;
+            $this->currentBroadcastState['inFlight'] = [];
         }
     }
 
@@ -1034,4 +984,44 @@ public function lastBroadcastData(): string|false {
 return \Amp\File\read($path);
     }
 
+    /**
+     * Filter peers
+     */
+    public function filterPeers(
+	    array $allUsers,
+        string $filterType = 'users'
+	): array {
+
+    $api = $this->api;
+
+    $allowedTypes = [
+        'all'      => ['user','chat','supergroup','channel'],
+        'users'    => ['user'],
+        'groups'   => ['chat','supergroup'],
+        'channels' => ['channel'],
+    ];
+
+    $targets = [];
+    $failedCount = 0;
+
+    foreach ($allUsers as $peer) {
+        try {
+            $info = $api->getInfo($peer);
+            $type = $info['type'] ?? 'user';
+            if (in_array($type, $allowedTypes[$filterType] ?? ['user'], true)) {
+                $targets[] = (string)$peer;
+            }
+        } catch (\Throwable) {
+            if ($filterType === 'all') $targets[] = (string)$peer;
+            else $failedCount++;
+        }
+    }
+
+    return [
+        'targets' => $targets,
+        'failed'  => $failedCount,
+        'total'   => count($targets)
+    ];
+
+    }
 }