Added setNear and setWithin

got3/manager/TweetCriteria.py

@@ -1,32 +1,37 @@
 class TweetCriteria:
-
+	
 	def __init__(self):
 		self.maxTweets = 0
-
+		self.within = "3000mi"
+
 	def setUsername(self, username):
 		self.username = username
 		return self
-
+		
 	def setSince(self, since):
 		self.since = since
 		return self
-
+	
 	def setUntil(self, until):
 		self.until = until
 		return self
-
+		
 	def setQuerySearch(self, querySearch):
 		self.querySearch = querySearch
 		return self
-
+		
 	def setMaxTweets(self, maxTweets):
 		self.maxTweets = maxTweets
 		return self
 
-	def setLang(self, Lang):
-		self.lang = Lang
+	def setTopTweets(self, topTweets):
+		self.topTweets = topTweets
+		return self
+
+	def setNear(self, near):
+		self.near = near
 		return self
 
-	def setTopTweets(self, topTweets):
- 		self.topTweets = topTweets
- 		return self
+	def setWithin(self, within):
+		self.within = within
+		return self

got3/manager/TweetManager.py

@@ -56,7 +56,8 @@ def getTweets(tweetCriteria, receiveBuffer=None, bufferLength=100, proxy=None):
 						pass
 				tweet.id = id
 				tweet.permalink = 'https://twitter.com' + permalink
-				tweet.username = usernameTweet
+				#tweet.username = usernameTweet
+				tweet.username = tweet.username = re.split('/', permalink)[1]
 
 				tweet.text = txt
 				tweet.date = datetime.datetime.fromtimestamp(dateSec)
@@ -93,6 +94,8 @@ def getJsonReponse(tweetCriteria, refreshCursor, cookieJar, proxy):
 		urlGetData = ''
 		if hasattr(tweetCriteria, 'username'):
 			urlGetData += ' from:' + tweetCriteria.username
+		if hasattr(tweetCriteria, 'near'):
+			urlGetData += "&near:" + tweetCriteria.near + " within:" + tweetCriteria.within
 
 		if hasattr(tweetCriteria, 'since'):
 			urlGetData += ' since:' + tweetCriteria.since