Merge pull request #43 from clue-labs/buffers

Fix writeBufferInput() to properly use BufferInfo
clue · Jun 4, 2018 · 793d351 · 793d351
2 parents 6fa93ac + 216352d
commit 793d351
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/examples/11-debug.php b/examples/11-debug.php
@@ -3,6 +3,7 @@
 use Clue\React\Quassel\Factory;
 use Clue\React\Quassel\Client;
 use Clue\React\Quassel\Io\Protocol;
+use Clue\React\Quassel\Models\BufferInfo;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -90,9 +91,10 @@
             }
 
             foreach ($message['SessionState']['BufferInfos'] as $buffer) {
-                if ($buffer['type'] === 2) { // type == 4 for user
-                    var_dump('requesting IrcChannel for ' . $buffer['name']);
-                    $client->writeInitRequest('IrcChannel', $buffer['network'] . '/' . $buffer['id']);
+                assert($buffer instanceof BufferInfo);
+                if ($buffer->getType() === BufferInfo::TYPE_CHANNEL) {
+                    var_dump('requesting IrcChannel for ' . $buffer->getName());
+                    $client->writeInitRequest('IrcChannel', $buffer->getNetworkId() . '/' . $buffer->getId());
                 }
             }
 

diff --git a/src/Io/Protocol.php b/src/Io/Protocol.php
@@ -90,12 +90,12 @@ public function __construct()
         );
 
         $this->userTypeWriter = array(
-            'BufferInfo' => function ($data, Writer $writer) {
-                $writer->writeUInt($data['id']);
-                $writer->writeUInt($data['network']);
-                $writer->writeUShort($data['type']);
-                $writer->writeUInt($data['group']);
-                $writer->writeQByteArray($data['name']);
+            'BufferInfo' => function (BufferInfo $buffer, Writer $writer) {
+                $writer->writeUInt($buffer->getId());
+                $writer->writeUInt($buffer->getNetworkId());
+                $writer->writeUShort($buffer->getType());
+                $writer->writeUInt($buffer->getGroupId());
+                $writer->writeQByteArray($buffer->getName());
             },
             'BufferId' => function ($data, Writer $writer) {
                 $writer->writeUInt($data);

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -1,7 +1,9 @@
 <?php
 
 use Clue\React\Quassel\Client;
+use Clue\React\Quassel\Io\DatastreamProtocol;
 use Clue\React\Quassel\Io\Protocol;
+use Clue\React\Quassel\Models\BufferInfo;
 use React\Stream\ThroughStream;
 
 class ClientTest extends TestCase
@@ -193,6 +195,18 @@ public function testWriteCoreSetupData()
         $this->client->writeCoreSetupData('user', 'pass', 'PQSql', array('password' => 'test'));
     }
 
+    public function testWriteBufferInputWritesToStreamOnce()
+    {
+        $this->protocol = new DatastreamProtocol();
+        $this->client = new Client($this->stream, $this->protocol, $this->splitter);
+
+        $this->stream->expects($this->once())->method('write');
+
+        $bufferInfo = new BufferInfo(1, 2, 3, 4, '#test');
+
+        $this->client->writeBufferInput($bufferInfo, 'Hello!');
+    }
+
     public function testWriteHeartBeatReply()
     {
         $dt = new \DateTime();