Regenerate

Author: Doug Black

lib/rest/Preview.js

@@ -1,8 +1,6 @@
 'use strict';
 
 var _ = require('lodash');  /* jshint ignore:line */
-var Conversations = require(
-    './preview/Conversations');  /* jshint ignore:line */
 var Domain = require('../base/Domain');  /* jshint ignore:line */
 var Marketplace = require('./preview/Marketplace');  /* jshint ignore:line */
 var Sync = require('./preview/Sync');  /* jshint ignore:line */
@@ -18,9 +16,7 @@ var Wireless = require('./preview/Wireless');  /* jshint ignore:line */
  * @property {Twilio.Preview.Sync} sync - sync version
  * @property {Twilio.Preview.Wireless} wireless - wireless version
  * @property {Twilio.Preview.Marketplace} marketplace - marketplace version
- * @property {Twilio.Preview.Conversations} conversations - conversations version
- * @property {Twilio.Preview.Conversations.ServiceList} services -
- *          services resource
+ * @property {Twilio.Preview.Sync.ServiceList} services - services resource
  * @property {Twilio.Preview.Wireless.CommandList} commands - commands resource
  * @property {Twilio.Preview.Wireless.RatePlanList} ratePlans - ratePlans resource
  * @property {Twilio.Preview.Wireless.SimList} sims - sims resource
@@ -39,7 +35,6 @@ function Preview(twilio) {
   this._sync = undefined;
   this._wireless = undefined;
   this._marketplace = undefined;
-  this._conversations = undefined;
 }
 
 _.extend(Preview.prototype, Domain.prototype);
@@ -69,18 +64,10 @@ Object.defineProperty(Preview.prototype,
   }
 });
 
-Object.defineProperty(Preview.prototype,
-  'conversations', {
-  get: function() {
-    this._conversations = this._conversations || new Conversations(this);
-    return this._conversations;
-  }
-});
-
 Object.defineProperty(Preview.prototype,
   'services', {
   get: function() {
-    return this.conversations.services;
+    return this.sync.services;
   }
 });
 

lib/rest/accounts/v1/credential/publicKey.js

@@ -132,7 +132,7 @@ PublicKeyList = function PublicKeyList(version) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account.js

@@ -215,7 +215,7 @@ AccountList = function AccountList(version) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/address.js

@@ -223,7 +223,7 @@ AddressList = function AddressList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/address/dependentPhoneNumber.js

@@ -137,7 +137,7 @@ DependentPhoneNumberList = function DependentPhoneNumberList(version,
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/application.js

@@ -225,7 +225,7 @@ ApplicationList = function ApplicationList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/authorizedConnectApp.js

@@ -136,7 +136,7 @@ AuthorizedConnectAppList = function AuthorizedConnectAppList(version,
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/availablePhoneNumber.js

@@ -138,7 +138,7 @@ AvailablePhoneNumberCountryList = function
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/availablePhoneNumber/local.js

@@ -156,7 +156,7 @@ LocalList = function LocalList(version, accountSid, countryCode) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/availablePhoneNumber/mobile.js

@@ -156,7 +156,7 @@ MobileList = function MobileList(version, accountSid, countryCode) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/availablePhoneNumber/tollFree.js

@@ -156,7 +156,7 @@ TollFreeList = function TollFreeList(version, accountSid, countryCode) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/call.js

@@ -259,7 +259,7 @@ CallList = function CallList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/call/notification.js

@@ -143,7 +143,7 @@ NotificationList = function NotificationList(version, accountSid, callSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/call/recording.js

@@ -142,7 +142,7 @@ RecordingList = function RecordingList(version, accountSid, callSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/conference.js

@@ -145,7 +145,7 @@ ConferenceList = function ConferenceList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/conference/participant.js

@@ -65,21 +65,31 @@ ParticipantList = function ParticipantList(version, accountSid, conferenceSid) {
    * @param {number} [opts.timeout] - The timeout
    * @param {string} [opts.record] - The record
    * @param {string} [opts.muted] - The muted
-   * @param {participant.beep} [opts.beep] - The beep
+   * @param {string} [opts.beep] - The beep
    * @param {string} [opts.startConferenceOnEnter] - The start_conference_on_enter
    * @param {string} [opts.endConferenceOnExit] - The end_conference_on_exit
    * @param {string} [opts.waitUrl] - The wait_url
    * @param {string} [opts.waitMethod] - The wait_method
    * @param {string} [opts.earlyMedia] - The early_media
    * @param {number} [opts.maxParticipants] - The max_participants
-   * @param {participant.conference_record} [opts.conferenceRecord] -
-   *          The conference_record
+   * @param {string} [opts.conferenceRecord] - The conference_record
    * @param {string} [opts.conferenceTrim] - The conference_trim
    * @param {string} [opts.conferenceStatusCallback] - The conference_status_callback
    * @param {string} [opts.conferenceStatusCallbackMethod] -
    *          The conference_status_callback_method
    * @param {string|list} [opts.conferenceStatusCallbackEvent] -
    *          The conference_status_callback_event
+   * @param {string} [opts.recordingChannels] - The recording_channels
+   * @param {string} [opts.recordingStatusCallback] - The recording_status_callback
+   * @param {string} [opts.recordingStatusCallbackMethod] -
+   *          The recording_status_callback_method
+   * @param {string} [opts.sipAuthUsername] - The sip_auth_username
+   * @param {string} [opts.sipAuthPassword] - The sip_auth_password
+   * @param {string} [opts.region] - The region
+   * @param {string} [opts.conferenceRecordingStatusCallback] -
+   *          The conference_recording_status_callback
+   * @param {string} [opts.conferenceRecordingStatusCallbackMethod] -
+   *          The conference_recording_status_callback_method
    * @param {function} [callback] - Callback to handle processed record
    *
    * @returns {Promise} Resolves to processed ParticipantInstance
@@ -117,7 +127,15 @@ ParticipantList = function ParticipantList(version, accountSid, conferenceSid) {
       'ConferenceTrim': _.get(opts, 'conferenceTrim'),
       'ConferenceStatusCallback': _.get(opts, 'conferenceStatusCallback'),
       'ConferenceStatusCallbackMethod': _.get(opts, 'conferenceStatusCallbackMethod'),
-      'ConferenceStatusCallbackEvent': _.get(opts, 'conferenceStatusCallbackEvent')
+      'ConferenceStatusCallbackEvent': _.get(opts, 'conferenceStatusCallbackEvent'),
+      'RecordingChannels': _.get(opts, 'recordingChannels'),
+      'RecordingStatusCallback': _.get(opts, 'recordingStatusCallback'),
+      'RecordingStatusCallbackMethod': _.get(opts, 'recordingStatusCallbackMethod'),
+      'SipAuthUsername': _.get(opts, 'sipAuthUsername'),
+      'SipAuthPassword': _.get(opts, 'sipAuthPassword'),
+      'Region': _.get(opts, 'region'),
+      'ConferenceRecordingStatusCallback': _.get(opts, 'conferenceRecordingStatusCallback'),
+      'ConferenceRecordingStatusCallbackMethod': _.get(opts, 'conferenceRecordingStatusCallbackMethod')
     });
 
     var promise = this._version.create({
@@ -239,7 +257,7 @@ ParticipantList = function ParticipantList(version, accountSid, conferenceSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/connectApp.js

@@ -133,7 +133,7 @@ ConnectAppList = function ConnectAppList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber.js

@@ -150,7 +150,7 @@ IncomingPhoneNumberList = function IncomingPhoneNumberList(version, accountSid)
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn.js

@@ -140,7 +140,7 @@ AssignedAddOnList = function AssignedAddOnList(version, accountSid, resourceSid)
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber/assignedAddOn/assignedAddOnExtension.js

@@ -139,7 +139,7 @@ AssignedAddOnExtensionList = function AssignedAddOnExtensionList(version,
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber/local.js

@@ -137,7 +137,7 @@ LocalList = function LocalList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber/mobile.js

@@ -137,7 +137,7 @@ MobileList = function MobileList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/incomingPhoneNumber/tollFree.js

@@ -137,7 +137,7 @@ TollFreeList = function TollFreeList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/key.js

@@ -136,7 +136,7 @@ KeyList = function KeyList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/message.js

@@ -216,7 +216,7 @@ MessageList = function MessageList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/message/media.js

@@ -142,7 +142,7 @@ MediaList = function MediaList(version, accountSid, messageSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/notification.js

@@ -140,7 +140,7 @@ NotificationList = function NotificationList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/outgoingCallerId.js

@@ -137,7 +137,7 @@ OutgoingCallerIdList = function OutgoingCallerIdList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/queue.js

@@ -136,7 +136,7 @@ QueueList = function QueueList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/queue/member.js

@@ -137,7 +137,7 @@ MemberList = function MemberList(version, accountSid, queueSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/recording.js

@@ -142,7 +142,7 @@ RecordingList = function RecordingList(version, accountSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/recording/addOnResult.js

@@ -138,7 +138,7 @@ AddOnResultList = function AddOnResultList(version, accountSid, referenceSid) {
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/recording/addOnResult/payload.js

@@ -140,7 +140,7 @@ PayloadList = function PayloadList(version, accountSid, referenceSid,
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */

lib/rest/api/v2010/account/recording/transcription.js

@@ -138,7 +138,7 @@ TranscriptionList = function TranscriptionList(version, accountSid,
       promise.catch(onComplete);
     }
 
-    fetchNextPage(_.bind(this.page, this, _.merge(opts, limits)));
+    fetchNextPage(_.bind(this.page, this, opts));
   };
 
   /* jshint ignore:start */