google-api-client 0.39.2 → 0.39.3

data/generated/google/apis/gmail_v1/service.rb

@@ -22,8 +22,7 @@ module Google
     module GmailV1
       # Gmail API
       #
-      # The Gmail API lets you view and manage Gmail mailbox data like
-      #  threads, messages, and labels.
+      # Access Gmail mailboxes including sending user email.
       #
       # @example
       #    require 'google/apis/gmail_v1'
@@ -39,24 +38,30 @@ module Google
         attr_accessor :key
 
         # @return [String]
-        #  Available to use for quota purposes for server-side applications. Can be any
-        #  arbitrary string assigned to a user, but should not exceed 40 characters.
+        #  An opaque string that represents a user for quota purposes. Must not exceed 40
+        #  characters.
         attr_accessor :quota_user
 
+        # @return [String]
+        #  Deprecated. Please use quotaUser instead.
+        attr_accessor :user_ip
+
         def initialize
-          super('https://www.googleapis.com/', '')
-          @batch_path = 'batch'
+          super('https://www.googleapis.com/', 'gmail/v1/users/')
+          @batch_path = 'batch/gmail/v1'
         end
         
         # Gets the current user's Gmail profile.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -69,25 +74,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_profile(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/profile', options)
+        def get_user_profile(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/profile', options)
           command.response_representation = Google::Apis::GmailV1::Profile::Representation
           command.response_class = Google::Apis::GmailV1::Profile
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Stop receiving push notifications for the given user mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -100,24 +108,27 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def stop_user(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/stop', options)
+        def stop_user(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/stop', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Set up or update a push notification watch on the given user mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::WatchRequest] watch_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -130,8 +141,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def watch_user(user_id, watch_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/watch', options)
+        def watch_user(user_id, watch_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/watch', options)
           command.request_representation = Google::Apis::GmailV1::WatchRequest::Representation
           command.request_object = watch_request_object
           command.response_representation = Google::Apis::GmailV1::WatchResponse::Representation
@@ -139,19 +150,22 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a new draft with the <code>DRAFT</code> label.
+        # Creates a new draft with the DRAFT label.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Draft] draft_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -168,11 +182,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_draft(user_id, draft_object = nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def create_user_draft(user_id, draft_object = nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:post, 'gmail/v1/users/{userId}/drafts', options)
+            command = make_simple_command(:post, '{userId}/drafts', options)
           else
-            command = make_upload_command(:post, 'gmail/v1/users/{userId}/drafts', options)
+            command = make_upload_command(:post, '{userId}/drafts', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -183,21 +197,24 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Immediately and permanently deletes the specified draft.
-        # Does not simply trash it.
+        # Immediately and permanently deletes the specified draft. Does not simply trash
+        # it.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the draft to delete.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -210,19 +227,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_draft(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/drafts/{id}', options)
+        def delete_user_draft(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/drafts/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified draft.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the draft to retrieve.
         # @param [String] format
@@ -230,8 +248,10 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -244,8 +264,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_draft(user_id, id, format: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/drafts/{id}', options)
+        def get_user_draft(user_id, id, format: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/drafts/{id}', options)
           command.response_representation = Google::Apis::GmailV1::Draft::Representation
           command.response_class = Google::Apis::GmailV1::Draft
           command.params['userId'] = user_id unless user_id.nil?
@@ -253,30 +273,31 @@ module Google
           command.query['format'] = format unless format.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the drafts in the user's mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Boolean] include_spam_trash
-        #   Include drafts from <code>SPAM</code> and <code>TRASH</code>
-        #   in the results.
+        #   Include drafts from SPAM and TRASH in the results.
         # @param [Fixnum] max_results
         #   Maximum number of drafts to return.
         # @param [String] page_token
         #   Page token to retrieve a specific page of results in the list.
         # @param [String] q
         #   Only return draft messages matching the specified query. Supports the same
-        #   query format as the Gmail search box. For example,
-        #   <code>"from:someuser@example.com rfc822msgid:<somemsgid@example.com>
-        #   is:unread"</code>.
+        #   query format as the Gmail search box. For example, "from:someuser@example.com
+        #   rfc822msgid: is:unread".
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -289,8 +310,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_drafts(user_id, include_spam_trash: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/drafts', options)
+        def list_user_drafts(user_id, include_spam_trash: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/drafts', options)
           command.response_representation = Google::Apis::GmailV1::ListDraftsResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListDraftsResponse
           command.params['userId'] = user_id unless user_id.nil?
@@ -300,20 +321,23 @@ module Google
           command.query['q'] = q unless q.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sends the specified, existing draft to the recipients in the
-        # <code>To</code>, <code>Cc</code>, and <code>Bcc</code> headers.
+        # Sends the specified, existing draft to the recipients in the To, Cc, and Bcc
+        # headers.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Draft] draft_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -330,11 +354,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def send_user_draft(user_id, draft_object = nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def send_user_draft(user_id, draft_object = nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:post, 'gmail/v1/users/{userId}/drafts/send', options)
+            command = make_simple_command(:post, '{userId}/drafts/send', options)
           else
-            command = make_upload_command(:post, 'gmail/v1/users/{userId}/drafts/send', options)
+            command = make_upload_command(:post, '{userId}/drafts/send', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -345,21 +369,24 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Replaces a draft's content.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the draft to update.
         # @param [Google::Apis::GmailV1::Draft] draft_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -376,11 +403,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_draft(user_id, id, draft_object = nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def update_user_draft(user_id, id, draft_object = nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:put, 'gmail/v1/users/{userId}/drafts/{id}', options)
+            command = make_simple_command(:put, '{userId}/drafts/{id}', options)
           else
-            command = make_upload_command(:put, 'gmail/v1/users/{userId}/drafts/{id}', options)
+            command = make_upload_command(:put, '{userId}/drafts/{id}', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -392,14 +419,15 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the history of all changes to the given mailbox. History results are
-        # returned in chronological order (increasing <code>historyId</code>).
+        # returned in chronological order (increasing historyId).
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Array<String>, String] history_types
         #   History types to be returned by the function
         # @param [String] label_id
@@ -409,24 +437,23 @@ module Google
         # @param [String] page_token
         #   Page token to retrieve a specific page of results in the list.
         # @param [Fixnum] start_history_id
-        #   Required. Returns history records after the specified
-        #   <code>startHistoryId</code>. The supplied <code>startHistoryId</code>
-        #   should be obtained from the <code>historyId</code> of a message, thread, or
-        #   previous <code>list</code> response. History IDs increase
-        #   chronologically but are not contiguous with random gaps in between valid
-        #   IDs. Supplying an invalid or out of date <code>startHistoryId</code>
-        #   typically returns an <code>HTTP 404</code> error code. A
-        #   <code>historyId</code> is typically valid for at least a week, but in some
-        #   rare circumstances may be valid for only a few hours. If you receive an
-        #   <code>HTTP 404</code> error response, your  application should perform a
-        #   full sync. If you receive no <code>nextPageToken</code> in the response,
-        #   there are no updates to retrieve and you can store the returned
-        #   <code>historyId</code> for a future request.
+        #   Required. Returns history records after the specified startHistoryId. The
+        #   supplied startHistoryId should be obtained from the historyId of a message,
+        #   thread, or previous list response. History IDs increase chronologically but
+        #   are not contiguous with random gaps in between valid IDs. Supplying an invalid
+        #   or out of date startHistoryId typically returns an HTTP 404 error code. A
+        #   historyId is typically valid for at least a week, but in some rare
+        #   circumstances may be valid for only a few hours. If you receive an HTTP 404
+        #   error response, your application should perform a full sync. If you receive no
+        #   nextPageToken in the response, there are no updates to retrieve and you can
+        #   store the returned historyId for a future request.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -439,8 +466,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_histories(user_id, history_types: nil, label_id: nil, max_results: nil, page_token: nil, start_history_id: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/history', options)
+        def list_user_histories(user_id, history_types: nil, label_id: nil, max_results: nil, page_token: nil, start_history_id: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/history', options)
           command.response_representation = Google::Apis::GmailV1::ListHistoryResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListHistoryResponse
           command.params['userId'] = user_id unless user_id.nil?
@@ -451,19 +478,22 @@ module Google
           command.query['startHistoryId'] = start_history_id unless start_history_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Creates a new label.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Label] label_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -476,8 +506,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_label(user_id, label_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/labels', options)
+        def create_user_label(user_id, label_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/labels', options)
           command.request_representation = Google::Apis::GmailV1::Label::Representation
           command.request_object = label_object
           command.response_representation = Google::Apis::GmailV1::Label::Representation
@@ -485,21 +515,24 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Immediately and permanently deletes the specified label and removes it from
         # any messages and threads that it is applied to.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the label to delete.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -512,26 +545,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_label(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/labels/{id}', options)
+        def delete_user_label(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/labels/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified label.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the label to retrieve.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -544,26 +580,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_label(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/labels/{id}', options)
+        def get_user_label(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/labels/{id}', options)
           command.response_representation = Google::Apis::GmailV1::Label::Representation
           command.response_class = Google::Apis::GmailV1::Label
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists all labels in the user's mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -576,28 +615,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_labels(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/labels', options)
+        def list_user_labels(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/labels', options)
           command.response_representation = Google::Apis::GmailV1::ListLabelsResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListLabelsResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Patch the specified label.
+        # Updates the specified label. This method supports patch semantics.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the label to update.
         # @param [Google::Apis::GmailV1::Label] label_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -610,8 +652,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_user_label(user_id, id, label_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:patch, 'gmail/v1/users/{userId}/labels/{id}', options)
+        def patch_user_label(user_id, id, label_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:patch, '{userId}/labels/{id}', options)
           command.request_representation = Google::Apis::GmailV1::Label::Representation
           command.request_object = label_object
           command.response_representation = Google::Apis::GmailV1::Label::Representation
@@ -620,21 +662,24 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates the specified label.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the label to update.
         # @param [Google::Apis::GmailV1::Label] label_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -647,8 +692,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_label(user_id, id, label_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/labels/{id}', options)
+        def update_user_label(user_id, id, label_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/labels/{id}', options)
           command.request_representation = Google::Apis::GmailV1::Label::Representation
           command.request_object = label_object
           command.response_representation = Google::Apis::GmailV1::Label::Representation
@@ -657,20 +702,23 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes many messages by message ID.  Provides no guarantees that messages
-        # were not already deleted or even existed at all.
+        # Deletes many messages by message ID. Provides no guarantees that messages were
+        # not already deleted or even existed at all.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::BatchDeleteMessagesRequest] batch_delete_messages_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -683,26 +731,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def batch_delete_messages(user_id, batch_delete_messages_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/batchDelete', options)
+        def batch_delete_messages(user_id, batch_delete_messages_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/messages/batchDelete', options)
           command.request_representation = Google::Apis::GmailV1::BatchDeleteMessagesRequest::Representation
           command.request_object = batch_delete_messages_request_object
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Modifies the labels on the specified messages.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::BatchModifyMessagesRequest] batch_modify_messages_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -715,28 +766,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def batch_modify_messages(user_id, batch_modify_messages_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/batchModify', options)
+        def batch_modify_messages(user_id, batch_modify_messages_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/messages/batchModify', options)
           command.request_representation = Google::Apis::GmailV1::BatchModifyMessagesRequest::Representation
           command.request_object = batch_modify_messages_request_object
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Immediately and permanently deletes the specified message. This operation
-        # cannot be undone.  Prefer <code>messages.trash</code> instead.
+        # cannot be undone. Prefer messages.trash instead.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the message to delete.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -749,19 +803,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_message(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/messages/{id}', options)
+        def delete_user_message(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/messages/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified message.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the message to retrieve.
         # @param [String] format
@@ -771,8 +826,10 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -785,8 +842,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_message(user_id, id, format: nil, metadata_headers: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/messages/{id}', options)
+        def get_user_message(user_id, id, format: nil, metadata_headers: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/messages/{id}', options)
           command.response_representation = Google::Apis::GmailV1::Message::Representation
           command.response_class = Google::Apis::GmailV1::Message
           command.params['userId'] = user_id unless user_id.nil?
@@ -795,34 +852,35 @@ module Google
           command.query['metadataHeaders'] = metadata_headers unless metadata_headers.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Imports a message into only this user's mailbox, with standard
-        # email delivery scanning and classification similar to receiving via SMTP.
-        # Does not send a message.
+        # Imports a message into only this user's mailbox, with standard email delivery
+        # scanning and classification similar to receiving via SMTP. Does not send a
+        # message.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Message] message_object
         # @param [Boolean] deleted
-        #   Mark the email as permanently deleted (not TRASH) and
-        #   only visible in
-        #   <a href="http://support.google.com/vault/">Google Vault</a> to
-        #   a Vault administrator. Only used for G Suite accounts.
+        #   Mark the email as permanently deleted (not TRASH) and only visible in Google
+        #   Vault to a Vault administrator. Only used for G Suite accounts.
         # @param [String] internal_date_source
         #   Source for Gmail's internal date of the message.
         # @param [Boolean] never_mark_spam
-        #   Ignore the Gmail spam classifier decision and never mark
-        #   this email as SPAM in the mailbox.
+        #   Ignore the Gmail spam classifier decision and never mark this email as SPAM in
+        #   the mailbox.
         # @param [Boolean] process_for_calendar
-        #   Process calendar invites in the email and add any extracted
-        #   meetings to the Google Calendar for this user.
+        #   Process calendar invites in the email and add any extracted meetings to the
+        #   Google Calendar for this user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -839,11 +897,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def import_user_message(user_id, message_object = nil, deleted: nil, internal_date_source: nil, never_mark_spam: nil, process_for_calendar: nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def import_user_message(user_id, message_object = nil, deleted: nil, internal_date_source: nil, never_mark_spam: nil, process_for_calendar: nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/import', options)
+            command = make_simple_command(:post, '{userId}/messages/import', options)
           else
-            command = make_upload_command(:post, 'gmail/v1/users/{userId}/messages/import', options)
+            command = make_upload_command(:post, '{userId}/messages/import', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -858,28 +916,28 @@ module Google
           command.query['processForCalendar'] = process_for_calendar unless process_for_calendar.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Directly inserts a message into only this user's mailbox similar to
-        # <code>IMAP APPEND</code>, bypassing most scanning and classification.
-        # Does not send a message.
+        # Directly inserts a message into only this user's mailbox similar to IMAP
+        # APPEND, bypassing most scanning and classification. Does not send a message.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Message] message_object
         # @param [Boolean] deleted
-        #   Mark the email as permanently deleted (not TRASH) and
-        #   only visible in
-        #   <a href="http://support.google.com/vault/">Google Vault</a> to
-        #   a Vault administrator. Only used for G Suite accounts.
+        #   Mark the email as permanently deleted (not TRASH) and only visible in Google
+        #   Vault to a Vault administrator. Only used for G Suite accounts.
         # @param [String] internal_date_source
         #   Source for Gmail's internal date of the message.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -896,11 +954,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_user_message(user_id, message_object = nil, deleted: nil, internal_date_source: nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def insert_user_message(user_id, message_object = nil, deleted: nil, internal_date_source: nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages', options)
+            command = make_simple_command(:post, '{userId}/messages', options)
           else
-            command = make_upload_command(:post, 'gmail/v1/users/{userId}/messages', options)
+            command = make_upload_command(:post, '{userId}/messages', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -913,16 +971,16 @@ module Google
           command.query['internalDateSource'] = internal_date_source unless internal_date_source.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the messages in the user's mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Boolean] include_spam_trash
-        #   Include messages from <code>SPAM</code> and <code>TRASH</code>
-        #   in the results.
+        #   Include messages from SPAM and TRASH in the results.
         # @param [Array<String>, String] label_ids
         #   Only return messages with labels that match all of the specified label IDs.
         # @param [Fixnum] max_results
@@ -930,16 +988,17 @@ module Google
         # @param [String] page_token
         #   Page token to retrieve a specific page of results in the list.
         # @param [String] q
-        #   Only return messages matching the specified query. Supports the same
-        #   query format as the Gmail search box. For example,
-        #   <code>"from:someuser@example.com rfc822msgid:&lt;somemsgid@example.com&gt;
-        #   is:unread"</code>. Parameter cannot be used when accessing the api
-        #   using the gmail.metadata scope.
+        #   Only return messages matching the specified query. Supports the same query
+        #   format as the Gmail search box. For example, "from:someuser@example.com
+        #   rfc822msgid:<somemsgid@example.com> is:unread". Parameter cannot be used when
+        #   accessing the api using the gmail.metadata scope.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -952,8 +1011,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_messages(user_id, include_spam_trash: nil, label_ids: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/messages', options)
+        def list_user_messages(user_id, include_spam_trash: nil, label_ids: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/messages', options)
           command.response_representation = Google::Apis::GmailV1::ListMessagesResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListMessagesResponse
           command.params['userId'] = user_id unless user_id.nil?
@@ -964,21 +1023,24 @@ module Google
           command.query['q'] = q unless q.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Modifies the labels on the specified message.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the message to modify.
         # @param [Google::Apis::GmailV1::ModifyMessageRequest] modify_message_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -991,8 +1053,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def modify_message(user_id, id, modify_message_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/{id}/modify', options)
+        def modify_message(user_id, id, modify_message_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/messages/{id}/modify', options)
           command.request_representation = Google::Apis::GmailV1::ModifyMessageRequest::Representation
           command.request_object = modify_message_request_object
           command.response_representation = Google::Apis::GmailV1::Message::Representation
@@ -1001,20 +1063,22 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sends the specified message to the recipients in the
-        # <code>To</code>, <code>Cc</code>, and <code>Bcc</code> headers.
+        # Sends the specified message to the recipients in the To, Cc, and Bcc headers.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Message] message_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [IO, String] upload_source
         #   IO stream or filename containing content to upload
         # @param [String] content_type
@@ -1031,11 +1095,11 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def send_user_message(user_id, message_object = nil, fields: nil, quota_user: nil, upload_source: nil, content_type: nil, options: nil, &block)
+        def send_user_message(user_id, message_object = nil, fields: nil, quota_user: nil, user_ip: nil, upload_source: nil, content_type: nil, options: nil, &block)
           if upload_source.nil?
-            command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/send', options)
+            command = make_simple_command(:post, '{userId}/messages/send', options)
           else
-            command = make_upload_command(:post, 'gmail/v1/users/{userId}/messages/send', options)
+            command = make_upload_command(:post, '{userId}/messages/send', options)
             command.upload_source = upload_source
             command.upload_content_type = content_type
           end
@@ -1046,20 +1110,23 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Moves the specified message to the trash.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the message to Trash.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1072,28 +1139,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def trash_user_message(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/{id}/trash', options)
+        def trash_user_message(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/messages/{id}/trash', options)
           command.response_representation = Google::Apis::GmailV1::Message::Representation
           command.response_class = Google::Apis::GmailV1::Message
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Removes the specified message from the trash.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the message to remove from Trash.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1106,21 +1176,22 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def untrash_user_message(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/messages/{id}/untrash', options)
+        def untrash_user_message(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/messages/{id}/untrash', options)
           command.response_representation = Google::Apis::GmailV1::Message::Representation
           command.response_class = Google::Apis::GmailV1::Message
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified message attachment.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] message_id
         #   The ID of the message containing the attachment.
         # @param [String] id
@@ -1128,8 +1199,10 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1142,8 +1215,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_message_attachment(user_id, message_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/messages/{messageId}/attachments/{id}', options)
+        def get_user_message_attachment(user_id, message_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/messages/{messageId}/attachments/{id}', options)
           command.response_representation = Google::Apis::GmailV1::MessagePartBody::Representation
           command.response_class = Google::Apis::GmailV1::MessagePartBody
           command.params['userId'] = user_id unless user_id.nil?
@@ -1151,18 +1224,21 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the auto-forwarding setting for the specified account.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1175,25 +1251,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_auto_forwarding(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/autoForwarding', options)
+        def get_user_setting_auto_forwarding(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/autoForwarding', options)
           command.response_representation = Google::Apis::GmailV1::AutoForwarding::Representation
           command.response_class = Google::Apis::GmailV1::AutoForwarding
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets IMAP settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1206,25 +1285,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_imap(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/imap', options)
+        def get_user_setting_imap(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/imap', options)
           command.response_representation = Google::Apis::GmailV1::ImapSettings::Representation
           command.response_class = Google::Apis::GmailV1::ImapSettings
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets language settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1237,25 +1319,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_language(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/language', options)
+        def get_user_setting_language(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/language', options)
           command.response_representation = Google::Apis::GmailV1::LanguageSettings::Representation
           command.response_class = Google::Apis::GmailV1::LanguageSettings
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets POP settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1268,25 +1353,28 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_pop(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/pop', options)
+        def get_user_setting_pop(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/pop', options)
           command.response_representation = Google::Apis::GmailV1::PopSettings::Representation
           command.response_class = Google::Apis::GmailV1::PopSettings
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets vacation responder settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1299,29 +1387,32 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_vacation(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/vacation', options)
+        def get_user_setting_vacation(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/vacation', options)
           command.response_representation = Google::Apis::GmailV1::VacationSettings::Representation
           command.response_class = Google::Apis::GmailV1::VacationSettings
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates the auto-forwarding setting for the specified account.  A verified
+        # Updates the auto-forwarding setting for the specified account. A verified
         # forwarding address must be specified when auto-forwarding is enabled.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::AutoForwarding] auto_forwarding_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1334,8 +1425,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_auto_forwarding(user_id, auto_forwarding_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/autoForwarding', options)
+        def update_user_setting_auto_forwarding(user_id, auto_forwarding_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/autoForwarding', options)
           command.request_representation = Google::Apis::GmailV1::AutoForwarding::Representation
           command.request_object = auto_forwarding_object
           command.response_representation = Google::Apis::GmailV1::AutoForwarding::Representation
@@ -1343,19 +1434,22 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates IMAP settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::ImapSettings] imap_settings_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1368,8 +1462,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_imap(user_id, imap_settings_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/imap', options)
+        def update_user_setting_imap(user_id, imap_settings_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/imap', options)
           command.request_representation = Google::Apis::GmailV1::ImapSettings::Representation
           command.request_object = imap_settings_object
           command.response_representation = Google::Apis::GmailV1::ImapSettings::Representation
@@ -1377,24 +1471,27 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates language settings.
-        # If successful, the return object contains the <code>displayLanguage</code>
-        # that was saved for the user, which may differ from the value passed into
-        # the request. This is because the requested <code>displayLanguage</code> may
-        # not be directly supported by Gmail but have a close variant that is, and so
-        # the variant may be chosen and saved instead.
-        # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        # If successful, the return object contains the displayLanguage that was saved
+        # for the user, which may differ from the value passed into the request. This is
+        # because the requested displayLanguage may not be directly supported by Gmail
+        # but have a close variant that is, and so the variant may be chosen and saved
+        # instead.
+        # @param [String] user_id
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::LanguageSettings] language_settings_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1407,8 +1504,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_language(user_id, language_settings_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/language', options)
+        def update_user_setting_language(user_id, language_settings_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/language', options)
           command.request_representation = Google::Apis::GmailV1::LanguageSettings::Representation
           command.request_object = language_settings_object
           command.response_representation = Google::Apis::GmailV1::LanguageSettings::Representation
@@ -1416,19 +1513,22 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates POP settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::PopSettings] pop_settings_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1441,8 +1541,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_pop(user_id, pop_settings_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/pop', options)
+        def update_user_setting_pop(user_id, pop_settings_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/pop', options)
           command.request_representation = Google::Apis::GmailV1::PopSettings::Representation
           command.request_object = pop_settings_object
           command.response_representation = Google::Apis::GmailV1::PopSettings::Representation
@@ -1450,19 +1550,22 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Updates vacation responder settings.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::VacationSettings] vacation_settings_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1475,8 +1578,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_vacation(user_id, vacation_settings_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/vacation', options)
+        def update_user_setting_vacation(user_id, vacation_settings_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/vacation', options)
           command.request_representation = Google::Apis::GmailV1::VacationSettings::Representation
           command.request_object = vacation_settings_object
           command.response_representation = Google::Apis::GmailV1::VacationSettings::Representation
@@ -1484,32 +1587,33 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Adds a delegate with its verification status set directly to
-        # <code>accepted</code>, without sending any verification email.  The
-        # delegate user must be a member of the same G Suite organization as the
-        # delegator user.
-        # Gmail imposes limitations on the number of delegates and delegators each
-        # user in a G Suite organization can have. These limits depend on your
-        # organization, but in general each user can have up to 25 delegates and
-        # up to 10 delegators.
-        # Note that a delegate user must be referred to by their primary email
-        # address, and not an email alias.
-        # Also note that when a new delegate is created, there may be up to a one
-        # minute delay before the new delegate is available for use.
+        # Adds a delegate with its verification status set directly to accepted, without
+        # sending any verification email. The delegate user must be a member of the same
+        # G Suite organization as the delegator user.
+        # Gmail imposes limitations on the number of delegates and delegators each user
+        # in a G Suite organization can have. These limits depend on your organization,
+        # but in general each user can have up to 25 delegates and up to 10 delegators.
+        # Note that a delegate user must be referred to by their primary email address,
+        # and not an email alias.
+        # Also note that when a new delegate is created, there may be up to a one minute
+        # delay before the new delegate is available for use.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Delegate] delegate_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1522,8 +1626,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_setting_delegate(user_id, delegate_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/delegates', options)
+        def create_user_setting_delegate(user_id, delegate_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/delegates', options)
           command.request_representation = Google::Apis::GmailV1::Delegate::Representation
           command.request_object = delegate_object
           command.response_representation = Google::Apis::GmailV1::Delegate::Representation
@@ -1531,25 +1635,28 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Removes the specified delegate (which can be of any verification status),
-        # and revokes any verification that may have been required for using it.
-        # Note that a delegate user must be referred to by their primary email
-        # address, and not an email alias.
+        # Removes the specified delegate (which can be of any verification status), and
+        # revokes any verification that may have been required for using it.
+        # Note that a delegate user must be referred to by their primary email address,
+        # and not an email alias.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] delegate_email
         #   The email address of the user to be removed as a delegate.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1562,31 +1669,33 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_setting_delegate(user_id, delegate_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/settings/delegates/{delegateEmail}', options)
+        def delete_user_setting_delegate(user_id, delegate_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/settings/delegates/{delegateEmail}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['delegateEmail'] = delegate_email unless delegate_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified delegate.
-        # Note that a delegate user must be referred to by their primary email
-        # address, and not an email alias.
+        # Note that a delegate user must be referred to by their primary email address,
+        # and not an email alias.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] delegate_email
-        #   The email address of the user whose delegate relationship is to be
-        #   retrieved.
+        #   The email address of the user whose delegate relationship is to be retrieved.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1599,14 +1708,15 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_delegate(user_id, delegate_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/delegates/{delegateEmail}', options)
+        def get_user_setting_delegate(user_id, delegate_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/delegates/{delegateEmail}', options)
           command.response_representation = Google::Apis::GmailV1::Delegate::Representation
           command.response_class = Google::Apis::GmailV1::Delegate
           command.params['userId'] = user_id unless user_id.nil?
           command.params['delegateEmail'] = delegate_email unless delegate_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
@@ -1614,13 +1724,15 @@ module Google
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1633,26 +1745,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_setting_delegates(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/delegates', options)
+        def list_user_setting_delegates(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/delegates', options)
           command.response_representation = Google::Apis::GmailV1::ListDelegatesResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListDelegatesResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Creates a filter.
         # @param [String] user_id
-        #   User's email address. The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::Filter] filter_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1665,8 +1780,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_setting_filter(user_id, filter_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/filters', options)
+        def create_user_setting_filter(user_id, filter_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/filters', options)
           command.request_representation = Google::Apis::GmailV1::Filter::Representation
           command.request_object = filter_object
           command.response_representation = Google::Apis::GmailV1::Filter::Representation
@@ -1674,20 +1789,23 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Deletes a filter.
         # @param [String] user_id
-        #   User's email address. The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the filter to be deleted.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1700,26 +1818,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_setting_filter(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/settings/filters/{id}', options)
+        def delete_user_setting_filter(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/settings/filters/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets a filter.
         # @param [String] user_id
-        #   User's email address. The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the filter to be fetched.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1732,26 +1853,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_filter(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/filters/{id}', options)
+        def get_user_setting_filter(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/filters/{id}', options)
           command.response_representation = Google::Apis::GmailV1::Filter::Representation
           command.response_class = Google::Apis::GmailV1::Filter
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the message filters of a Gmail user.
         # @param [String] user_id
-        #   User's email address. The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1764,31 +1888,34 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_setting_filters(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/filters', options)
+        def list_user_setting_filters(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/filters', options)
           command.response_representation = Google::Apis::GmailV1::ListFiltersResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListFiltersResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a forwarding address.  If ownership verification is required, a
-        # message will be sent to the recipient and the resource's verification
-        # status will be set to <code>pending</code>; otherwise, the resource will be
-        # created with verification status set to <code>accepted</code>.
+        # Creates a forwarding address. If ownership verification is required, a message
+        # will be sent to the recipient and the resource's verification status will be
+        # set to pending; otherwise, the resource will be created with verification
+        # status set to accepted.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::ForwardingAddress] forwarding_address_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1801,8 +1928,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_setting_forwarding_address(user_id, forwarding_address_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/forwardingAddresses', options)
+        def create_user_setting_forwarding_address(user_id, forwarding_address_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/forwardingAddresses', options)
           command.request_representation = Google::Apis::GmailV1::ForwardingAddress::Representation
           command.request_object = forwarding_address_object
           command.response_representation = Google::Apis::GmailV1::ForwardingAddress::Representation
@@ -1810,23 +1937,26 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes the specified forwarding address and revokes any verification that
-        # may have been required.
+        # Deletes the specified forwarding address and revokes any verification that may
+        # have been required.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] forwarding_email
         #   The forwarding address to be deleted.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1839,26 +1969,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_setting_forwarding_address(user_id, forwarding_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/settings/forwardingAddresses/{forwardingEmail}', options)
+        def delete_user_setting_forwarding_address(user_id, forwarding_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/settings/forwardingAddresses/{forwardingEmail}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['forwardingEmail'] = forwarding_email unless forwarding_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified forwarding address.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] forwarding_email
         #   The forwarding address to be retrieved.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1871,26 +2004,29 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_forwarding_address(user_id, forwarding_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/forwardingAddresses/{forwardingEmail}', options)
+        def get_user_setting_forwarding_address(user_id, forwarding_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/forwardingAddresses/{forwardingEmail}', options)
           command.response_representation = Google::Apis::GmailV1::ForwardingAddress::Representation
           command.response_class = Google::Apis::GmailV1::ForwardingAddress
           command.params['userId'] = user_id unless user_id.nil?
           command.params['forwardingEmail'] = forwarding_email unless forwarding_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the forwarding addresses for the specified account.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1903,35 +2039,37 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_setting_forwarding_addresses(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/forwardingAddresses', options)
+        def list_user_setting_forwarding_addresses(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/forwardingAddresses', options)
           command.response_representation = Google::Apis::GmailV1::ListForwardingAddressesResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListForwardingAddressesResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Creates a custom "from" send-as alias.  If an SMTP MSA is specified, Gmail
-        # will attempt to connect to the SMTP service to validate the configuration
-        # before creating the alias.  If ownership verification is required for the
-        # alias, a message will be sent to the email address and the resource's
-        # verification status will be set to <code>pending</code>; otherwise, the
-        # resource will be created with verification status set to
-        # <code>accepted</code>.  If a signature is provided, Gmail will sanitize the
-        # HTML before saving it with the alias.
+        # Creates a custom "from" send-as alias. If an SMTP MSA is specified, Gmail will
+        # attempt to connect to the SMTP service to validate the configuration before
+        # creating the alias. If ownership verification is required for the alias, a
+        # message will be sent to the email address and the resource's verification
+        # status will be set to pending; otherwise, the resource will be created with
+        # verification status set to accepted. If a signature is provided, Gmail will
+        # sanitize the HTML before saving it with the alias.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [Google::Apis::GmailV1::SendAs] send_as_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1944,8 +2082,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def create_user_setting_send_as(user_id, send_as_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/sendAs', options)
+        def create_user_setting_send_as(user_id, send_as_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/sendAs', options)
           command.request_representation = Google::Apis::GmailV1::SendAs::Representation
           command.request_object = send_as_object
           command.response_representation = Google::Apis::GmailV1::SendAs::Representation
@@ -1953,23 +2091,26 @@ module Google
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Deletes the specified send-as alias.  Revokes any verification that may
-        # have been required for using it.
+        # Deletes the specified send-as alias. Revokes any verification that may have
+        # been required for using it.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
         #   The send-as alias to be deleted.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -1982,27 +2123,30 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}', options)
+        def delete_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/settings/sendAs/{sendAsEmail}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Gets the specified send-as alias.  Fails with an HTTP 404 error if the
+        # Gets the specified send-as alias. Fails with an HTTP 404 error if the
         # specified address is not a member of the collection.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
         #   The send-as alias to be retrieved.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2015,28 +2159,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}', options)
+        def get_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/sendAs/{sendAsEmail}', options)
           command.response_representation = Google::Apis::GmailV1::SendAs::Representation
           command.response_class = Google::Apis::GmailV1::SendAs
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Lists the send-as aliases for the specified account.  The result includes
-        # the primary send-as address associated with the account as well as any
-        # custom "from" aliases.
+        # Lists the send-as aliases for the specified account. The result includes the
+        # primary send-as address associated with the account as well as any custom "
+        # from" aliases.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2049,28 +2196,35 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_setting_send_as(user_id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/sendAs', options)
+        def list_user_setting_send_as(user_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/sendAs', options)
           command.response_representation = Google::Apis::GmailV1::ListSendAsResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListSendAsResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Patch the specified send-as alias.
+        # Updates a send-as alias. If a signature is provided, Gmail will sanitize the
+        # HTML before saving it with the alias.
+        # Addresses other than the primary address for the account can only be updated
+        # by service account clients that have been delegated domain-wide authority.
+        # This method supports patch semantics.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
         #   The send-as alias to be updated.
         # @param [Google::Apis::GmailV1::SendAs] send_as_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2083,8 +2237,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def patch_user_setting_send_as(user_id, send_as_email, send_as_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:patch, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}', options)
+        def patch_user_setting_send_as(user_id, send_as_email, send_as_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:patch, '{userId}/settings/sendAs/{sendAsEmail}', options)
           command.request_representation = Google::Apis::GmailV1::SendAs::Representation
           command.request_object = send_as_object
           command.response_representation = Google::Apis::GmailV1::SendAs::Representation
@@ -2093,25 +2247,27 @@ module Google
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Updates a send-as alias.  If a signature is provided, Gmail will sanitize
-        # the HTML before saving it with the alias.
-        # Addresses other than the primary address for the account can only be
-        # updated by service account clients that have been delegated domain-wide
-        # authority.
+        # Updates a send-as alias. If a signature is provided, Gmail will sanitize the
+        # HTML before saving it with the alias.
+        # Addresses other than the primary address for the account can only be updated
+        # by service account clients that have been delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
         #   The send-as alias to be updated.
         # @param [Google::Apis::GmailV1::SendAs] send_as_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2124,8 +2280,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def update_user_setting_send_as(user_id, send_as_email, send_as_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:put, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}', options)
+        def update_user_setting_send_as(user_id, send_as_email, send_as_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:put, '{userId}/settings/sendAs/{sendAsEmail}', options)
           command.request_representation = Google::Apis::GmailV1::SendAs::Representation
           command.request_object = send_as_object
           command.response_representation = Google::Apis::GmailV1::SendAs::Representation
@@ -2134,23 +2290,26 @@ module Google
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Sends a verification email to the specified send-as alias address.
-        # The verification status must be <code>pending</code>.
+        # Sends a verification email to the specified send-as alias address. The
+        # verification status must be pending.
         # This method is only available to service account clients that have been
         # delegated domain-wide authority.
         # @param [String] user_id
-        #   User's email address.  The special value "me"
-        #   can be used to indicate the authenticated user.
+        #   User's email address. The special value "me" can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
         #   The send-as alias to be verified.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2163,29 +2322,32 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def verify_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/verify', options)
+        def verify_user_setting_send_as(user_id, send_as_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/sendAs/{sendAsEmail}/verify', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Deletes the specified S/MIME config for the specified send-as alias.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
-        #   The email address that appears in the "From:" header for mail sent using
-        #   this alias.
+        #   The email address that appears in the "From:" header for mail sent using this
+        #   alias.
         # @param [String] id
         #   The immutable ID for the SmimeInfo.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2198,30 +2360,33 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_setting_send_a_smime_info(user_id, send_as_email, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}', options)
+        def delete_user_setting_send_a_smime_info(user_id, send_as_email, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified S/MIME config for the specified send-as alias.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
-        #   The email address that appears in the "From:" header for mail sent using
-        #   this alias.
+        #   The email address that appears in the "From:" header for mail sent using this
+        #   alias.
         # @param [String] id
         #   The immutable ID for the SmimeInfo.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2234,8 +2399,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_setting_send_a_smime_info(user_id, send_as_email, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}', options)
+        def get_user_setting_send_a_smime_info(user_id, send_as_email, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}', options)
           command.response_representation = Google::Apis::GmailV1::SmimeInfo::Representation
           command.response_class = Google::Apis::GmailV1::SmimeInfo
           command.params['userId'] = user_id unless user_id.nil?
@@ -2243,23 +2408,26 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Insert (upload) the given S/MIME config for the specified send-as alias.
-        # Note that pkcs12 format is required for the key.
+        # Insert (upload) the given S/MIME config for the specified send-as alias. Note
+        # that pkcs12 format is required for the key.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
-        #   The email address that appears in the "From:" header for mail sent using
-        #   this alias.
+        #   The email address that appears in the "From:" header for mail sent using this
+        #   alias.
         # @param [Google::Apis::GmailV1::SmimeInfo] smime_info_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2272,8 +2440,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def insert_user_setting_send_a_smime_info(user_id, send_as_email, smime_info_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo', options)
+        def insert_user_setting_send_a_smime_info(user_id, send_as_email, smime_info_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo', options)
           command.request_representation = Google::Apis::GmailV1::SmimeInfo::Representation
           command.request_object = smime_info_object
           command.response_representation = Google::Apis::GmailV1::SmimeInfo::Representation
@@ -2282,21 +2450,24 @@ module Google
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists S/MIME configs for the specified send-as alias.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
-        #   The email address that appears in the "From:" header for mail sent using
-        #   this alias.
+        #   The email address that appears in the "From:" header for mail sent using this
+        #   alias.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2309,31 +2480,34 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_setting_send_a_smime_infos(user_id, send_as_email, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo', options)
+        def list_user_setting_send_a_smime_infos(user_id, send_as_email, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo', options)
           command.response_representation = Google::Apis::GmailV1::ListSmimeInfoResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListSmimeInfoResponse
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Sets the default S/MIME config for the specified send-as alias.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] send_as_email
-        #   The email address that appears in the "From:" header for mail sent using
-        #   this alias.
+        #   The email address that appears in the "From:" header for mail sent using this
+        #   alias.
         # @param [String] id
         #   The immutable ID for the SmimeInfo.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2346,28 +2520,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def set_user_setting_send_a_smime_info_default(user_id, send_as_email, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}/setDefault', options)
+        def set_user_setting_send_a_smime_info_default(user_id, send_as_email, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}/setDefault', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['sendAsEmail'] = send_as_email unless send_as_email.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Immediately and permanently deletes the specified thread. This operation
-        # cannot be undone. Prefer <code>threads.trash</code> instead.
+        # cannot be undone. Prefer threads.trash instead.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   ID of the Thread to delete.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2380,19 +2557,20 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def delete_user_thread(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:delete, 'gmail/v1/users/{userId}/threads/{id}', options)
+        def delete_user_thread(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:delete, '{userId}/threads/{id}', options)
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Gets the specified thread.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the thread to retrieve.
         # @param [String] format
@@ -2402,8 +2580,10 @@ module Google
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2416,8 +2596,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def get_user_thread(user_id, id, format: nil, metadata_headers: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/threads/{id}', options)
+        def get_user_thread(user_id, id, format: nil, metadata_headers: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/threads/{id}', options)
           command.response_representation = Google::Apis::GmailV1::Thread::Representation
           command.response_class = Google::Apis::GmailV1::Thread
           command.params['userId'] = user_id unless user_id.nil?
@@ -2426,16 +2606,16 @@ module Google
           command.query['metadataHeaders'] = metadata_headers unless metadata_headers.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Lists the threads in the user's mailbox.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [Boolean] include_spam_trash
-        #   Include threads from <code>SPAM</code> and <code>TRASH</code>
-        #   in the results.
+        #   Include threads from SPAM and TRASH in the results.
         # @param [Array<String>, String] label_ids
         #   Only return threads with labels that match all of the specified label IDs.
         # @param [Fixnum] max_results
@@ -2443,16 +2623,17 @@ module Google
         # @param [String] page_token
         #   Page token to retrieve a specific page of results in the list.
         # @param [String] q
-        #   Only return threads matching the specified query. Supports the same
-        #   query format as the Gmail search box. For example,
-        #   <code>"from:someuser@example.com rfc822msgid:<somemsgid@example.com>
-        #   is:unread"</code>. Parameter cannot be used when accessing the api
-        #   using the gmail.metadata scope.
+        #   Only return threads matching the specified query. Supports the same query
+        #   format as the Gmail search box. For example, "from:someuser@example.com
+        #   rfc822msgid: is:unread". Parameter cannot be used when accessing the api using
+        #   the gmail.metadata scope.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2465,8 +2646,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def list_user_threads(user_id, include_spam_trash: nil, label_ids: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:get, 'gmail/v1/users/{userId}/threads', options)
+        def list_user_threads(user_id, include_spam_trash: nil, label_ids: nil, max_results: nil, page_token: nil, q: nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{userId}/threads', options)
           command.response_representation = Google::Apis::GmailV1::ListThreadsResponse::Representation
           command.response_class = Google::Apis::GmailV1::ListThreadsResponse
           command.params['userId'] = user_id unless user_id.nil?
@@ -2477,22 +2658,25 @@ module Google
           command.query['q'] = q unless q.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
-        # Modifies the labels applied to the thread. This applies to all messages
-        # in the thread.
+        # Modifies the labels applied to the thread. This applies to all messages in the
+        # thread.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the thread to modify.
         # @param [Google::Apis::GmailV1::ModifyThreadRequest] modify_thread_request_object
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2505,8 +2689,8 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def modify_thread(user_id, id, modify_thread_request_object = nil, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/threads/{id}/modify', options)
+        def modify_thread(user_id, id, modify_thread_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/threads/{id}/modify', options)
           command.request_representation = Google::Apis::GmailV1::ModifyThreadRequest::Representation
           command.request_object = modify_thread_request_object
           command.response_representation = Google::Apis::GmailV1::Thread::Representation
@@ -2515,20 +2699,23 @@ module Google
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Moves the specified thread to the trash.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the thread to Trash.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2541,28 +2728,31 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def trash_user_thread(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/threads/{id}/trash', options)
+        def trash_user_thread(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/threads/{id}/trash', options)
           command.response_representation = Google::Apis::GmailV1::Thread::Representation
           command.response_class = Google::Apis::GmailV1::Thread
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
         
         # Removes the specified thread from the trash.
         # @param [String] user_id
-        #   The user's email address. The special value <code>me</code>
-        #   can be used to indicate the authenticated user.
+        #   The user's email address. The special value me can be used to indicate the
+        #   authenticated user.
         # @param [String] id
         #   The ID of the thread to remove from Trash.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
-        #   Available to use for quota purposes for server-side applications. Can be any
-        #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
@@ -2575,14 +2765,15 @@ module Google
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def untrash_user_thread(user_id, id, fields: nil, quota_user: nil, options: nil, &block)
-          command = make_simple_command(:post, 'gmail/v1/users/{userId}/threads/{id}/untrash', options)
+        def untrash_user_thread(user_id, id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:post, '{userId}/threads/{id}/untrash', options)
           command.response_representation = Google::Apis::GmailV1::Thread::Representation
           command.response_class = Google::Apis::GmailV1::Thread
           command.params['userId'] = user_id unless user_id.nil?
           command.params['id'] = id unless id.nil?
           command.query['fields'] = fields unless fields.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
           execute_or_queue_command(command, &block)
         end
 
@@ -2591,6 +2782,7 @@ module Google
         def apply_command_defaults(command)
           command.query['key'] = key unless key.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
         end
       end
     end