Merge pull request the-ethan-hunt#130 from hmangukia/master

Twitter feature enhanced
Arunkumar0258 · Jul 15, 2018 · 5581bdf · 5581bdf
2 parents 428f3bc + 2130518
commit 5581bdf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/windows/activities.md b/windows/activities.md
@@ -80,7 +80,7 @@ List of the things that B.E.N.J.I. can do:
 * Create a file(txt, docx, pptx,xlsx, vsdx and rtf supported)
 * Podcast
 * Calculator
-* Get top 10 tweets
+* Twitter(get top 10 tweets, get list of people you are following)
 
 Keep reading to see how to do all the above mentioned jobs with B.E.N.J.I.
 
@@ -125,9 +125,10 @@ NOTE: All the recorded files will be saved on the desktop. Make sure that the fi
 * "***podcast***". This will redirect you to "CastBox" which is a good source of podcasts.
 * "***calculator***". This will open Calculator.
 * "***exit/over/close/stop*** to exit BENJI.
-* "***get tweets***" get latest 10 tweets from timeline. For this an app is to be registered at https://apps.twitter.com/ (if confused, have a look at https://spring.io/guides/gs/register-twitter-app/). A new file named "twitterCredentials.py" is to be made in the windows folder. Save the consumer key, consumer secret, access token, access token secret with the names consumer_key, consumer_secret, access_token, access_secret repectively in the "twitterCredentials.py"
-
-
+* "***get tweets***" Get latest 10 tweets from timeline. For this an app is to be registered at https://apps.twitter.com/ (if confused, have a look at https://spring.io/guides/gs/register-twitter-app/). A new file named "twitterCredentials.py" is to be made in the windows folder. Save the consumer key, consumer secret, access token, access token secret with the names consumer_key, consumer_secret, access_token, access_secret repectively in the "twitterCredentials.py". Speak/type "get tweets" and top 10 tweets will be shown, also when and by whom it was created.
+* Get latest 10 tweets done by the user. Speak/type "get my tweets" and top 10 tweets done by the user(you) will be shown with the time when it was tweeted
+* You can get a list of everyone you follow from twitter by saying "get list of people I follow on twitter"
+
 >In cases where the commands are separated by '/', use any one of the mentioned commands
 >For example, use either ***What is your name*** or ***Identify Yourself*** or ***Who are you***. Don't type all of them at once.
 

diff --git a/windows/benji.py b/windows/benji.py
@@ -89,10 +89,22 @@ def events(frame,put):
 		auth = OAuthHandler(twitterCredentials.consumer_key, twitterCredentials.consumer_secret)
 		auth.set_access_token(twitterCredentials.access_token, twitterCredentials.access_secret)
 		api = tweepy.API(auth)
-
-		for status in tweepy.Cursor(api.home_timeline).items(10):
-			print("\n", status.text)
-			print("By ", status.user.screen_name, " at ", status.user.created_at)
+		if link[-2] == "my":
+			for tweet in tweepy.Cursor(api.user_timeline).items(10):
+				print("\n", json.dumps(tweet.text))
+				print("on ", tweet.created_at)
+		elif link[1] == "tweets":
+			for status in tweepy.Cursor(api.home_timeline).items(10):
+				print("\n", status.text)
+				print("By ", status.user.screen_name, " at ", status.user.created_at)
+
+	#Get friends from twitter
+	elif link[-3] == "follow" and link[-1] == "twitter":
+		auth = OAuthHandler(twitterCredentials.consumer_key, twitterCredentials.consumer_secret)
+		auth.set_access_token(twitterCredentials.access_token, twitterCredentials.access_secret)
+		api = tweepy.API(auth)
+		for friend in tweepy.Cursor(api.friends).items():
+			print("\nName: ", json.dumps(friend.name), " Username: ", json.dumps(friend.screen_name))
 
     	#Screenshot    
 	elif put.startswith('take screenshot') or put.startswith("screenshot"):