From 80651b11afa4f0dca30ffaf3ea02dc4f53f476b1 Mon Sep 17 00:00:00 2001
From: David Marx <david.marx84@gmail.com>
Date: Thu, 17 May 2018 23:43:34 -0700
Subject: [PATCH] Moved praw functionality into PushshiftAPI class

---
 psaw/PushshiftAPI.py | 19 ++++++++++++-------
 psaw/__init__.py     |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/psaw/PushshiftAPI.py b/psaw/PushshiftAPI.py
index 5efcc37..008af38 100644
--- a/psaw/PushshiftAPI.py
+++ b/psaw/PushshiftAPI.py
@@ -220,20 +220,23 @@ class PushshiftAPIMinimal(object):
         url = self.base_url.format(endpoint=endpoint)
 
 
-class PushshiftAPI(PushshiftAPIMinimal):
+#class PushshiftAPI(PushshiftAPIMinimal):
     # Fill out this class with more user-friendly features later
-    pass
+#    pass
 
-class WithPraw(PushshiftAPIMinimal):
-    def __init__(self, r, *args, **kwargs):
+class PushshiftAPI(PushshiftAPIMinimal):
+    def __init__(self, r=None, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.r = r
+        self._search_func = self._search
+        if r is not None:
+            self._search_func = self._praw_search
 
     def search_comments(self, **kwargs):
-        return self._praw_search(kind='comment', **kwargs)
+        return self._search_func(kind='comment', **kwargs)
 
     def search_submissions(self, **kwargs):
-        return self._praw_search(kind='submission', **kwargs)
+        return self._search_func(kind='submission', **kwargs)
 
     def _praw_search(self, **kwargs):
         prefix = self._thing_prefix[kwargs['kind'].title()]
@@ -241,7 +244,9 @@ class WithPraw(PushshiftAPIMinimal):
         if client_return_batch is False:
             kwargs.pop('return_batch')
 
-        for batch in self._search(return_batch=True, **kwargs):
+        if 'filter' in kwargs:
+            kwargs.pop('filter')
+        for batch in self._search(return_batch=True, filter='id', **kwargs):
             fullnames = [prefix + thing.id for thing in batch]
             praw_batch = self.r.info(fullnames=fullnames)
             if client_return_batch:
diff --git a/psaw/__init__.py b/psaw/__init__.py
index f9bd879..36508c8 100644
--- a/psaw/__init__.py
+++ b/psaw/__init__.py
@@ -4,6 +4,6 @@ Pushshift.io API Wrapper (for reddit.com public comment/submission search)
 https://github.com/dmarx/psaw
 """
 
-from .PushshiftAPI import PushshiftAPI, PushshiftAPIMinimal, WithPraw
+from .PushshiftAPI import PushshiftAPI, PushshiftAPIMinimal
 
 __version__ = '0.0.2'