wassname/psaw
1
0
Fork 0
mirror of https://github.com/wassname/psaw.git synced 2026-09-09 11:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added support for /reddit/submission/comment_ids/ endpoint

Browse Source
This commit is contained in:
David Marx
2018-05-18 00:11:02 -07:00
parent 80651b11af
commit 9bbec1d700
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
psaw/PushshiftAPI.py
+15 -13
View File
@@ -143,7 +143,7 @@ class PushshiftAPIMinimal(object):
if 'created_utc' not in payload['filter']:
payload['filter'].append('created_utc')
def _get(self, url, payload={}, endpoint='search'):
def _get(self, url, payload={}):
i, success = 0, False
while (not success) and (i<self.max_retries):
self._impose_rate_limit(i)
@@ -208,17 +208,6 @@ class PushshiftAPIMinimal(object):
# For paging.
self.payload['before'] = thing.created_utc
def search_submissions(self, **kwargs):
return self._search(kind='submission', **kwargs)
def search_comments(self, **kwargs):
return self._search(kind='comment', **kwargs)
def get_submission_comment_ids(self, submission_id, **kwargs):
self.payload = copy.deepcopy(kwargs)
endpoint = 'reddit/submission/comment_ids'
url = self.base_url.format(endpoint=endpoint)
#class PushshiftAPI(PushshiftAPIMinimal):
# Fill out this class with more user-friendly features later
@@ -238,6 +227,13 @@ class PushshiftAPI(PushshiftAPIMinimal):
def search_submissions(self, **kwargs):
return self._search_func(kind='submission', **kwargs)
def _get_submission_comment_ids(self, submission_id, **kwargs):
self.payload = copy.deepcopy(kwargs)
endpoint = 'reddit/submission/comment_ids/{}'.format(submission_id)
url = self.base_url.format(endpoint=endpoint)
print(url)
return self._get(url, self.payload)
def _praw_search(self, **kwargs):
prefix = self._thing_prefix[kwargs['kind'].title()]
client_return_batch = kwargs.get('return_batch')
@@ -246,7 +242,13 @@ class PushshiftAPI(PushshiftAPIMinimal):
if 'filter' in kwargs:
kwargs.pop('filter')
for batch in self._search(return_batch=True, filter='id', **kwargs):
gen = self._search(return_batch=True, filter='id', **kwargs)
if kwargs.get('kind') == 'comment' and kwargs.get('submission_id'):
gen = self._get_submission_comment_ids(**kwargs)
for batch in gen:
fullnames = [prefix + thing.id for thing in batch]
praw_batch = self.r.info(fullnames=fullnames)
if client_return_batch: