added missing search params and search results metadata

diff --git a/tweepy/api.py b/tweepy/api.py
index 74188093d77fc78424188cbd0e073a0059a0b988..392a0c82dbb125e12ab2c6906cff2c0f5e3386c8 100644 (file)
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@ -630,7 +630,7 @@ class API(object):
     search = bind_api(
         path = '/search/tweets.json',
         payload_type = 'search_results',
-        allowed_param = ['q', 'lang', 'locale', 'since_id', 'geocode', 'show_user', 'max_id', 'since', 'until', 'result_type']
+        allowed_param = ['q', 'lang', 'locale', 'since_id', 'geocode', 'max_id', 'since', 'until', 'result_type', 'count', 'include_entities', 'from', 'to', 'source']
     )
 
     """ trends/daily """

diff --git a/tweepy/models.py b/tweepy/models.py
index 34427900ee3667fb55f1af24183aa774af80e689..39dddc93b0aeeef8a00197c2976e6971c8ceb4f0 100644 (file)
--- a/tweepy/models.py
+++ b/tweepy/models.py
@@ -238,6 +238,8 @@ class SearchResults(ResultSet):
         results.refresh_url = metadata.get('refresh_url')
         results.completed_in = metadata.get('completed_in')
         results.query = metadata.get('query')
+        results.count = metadata.get('count')
+        results.next_results = metadata.get('next_results')
 
         for status in json['statuses']:
             results.append(Status.parse(api, status))