twitter 6.1.0 → 6.2.0

data/lib/twitter/rest/request.rb

@@ -1,16 +1,20 @@
 require 'addressable/uri'
-require 'faraday'
+require 'http'
+require 'http/form_data'
 require 'json'
-require 'timeout'
+require 'openssl'
 require 'twitter/error'
 require 'twitter/headers'
 require 'twitter/rate_limit'
+require 'twitter/utils'
 
 module Twitter
   module REST
     class Request
-      attr_accessor :client, :headers, :options, :rate_limit, :request_method,
-                    :path, :uri
+      include Twitter::Utils
+      BASE_URL = 'https://api.twitter.com'.freeze
+      attr_accessor :client, :headers, :options, :path, :rate_limit,
+                    :request_method, :uri
       alias verb request_method
 
       # @param client [Twitter::Client]
@@ -20,24 +24,109 @@ module Twitter
       # @return [Twitter::REST::Request]
       def initialize(client, request_method, path, options = {})
         @client = client
-        @request_method = request_method.to_sym
-        @path = path
-        @uri = Addressable::URI.parse(client.connection.url_prefix + path)
+        @uri = Addressable::URI.parse(path.start_with?('http') ? path : BASE_URL + path)
+        set_multipart_options!(request_method, options)
+        @path = uri.path
         @options = options
       end
 
       # @return [Array, Hash]
       def perform
-        @headers = Twitter::Headers.new(@client, @request_method, @uri.to_s, @options).request_headers
-        begin
-          response = @client.connection.send(@request_method, @path, @options) { |request| request.headers.update(@headers) }.env
-        rescue Faraday::Error::TimeoutError, Timeout::Error => error
-          raise(Twitter::Error::RequestTimeout.new(error))
-        rescue Faraday::Error::ClientError, JSON::ParserError => error
-          raise(Twitter::Error.new(error))
+        options_key = @request_method == :get ? :params : :form
+        response = http_client.headers(@headers).public_send(@request_method, @uri.to_s, options_key => @options)
+        response_body = response.body.empty? ? '' : symbolize_keys!(response.parse)
+        response_headers = response.headers
+        fail_or_return_response_body(response.code, response_body, response_headers)
+      end
+
+    private
+
+      def merge_multipart_file!(options)
+        key = options.delete(:key)
+        file = options.delete(:file)
+
+        options[key] = if file.is_a?(StringIO)
+                         HTTP::FormData::File.new(file, mime_type: 'video/mp4')
+                       else
+                         HTTP::FormData::File.new(file, filename: File.basename(file), mime_type: mime_type(File.basename(file)))
+                       end
+      end
+
+      def set_multipart_options!(request_method, options)
+        if request_method == :multipart_post
+          merge_multipart_file!(options)
+          @request_method = :post
+          @headers = Twitter::Headers.new(@client, @request_method, @uri).request_headers
+        else
+          @request_method = request_method
+          @headers = Twitter::Headers.new(@client, @request_method, @uri, options).request_headers
+        end
+      end
+
+      def mime_type(basename)
+        case basename
+        when /\.gif$/i
+          'image/gif'
+        when /\.jpe?g/i
+          'image/jpeg'
+        when /\.png$/i
+          'image/png'
+        else
+          'application/octet-stream'
+        end
+      end
+
+      def fail_or_return_response_body(code, body, headers)
+        error = error(code, body, headers)
+        raise(error) if error
+        @rate_limit = Twitter::RateLimit.new(headers)
+        body
+      end
+
+      def error(code, body, headers)
+        klass = Twitter::Error::ERRORS[code]
+        if klass == Twitter::Error::Forbidden
+          forbidden_error(body, headers)
+        elsif !klass.nil?
+          klass.from_response(body, headers)
+        end
+      end
+
+      def forbidden_error(body, headers)
+        error = Twitter::Error::Forbidden.from_response(body, headers)
+        klass = Twitter::Error::FORBIDDEN_MESSAGES[error.message]
+        if klass
+          klass.from_response(body, headers)
+        else
+          error
+        end
+      end
+
+      def symbolize_keys!(object)
+        if object.is_a?(Array)
+          object.each_with_index do |val, index|
+            object[index] = symbolize_keys!(val)
+          end
+        elsif object.is_a?(Hash)
+          object.dup.each_key do |key|
+            object[key.to_sym] = symbolize_keys!(object.delete(key))
+          end
         end
-        @rate_limit = Twitter::RateLimit.new(response.response_headers)
-        response.body
+        object
+      end
+
+      # @return [HTTP::Client, HTTP]
+      def http_client
+        client = @client.proxy ? HTTP.via(*proxy) : HTTP
+        client = client.timeout(:per_operation, connect: @client.timeouts[:connect], read: @client.timeouts[:read], write: @client.timeouts[:write]) if @client.timeouts
+        client
+      end
+
+      # Return proxy values as a compacted array
+      #
+      # @return [Array]
+      def proxy
+        @client.proxy.values_at(:host, :port, :username, :password).compact
       end
     end
   end

data/lib/twitter/rest/saved_searches.rb

@@ -65,7 +65,6 @@ module Twitter
       def create_saved_search(query, options = {})
         perform_post_with_object('/1.1/saved_searches/create.json', options.merge(query: query), Twitter::SavedSearch)
       end
-      deprecate_alias :saved_search_create, :create_saved_search
 
       # Destroys saved searches for the authenticated user
       #
@@ -86,7 +85,6 @@ module Twitter
           perform_post_with_object("/1.1/saved_searches/destroy/#{id}.json", arguments.options, Twitter::SavedSearch)
         end
       end
-      deprecate_alias :saved_search_destroy, :destroy_saved_search
     end
   end
 end

data/lib/twitter/rest/search.rb

@@ -24,8 +24,10 @@ module Twitter
       # @option options [String] :until Optional. Returns tweets generated before the given date. Date should be formatted as YYYY-MM-DD.
       # @option options [Integer] :since_id Returns results with an ID greater than (that is, more recent than) the specified ID. There are limits to the number of Tweets which can be accessed through the API. If the limit of Tweets has occured since the since_id, the since_id will be forced to the oldest ID available.
       # @option options [Integer] :max_id Returns results with an ID less than (that is, older than) or equal to the specified ID.
+      # @option options [Boolean] :include_entities The entities node will be disincluded when set to false.
       # @return [Twitter::SearchResults] Return tweets that match a specified query with search metadata
       def search(q, options = {})
+        options = options.dup
         options[:count] ||= MAX_TWEETS_PER_REQUEST
         request = Twitter::REST::Request.new(self, :get, '/1.1/search/tweets.json', options.merge(q: q))
         Twitter::SearchResults.new(request)

data/lib/twitter/rest/trends.rb

@@ -19,6 +19,7 @@ module Twitter
       # @option options [String] :exclude Setting this equal to 'hashtags' will remove all hashtags from the trends list.
       # @return [Array<Twitter::Trend>]
       def trends(id = 1, options = {})
+        options = options.dup
         options[:id] = id
         response = perform_get('/1.1/trends/place.json', options).first
         Twitter::TrendResults.new(response)

data/lib/twitter/rest/tweets.rb

@@ -41,6 +41,7 @@ module Twitter
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       # @option options [Boolean] :ids_only ('false') Only return user IDs instead of full user objects.
       def retweeters_of(tweet, options = {})
+        options = options.dup
         ids_only = !!options.delete(:ids_only)
         retweeters = retweets(tweet, options).collect(&:user)
         ids_only ? retweeters.collect(&:id) : retweeters
@@ -52,7 +53,7 @@ module Twitter
       # @rate_limited Yes
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @raise [Twitter::Error::Forbidden] Error raised when supplied status is over 140 characters.
+      # @raise [Twitter::Error::Forbidden] Error raised when supplied status is over 280 characters.
       # @return [Twitter::Tweet] The requested Tweet.
       # @param tweet [Integer, String, URI, Twitter::Tweet] A Tweet ID, URI, or object.
       # @param options [Hash] A customizable set of options.
@@ -101,8 +102,6 @@ module Twitter
         end
       end
       alias destroy_tweet destroy_status
-      deprecate_alias :status_destroy, :destroy_status
-      deprecate_alias :tweet_destroy, :destroy_status
 
       # Updates the authenticating user's status
       #
@@ -112,7 +111,7 @@ module Twitter
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Twitter::Tweet] The created Tweet. When the tweet is deemed a duplicate by Twitter, returns the last Tweet from the user's timeline.
-      # @param status [String] The text of your status update, up to 140 characters.
+      # @param status [String] The text of your status update, up to 280 characters.
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :possibly_sensitive Set to true for content which may not be suitable for every audience.
       # @option options [Twitter::Tweet] :in_reply_to_status An existing status that the update is in reply to. If the status being replied to was not originally posted by the authenticated user, the text of the status must begin with an @-mention, or twitter will reject the update.
@@ -121,7 +120,6 @@ module Twitter
       # @option options [Float] :long The longitude of the location this tweet refers to. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This option will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding :lat option.
       # @option options [Twitter::Place] :place A place in the world. These can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
       # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
-      # @option options [String] :media_ids A comma separated list of uploaded media IDs to attach to the Tweet.
       # @option options [String] :display_coordinates Whether or not to put a pin on the exact coordinates a tweet has been sent from.
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def update(status, options = {})
@@ -139,7 +137,7 @@ module Twitter
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @raise [Twitter::Error::DuplicateStatus] Error raised when a duplicate status is posted.
       # @return [Twitter::Tweet] The created Tweet.
-      # @param status [String] The text of your status update, up to 140 characters.
+      # @param status [String] The text of your status update, up to 280 characters.
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :possibly_sensitive Set to true for content which may not be suitable for every audience.
       # @option options [Twitter::Tweet] :in_reply_to_status An existing status that the update is in reply to. If the status being replied to was not originally posted by the authenticated user, the text of the status must begin with an @-mention, or twitter will reject the update.
@@ -148,7 +146,6 @@ module Twitter
       # @option options [Float] :long The longitude of the location this tweet refers to. The valid ranges for longitude is -180.0 to +180.0 (East is positive) inclusive. This option will be ignored if outside that range, if it is not a number, if geo_enabled is disabled, or if there not a corresponding :lat option.
       # @option options [Twitter::Place] :place A place in the world. These can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
       # @option options [String] :place_id A place in the world. These IDs can be retrieved from {Twitter::REST::PlacesAndGeo#reverse_geocode}.
-      # @option options [String] :media_ids A comma separated list of uploaded media IDs to attach to the Tweet.
       # @option options [String] :display_coordinates Whether or not to put a pin on the exact coordinates a tweet has been sent from.
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def update!(status, options = {})
@@ -211,10 +208,9 @@ module Twitter
       # @rate_limited No
       # @authentication Requires user context
       # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @raise [Twitter::Error::UnacceptableIO] Error when the IO object for the media argument does not have a to_io method.
       # @return [Twitter::Tweet] The created Tweet.
-      # @param status [String] The text of your status update, up to 140 characters.
-      # @param media [File, Hash] A File object with your picture (PNG, JPEG or GIF)
+      # @param status [String] The text of your status update, up to 280 characters.
+      # @param media [File, Array<File>] An image file or array of image files (PNG, JPEG or GIF).
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean, String, Integer] :possibly_sensitive Set to true for content which may not be suitable for every audience.
       # @option options [Twitter::Tweet] :in_reply_to_status An existing status that the update is in reply to.
@@ -226,11 +222,11 @@ module Twitter
       # @option options [String] :display_coordinates Whether or not to put a pin on the exact coordinates a tweet has been sent from.
       # @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
       def update_with_media(status, media, options = {})
-        raise(Twitter::Error::UnacceptableIO.new) unless media.respond_to?(:to_io)
-        hash = options.dup
-        hash[:in_reply_to_status_id] = hash.delete(:in_reply_to_status).id unless hash[:in_reply_to_status].nil?
-        hash[:place_id] = hash.delete(:place).woeid unless hash[:place].nil?
-        perform_post_with_object('/1.1/statuses/update_with_media.json', hash.merge('media[]' => media, 'status' => status), Twitter::Tweet)
+        options = options.dup
+        media_ids = pmap(array_wrap(media)) do |medium|
+          upload(medium)[:media_id]
+        end
+        update!(status, options.merge(media_ids: media_ids.join(',')))
       end
 
       # Returns oEmbed for a Tweet
@@ -252,6 +248,7 @@ module Twitter
       # @option options [String] :widget_type Set to video to return a Twitter Video embed for the given Tweet.
       # @option options [Boolean, String] :hide_tweet Applies to video type only. Set to 1 or true to link directly to the Tweet URL instead of displaying a Tweet overlay when a viewer clicks on the Twitter bird logo.
       def oembed(tweet, options = {})
+        options = options.dup
         options[:id] = extract_id(tweet)
         perform_get_with_object('/1.1/statuses/oembed.json', options, Twitter::OEmbed)
       end
@@ -300,12 +297,80 @@ module Twitter
         perform_get_with_cursor('/1.1/statuses/retweeters/ids.json', arguments.options, :ids)
       end
 
+      # Untweets a retweeted status as the authenticating user
+      #
+      # @see https://dev.twitter.com/rest/reference/post/statuses/unretweet/:id
+      # @rate_limited Yes
+      # @authentication Requires user context
+      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
+      # @return [Array<Twitter::Tweet>] The original tweets with retweet details embedded.
+      # @overload unretweet(*tweets)
+      #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
+      # @overload unretweet(*tweets, options)
+      #   @param tweets [Enumerable<Integer, String, URI, Twitter::Tweet>] A collection of Tweet IDs, URIs, or objects.
+      #   @param options [Hash] A customizable set of options.
+      #   @option options [Boolean, String, Integer] :trim_user Each tweet returned in a timeline will include a user object with only the author's numerical ID when set to true, 't' or 1.
+      def unretweet(*args)
+        arguments = Twitter::Arguments.new(args)
+        pmap(arguments) do |tweet|
+          begin
+            post_unretweet(extract_id(tweet), arguments.options)
+          rescue Twitter::Error::NotFound
+            next
+          end
+        end.compact
+      end
+
     private
 
+      # Uploads images and videos. Videos require multiple requests and uploads in chunks of 5 Megabytes.
+      # The only supported video format is mp4.
+      #
+      # @see https://dev.twitter.com/rest/public/uploading-media
+      def upload(media) # rubocop:disable MethodLength, AbcSize
+        if File.basename(media) !~ /\.mp4$/
+          Twitter::REST::Request.new(self, :multipart_post, 'https://upload.twitter.com/1.1/media/upload.json', key: :media, file: media).perform
+        else
+          init = Twitter::REST::Request.new(self, :post, 'https://upload.twitter.com/1.1/media/upload.json',
+                                            command: 'INIT',
+                                            media_type: 'video/mp4',
+                                            total_bytes: media.size).perform
+
+          until media.eof?
+            chunk = media.read(5_000_000)
+            seg ||= -1
+            Twitter::REST::Request.new(self, :multipart_post, 'https://upload.twitter.com/1.1/media/upload.json',
+                                       command: 'APPEND',
+                                       media_id: init[:media_id],
+                                       segment_index: seg += 1,
+                                       key: :media,
+                                       file: StringIO.new(chunk)).perform
+          end
+
+          media.close
+
+          Twitter::REST::Request.new(self, :post, 'https://upload.twitter.com/1.1/media/upload.json',
+                                     command: 'FINALIZE', media_id: init[:media_id]).perform
+        end
+      end
+
+      def array_wrap(object)
+        if object.respond_to?(:to_ary)
+          object.to_ary || [object]
+        else
+          [object]
+        end
+      end
+
       def post_retweet(tweet, options)
         response = perform_post("/1.1/statuses/retweet/#{extract_id(tweet)}.json", options)
         Twitter::Tweet.new(response)
       end
+
+      def post_unretweet(tweet, options)
+        response = perform_post("/1.1/statuses/unretweet/#{extract_id(tweet)}.json", options)
+        Twitter::Tweet.new(response)
+      end
     end
   end
 end

data/lib/twitter/rest/undocumented.rb

@@ -33,11 +33,10 @@ module Twitter
       # @rate_limited No
       # @authentication Not required
       # @return [Integer]
-      # @param uri [String, URI] A URI.
+      # @param url [String, URI] A URL.
       # @param options [Hash] A customizable set of options.
-      def tweet_count(uri, options = {})
-        connection = Faraday.new('https://cdn.api.twitter.com', connection_options)
-        connection.get('/1/urls/count.json', options.merge(url: uri.to_s)).body[:count]
+      def tweet_count(url, options = {})
+        HTTP.get('https://cdn.api.twitter.com/1/urls/count.json', params: options.merge(url: url.to_s)).parse['count']
       end
     end
   end

data/lib/twitter/rest/users.rb

@@ -30,11 +30,13 @@ module Twitter
       # @option options [Integer] :end_sleep_time The hour that sleep time should end if it is enabled. The value for this parameter should be provided in {http://en.wikipedia.org/wiki/ISO_8601 ISO8601} format (i.e. 00-23). The time is considered to be in the same timezone as the user's time_zone setting.
       # @option options [String] :time_zone The timezone dates and times should be displayed in for the user. The timezone must be one of the {http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html Rails TimeZone} names.
       # @option options [String] :lang The language which Twitter should render in for this user. The language must be specified by the appropriate two letter ISO 639-1 representation. Currently supported languages are provided by {https://dev.twitter.com/rest/reference/get/help/languages GET help/languages}.
+      # @option options [String] :allow_contributor_request Whether to allow others to include user as contributor. Possible values include 'all' (anyone can include user), 'following' (only followers can include user) or 'none'. Also note that changes to this field require the request also include a current_password value with the user's password to successfully modify this field.
+      # @option options [String] :current_password The user's password. This is only required when modifying the allow_contributor_request field.
       def settings(options = {})
         request_method = options.size.zero? ? :get : :post
         response = perform_request(request_method.to_sym, '/1.1/account/settings.json', options)
         # https://dev.twitter.com/issues/59
-        response.update(trend_location: response.fetch(:trend_location, []).first)
+        response[:trend_location] = response.fetch(:trend_location, []).first
         Twitter::Settings.new(response)
       end
 
@@ -50,7 +52,6 @@ module Twitter
       def verify_credentials(options = {})
         perform_get_with_object('/1.1/account/verify_credentials.json', options, Twitter::User)
       end
-      alias current_user verify_credentials
 
       # Sets which device Twitter delivers updates to for the authenticating user
       #
@@ -78,6 +79,7 @@ module Twitter
       # @option options [String] :url URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
       # @option options [String] :location The city or country describing where the user of the account is located. The contents are not normalized or geocoded in any way. Maximum of 30 characters.
       # @option options [String] :description A description of the user owning the account. Maximum of 160 characters.
+      # @option options [String] :profile_link_color A hex value of the color scheme used for links on user's profile page. Must be a valid hexadecimal value, and may be either three or six characters
       def update_profile(options = {})
         perform_post_with_object('/1.1/account/update_profile.json', options, Twitter::User)
       end
@@ -93,24 +95,7 @@ module Twitter
       # @param options [Hash] A customizable set of options.
       # @option options [Boolean] :tile Whether or not to tile the background image. If set to true the background image will be displayed tiled. The image will not be tiled otherwise.
       def update_profile_background_image(image, options = {})
-        perform_post_with_object('/1.1/account/update_profile_background_image.json', options.merge(image: image), Twitter::User)
-      end
-
-      # Sets one or more hex values that control the color scheme of the authenticating user's profile
-      #
-      # @see https://dev.twitter.com/rest/reference/post/account/update_profile_colors
-      # @rate_limited No
-      # @authentication Requires user context
-      # @raise [Twitter::Error::Unauthorized] Error raised when supplied user credentials are not valid.
-      # @return [Twitter::User] The authenticated user.
-      # @param options [Hash] A customizable set of options.
-      # @option options [String] :profile_background_color Profile background color.
-      # @option options [String] :profile_text_color Profile text color.
-      # @option options [String] :profile_link_color Profile link color.
-      # @option options [String] :profile_sidebar_fill_color Profile sidebar's background color.
-      # @option options [String] :profile_sidebar_border_color Profile sidebar's border color.
-      def update_profile_colors(options = {})
-        perform_post_with_object('/1.1/account/update_profile_colors.json', options, Twitter::User)
+        post_profile_image('/1.1/account/update_profile_background_image.json', image, options)
       end
 
       # Updates the authenticating user's profile image
@@ -125,7 +110,7 @@ module Twitter
       # @param image [File] The avatar image for the profile, base64-encoded. Must be a valid GIF, JPG, or PNG image of less than 700 kilobytes in size. Images with width larger than 500 pixels will be scaled down. Animated GIFs will be converted to a static GIF of the first frame, removing the animation.
       # @param options [Hash] A customizable set of options.
       def update_profile_image(image, options = {})
-        perform_post_with_object('/1.1/account/update_profile_image.json', options.merge(image: image), Twitter::User)
+        post_profile_image('/1.1/account/update_profile_image.json', image, options)
       end
 
       # Returns an array of user objects that the authenticating user is blocking
@@ -140,7 +125,6 @@ module Twitter
       def blocked(options = {})
         perform_get_with_cursor('/1.1/blocks/list.json', options, :users, Twitter::User)
       end
-      deprecate_alias :blocking, :blocked
 
       # Returns an array of numeric user IDs the authenticating user is blocking
       #
@@ -167,17 +151,12 @@ module Twitter
       # @param user [Integer, String, URI, Twitter::User] A Twitter user ID, screen name, URI, or object.
       # @param options [Hash] A customizable set of options.
       def block?(user, options = {})
-        user_id = begin
+        user_id =
           case user
-          when Integer
-            user
-          when String, URI, Addressable::URI
-            user(user).id
-          when Twitter::User
-            user.id
+          when Integer                       then user
+          when String, URI, Addressable::URI then user(user).id
+          when Twitter::User                 then user.id
           end
-        end
-
         blocked_ids(options).collect(&:to_i).include?(user_id)
       end
 
@@ -229,7 +208,7 @@ module Twitter
       def users(*args)
         arguments = Twitter::Arguments.new(args)
         flat_pmap(arguments.each_slice(MAX_USERS_PER_REQUEST)) do |users|
-          perform_post_with_objects('/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
+          perform_get_with_objects('/1.1/users/lookup.json', merge_users(arguments.options, users), Twitter::User)
         end
       end
 
@@ -267,6 +246,7 @@ module Twitter
       # @return [Boolean] true if the user exists, otherwise false.
       # @param user [Integer, String, Twitter::User] A Twitter user ID, screen name, URI, or object.
       def user?(user, options = {})
+        options = options.dup
         merge_user!(options, user)
         perform_get('/1.1/users/show.json', options)
         true
@@ -286,6 +266,7 @@ module Twitter
       # @option options [Integer] :count The number of people to retrieve. Maxiumum of 20 allowed per page.
       # @option options [Integer] :page Specifies the page of results to retrieve.
       def user_search(query, options = {})
+        options = options.dup
         perform_get_with_objects('/1.1/users/search.json', options.merge(q: query), Twitter::User)
       end
 
@@ -337,7 +318,6 @@ module Twitter
         perform_post('/1.1/account/remove_profile_banner.json', options)
         true
       end
-      deprecate_alias :profile_banner_remove, :remove_profile_banner
 
       # Updates the authenticating user's profile banner image
       #
@@ -422,7 +402,6 @@ module Twitter
       def muted(options = {})
         perform_get_with_cursor('/1.1/mutes/users/list.json', options, :users, Twitter::User)
       end
-      deprecate_alias :muting, :muted
 
       # Returns an array of numeric user IDs the authenticating user is muting
       #
@@ -438,6 +417,13 @@ module Twitter
         merge_user!(arguments.options, arguments.pop)
         perform_get_with_cursor('/1.1/mutes/users/ids.json', arguments.options, :ids)
       end
+
+    private
+
+      def post_profile_image(path, image, options)
+        response = Twitter::REST::Request.new(self, :multipart_post, path, options.merge(key: :image, file: image)).perform
+        Twitter::User.new(response)
+      end
     end
   end
 end