fix #1

felixdorn · May 26, 2021 · d8e80d6 · d8e80d6
1 parent 52d5551
commit d8e80d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/Rule.php b/src/Rule.php
@@ -30,15 +30,13 @@ protected static function ensureHttpClientIsLoaded(): TwitterClient
 
     public static function all(): array
     {
-        $rules = static::ensureHttpClientIsLoaded()
-            ->request('GET', 'https://api.twitter.com/2/tweets/search/stream/rules');
-
+        $rules = static::ensureHttpClientIsLoaded()->request('GET', 'https://api.twitter.com/2/tweets/search/stream/rules');
         return array_map(static function ($rawRule) {
             $rule = new self($rawRule['value'], $rawRule['tag']);
             $rule->withId($rawRule['id']);
 
             return $rule;
-        }, $rules['data']);
+        }, $rules['data'] ?? []);
     }
 
     public function withId(string $id): static

diff --git a/src/RuleBuilder.php b/src/RuleBuilder.php
@@ -373,6 +373,7 @@ public function raw(string $expression): static
 
     public function save(string $tag = null): Rule
     {
-        return Rule::create($compiled = $this->compile(), $tag ?? $compiled);
+        $compiled = $this->compile();
+        return Rule::create($compiled, $tag ?? $compiled);
     }
 }
diff --git a/src/TwitterStream.php b/src/TwitterStream.php
@@ -2,6 +2,7 @@
 
 namespace RWC\TwitterStream;
 
+use Error;
 use Generator;
 use GuzzleHttp\Client;
 use Psr\Http\Message\StreamInterface;
@@ -38,20 +39,14 @@ public function filteredTweets(Sets $sets = null): Generator
         };
 
         while ($shouldKeepListening()) {
-            $char  = $this->streamConnection->read(2);
+            $char  = $this->streamConnection->read(1) ;
             $tweet = $char;
 
-            while ($char !== "\r\n") {
-                $char = $this->streamConnection->read(2);
+            while ($char !== "\n" && $tweet[-1] !== "\r") {
+                $char = $this->streamConnection->read(1);
                 $tweet .= $char;
             }
 
-            $tweet = trim($tweet);
-
-            if (empty($tweet)) {
-                continue;
-            }
-
             $decoded = json_decode($tweet, true);
 
             if ($decoded) {
@@ -65,13 +60,19 @@ protected function connectToFilteredStream(Sets $sets = null): StreamInterface
         // Could use the null object pattern
         $sets ??= new Sets();
 
-        return $this->httpClient->stream('GET', 'https://api.twitter.com/2/tweets/search/stream?' . $sets)
+        return $this->httpClient
+            ->stream('GET', 'https://api.twitter.com/2/tweets/search/stream?' . $sets)
             ->getBody();
     }
 
     public function __destruct()
     {
-        $this->stopListening();
+        // If the connection was never initialized, this throws an error. 
+        try {
+            $this->stopListening();        
+        } catch (Error) {
+
+        }
     }
 
     public function stopListening(): self