From: drevicko <subscriptions@drevicko.com>
Date: Fri, 21 Jun 2013 04:03:46 +0000 (+1000)
Subject: added missing search params and search results metadata
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e0fefa2087d0296b440e2bd5603af5de5af7d326;p=tweepy.git

added missing search params and search results metadata
---

diff --git a/tweepy/api.py b/tweepy/api.py
index 7418809..392a0c8 100644
--- 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 3442790..39dddc9 100644
--- 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))