Backed off a bunch of voice options, and allow Conversations to have an eventUrl

Author: dragonmantank

src/Voice/Client.php

@@ -58,8 +58,13 @@ public function createOutboundCall(OutboundCall $call) : Event
             $json['machine_detection'] = $call->getMachineDetection();
         }
 
-        $json['length_timer'] = (string) $call->getLengthTimer();
-        $json['ringing_timer'] = (string) $call->getRingingTimer();
+        if (!is_null($call->getLengthTimer())) {
+            $json['length_timer'] = (string) $call->getLengthTimer();
+        }
+
+        if (!is_null($call->getRingingTimer())) {
+            $json['ringing_timer'] = (string) $call->getRingingTimer();
+        }
 
         $event = $this->api->create($json);
         $event['to'] = $call->getTo()->getId();
@@ -117,12 +122,10 @@ public function playDTMF(string $callId, string $digits) : array
      */
     public function playTTS(string $callId, Talk $action) : array
     {
-        $response = $this->api->update($callId . '/talk', [
-            'text' => $action->getText(),
-            'voice_name' => $action->getVoiceName(),
-            'loop' => (string) $action->getLoop(),
-            'level' => (string) $action->getLevel(),
-        ]);
+        $payload = $action->toNCCOArray();
+        unset($payload['action']);
+
+        $response = $this->api->update($callId . '/talk', $payload);
 
         return $response;
     }

src/Voice/NCCO/Action/Connect.php

@@ -31,17 +31,17 @@ class Connect implements ActionInterface
     /**
      * @var int
      */
-    protected $timeout = 60;
+    protected $timeout;
 
     /**
      * @var int
      */
-    protected $limit = 7200;
+    protected $limit;
 
     /**
      * @var string
      */
-    protected $machineDetection = 'continue';
+    protected $machineDetection;
 
     /**
      * @var ?Webhook
@@ -75,11 +75,20 @@ public function toNCCOArray(): array
         $data = [
             'action' => 'connect',
             'endpoint' => [$this->endpoint->toArray()],
-            'timeout' => $this->getTimeout(),
-            'limit' => $this->getLimit(),
-            'machineDetection' => $this->getMachineDetection(),
         ];
 
+        if ($this->getTimeout()) {
+            $data['timeout'] = $this->getTimeout();
+        }
+
+        if ($this->getLimit()) {
+            $data['limit'] = $this->getLimit();
+        }
+
+        if ($this->getMachineDetection()) {
+            $data['machineDetection'] = $this->getMachineDetection();
+        }
+
         $from = $this->getFrom();
         if ($from) {
             $data['from'] = $from;
@@ -130,7 +139,7 @@ public function setEventType(string $eventType) : self
         return $this;
     }
 
-    public function getTimeout() : int
+    public function getTimeout() : ?int
     {
         return $this->timeout;
     }
@@ -141,7 +150,7 @@ public function setTimeout(int $timeout) : self
         return $this;
     }
 
-    public function getLimit() : int
+    public function getLimit() : ?int
     {
         return $this->limit;
     }
@@ -152,7 +161,7 @@ public function setLimit(int $limit) : self
         return $this;
     }
 
-    public function getMachineDetection() : string
+    public function getMachineDetection() : ?string
     {
         return $this->machineDetection;
     }

src/Voice/NCCO/Action/Conversation.php

@@ -3,6 +3,8 @@
 
 namespace Nexmo\Voice\NCCO\Action;
 
+use Nexmo\Voice\Webhook;
+
 class Conversation implements ActionInterface
 {
     /**
@@ -18,17 +20,17 @@ class Conversation implements ActionInterface
     /**
      * @var bool
      */
-    protected $startOnEnter = true;
+    protected $startOnEnter;
 
     /**
      * @var bool
      */
-    protected $endOnExit = false;
+    protected $endOnExit;
 
     /**
      * @var bool
      */
-    protected $record = false;
+    protected $record;
 
     /**
      * @var ?array<string>
@@ -40,6 +42,11 @@ class Conversation implements ActionInterface
      */
     protected $canHear;
 
+    /**
+     * @var Webhook
+     */
+    protected $eventWebhook;
+
     public function __construct(string $name)
     {
         $this->name = $name;
@@ -61,7 +68,7 @@ public function setMusicOnHoldUrl(string $musicOnHoldUrl) : self
         return $this;
     }
 
-    public function getStartOnEnter() : bool
+    public function getStartOnEnter() : ?bool
     {
         return $this->startOnEnter;
     }
@@ -72,7 +79,7 @@ public function setStartOnEnter(bool $startOnEnter) : self
         return $this;
     }
 
-    public function getEndOnExit() : bool
+    public function getEndOnExit() : ?bool
     {
         return $this->endOnExit;
     }
@@ -83,7 +90,7 @@ public function setEndOnExit(bool $endOnExit) : self
         return $this;
     }
 
-    public function getRecord() : bool
+    public function getRecord() : ?bool
     {
         return $this->record;
     }
@@ -183,6 +190,20 @@ public static function factory(string $name, array $data): Conversation
         if (array_key_exists('canHear', $data)) {
             $talk->setCanHear($data['canHear']);
         }
+
+        if (array_key_exists('eventUrl', $data)) {
+            if (is_array($data['eventUrl'])) {
+                $data['eventUrl'] = $data['eventUrl'][0];
+            }
+
+            if (array_key_exists('eventMethod', $data)) {
+                $webhook = new Webhook($data['eventUrl'], $data['eventMethod']);
+            } else {
+                $webhook = new Webhook($data['eventUrl']);
+            }
+
+            $talk->setEventWebhook($webhook);
+        }
 
         return $talk;
     }
@@ -203,11 +224,20 @@ public function toNCCOArray() : array
         $data = [
             'action' => 'conversation',
             'name' => $this->getName(),
-            'startOnEnter' => $this->getStartOnEnter() ? 'true' : 'false',
-            'endOnExit' => $this->getEndOnExit() ? 'true' : 'false',
-            'record' => $this->getRecord() ? 'true' : 'false',
         ];
 
+        if (!is_null($this->getStartOnEnter())) {
+            $data['startOnEnter'] = $this->getStartOnEnter() ? 'true' : 'false';
+        }
+
+        if (!is_null($this->getEndOnExit())) {
+            $data['endOnExit'] = $this->getEndOnExit() ? 'true' : 'false';
+        }
+
+        if (!is_null($this->getRecord())) {
+            $data['record'] = $this->getRecord() ? 'true' : 'false';
+        }
+
         $music = $this->getMusicOnHoldUrl();
         if ($music) {
             $data['musicOnHoldUrl'] = [$music];
@@ -223,6 +253,22 @@ public function toNCCOArray() : array
             $data['canHear'] = $canHear;
         }
 
+        if ($this->getEventWebhook()) {
+            $data['eventUrl'] = [$this->getEventWebhook()->getUrl()];
+            $data['eventMethod'] = $this->getEventWebhook()->getMethod();
+        }
+
         return $data;
     }
+
+    public function getEventWebhook() : ?Webhook
+    {
+        return $this->eventWebhook;
+    }
+
+    public function setEventWebhook(Webhook $eventWebhook)
+    {
+        $this->eventWebhook = $eventWebhook;
+        return $this;
+    }
 }