Update search.py

twint/search.py

 from . import datelock, db, get, feed, output
 from bs4 import BeautifulSoup
-import aiohttp
 import asyncio
 import concurrent.futures
 import datetime
@@ -10,17 +9,16 @@ import sys
 class Search:
     def __init__(self, config):
         self.init = -1
-		self.initial = -1
         self.feed = [-1]
         self.count = 0
         self.config = config
         self.d = datelock.Set(self.config)
 
         if self.config.Elasticsearch:
-			print("Indexing to Elasticsearch @ " + str(self.config.Elasticsearch))
+            print("[+] Indexing to Elasticsearch @ " + str(self.config.Elasticsearch))
 
         if self.config.Database:
-			print("Inserting into Database: " + str(self.config.Database))
+            print("[+] Inserting into Database: " + str(self.config.Database))
             self.conn = db.init(self.config.Database)
             if isinstance(self.conn, str):
                 print(str)
@@ -38,25 +36,16 @@ class Search:
         loop.run_until_complete(self.main())
 
     async def Feed(self):
-		connect = aiohttp.TCPConnector(verify_ssl=False)
-		if self.init == -1:
-			ua = {'User-Agent': 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0'}
-		else:
-			ua = ""
-		async with aiohttp.ClientSession(headers=ua, connector=connect) as session:
-			response = await get.Response(session, await get.Url(self.config, self.init).search())
+        url = await get.Url(self.config, self.init).search()
+        response = await get.Request(self.config, url)
         self.feed = []
         try:
-			if self.init == -1:
-				self.feed, self.init = feed.Initial(response)
-			else:
-				self.feed, self.init = feed.Cont(response)
+            self.feed, self.init = feed.Json(response)
         except:
             pass
 
     async def tweets(self):
         await self.Feed()
-		if self.initial != -1: # Temporary fix
         if self.config.Location:
             try:
                 with concurrent.futures.ThreadPoolExecutor(max_workers=20) as executor:
@@ -66,8 +55,8 @@ class Search:
                         self.count += 1
                         link = tweet.find("a", "tweet-timestamp js-permalink js-nav js-tooltip")["href"]
                         url = "https://twitter.com{}".format(link)
-							futures.append(loop.run_in_executor(executor, await get.Tweet(url, self.config, self.conn)))
-						
+                        futures.append(loop.run_in_executor(executor, await get.Tweet(url,
+                            self.config, self.conn)))
                     await asyncio.gather(*futures)
             except:
                 pass
@@ -75,12 +64,11 @@ class Search:
             for tweet in self.feed:
                 self.count += 1
                 await output.Tweets(tweet, "", self.config, self.conn)
-		else:
-			self.initial = 0
 
     async def main(self):
         if self.config.User_id is not None:
-			self.config.Username = await get.Username(self.config.User_id)
+            self.config.Username = await get.Username(self.config)
+
         if self.config.Since and self.config.Until:
             while self.d._since < self.d._until:
                 self.config.Since = str(self.d._until - datetime.timedelta(days=int(self.config.Timedelta)))