Skip to content

Commit 72b8b98

Browse files
authored
Merge pull request #47 from Datalux/development
v 0.9
2 parents 4328caa + fb069af commit 72b8b98

File tree

6 files changed

+209
-123
lines changed

6 files changed

+209
-123
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![](https://img.shields.io/badge/version-0.8-green)](https://github.com/Datalux/Osintgram/releases/tag/0.8)
1+
[![](https://img.shields.io/badge/version-0.9-green)](https://github.com/Datalux/Osintgram/releases/tag/0.9)
22
[![](https://img.shields.io/badge/license-GPLv3-blue)](https://img.shields.io/badge/license-GPLv3-blue)
33
[![](https://img.shields.io/badge/language-Python3-red)](https://img.shields.io/badge/language-Python3-red)
44

@@ -16,7 +16,8 @@ Osintgram offers an interactive shell to perform analysis on Instagram account o
1616
- comments Get total comments of target's posts
1717
- followers Get target followers
1818
- followings Get users followed by target
19-
- fwersemail Get email of users followed by target
19+
- fwersemail Get email of target followers
20+
- fwingsemail Get email of users followed by target
2021
- hashtags Get hashtags used by target
2122
- info Get target info
2223
- likes Get total likes of target's posts
@@ -31,7 +32,7 @@ Osintgram offers an interactive shell to perform analysis on Instagram account o
3132
```
3233
You can find detailed commands usage [here](doc/COMMANDS.md).
3334

34-
[**Latest version**](https://github.com/Datalux/Osintgram/releases/tag/0.8) |
35+
[**Latest version**](https://github.com/Datalux/Osintgram/releases/tag/0.9) |
3536
[CHANGELOG](doc/CHANGELOG.md)
3637

3738
## Tools

doc/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## [0.9](https://github.com/Datalux/Osintgram/releases/tag/0.9)
4+
5+
**Enhancements**
6+
- Send a follow request if user not following target (#44)
7+
- Added new `fwingsemail` command (#50)
8+
- Added autocomplete with TAB (07e0fe8)
9+
10+
**Bug fixes**
11+
- Decoding error of response [bug #46] (f9c5f73)
12+
- `stories` command not working (#49)
13+
314
## [0.8](https://github.com/Datalux/Osintgram/releases/tag/0.8)
415

516
**Enhancements**

doc/COMMANDS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
- comments Get total comments of target's posts
66
- followers Get target followers
77
- followings Get users followed by target
8-
- fwersemail Get email of users followed by target
8+
- fwersemail Get email of target followers
9+
- fwingsemail Get email of users followed by target
910
- hashtags Get hashtags used by target
1011
- info Get target info
1112
- likes Get total likes of target's posts
@@ -48,6 +49,9 @@ Return a list with users followed by target with id, nickname and full name
4849
### fwersemail
4950
Return a list of emails of target followers
5051

52+
### fwingsemail
53+
Return a list of emails of user followed by target
54+
5155
### hashtags
5256
Return a list with all hashtag used by target in his photos
5357

main.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
from src import printcolors as pc
77
import sys
88
import signal
9+
import readline
10+
11+
commands = ["quit", "exit", "list", "help", "addrs", "captions", "comments", "followers",
12+
"followings", "fwersemail", "fwingsemail", "hashtags", "info", "likes",
13+
"mediatype", "photodes", "photos", "propic", "stories", "tagged", "target",
14+
"wcommented", "wtagged"]
915

1016

1117
def printlogo():
@@ -16,7 +22,7 @@ def printlogo():
1622
pc.printout("\_______ /____ >__|___| /__| \___ /|__| (____ /__|_| /\n", pc.YELLOW)
1723
pc.printout(" \/ \/ \/ /_____/ \/ \/ \n", pc.YELLOW)
1824
print('\n')
19-
pc.printout("Version 0.8 - Developed by Giuseppe Criscione - 2019\n\n", pc.YELLOW)
25+
pc.printout("Version 0.9 - Developed by Giuseppe Criscione - 2019\n\n", pc.YELLOW)
2026
pc.printout("Type 'list' to show all allowed commands\n")
2127
pc.printout("Type 'FILE=y' to save results to files like '<target username>_<command>.txt (deafult is disabled)'\n")
2228
pc.printout("Type 'FILE=n' to disable saving to files'\n")
@@ -41,6 +47,8 @@ def cmdlist():
4147
pc.printout("followings\t")
4248
print("Get users followed by target")
4349
pc.printout("fwersemail\t")
50+
print("Get email of target followers")
51+
pc.printout("fwingsemail\t")
4452
print("Get email of users followed by target")
4553
pc.printout("hashtags\t")
4654
print("Get hashtags used by target")
@@ -73,7 +81,17 @@ def signal_handler(sig, frame):
7381
sys.exit(0)
7482

7583

84+
def completer(text, state):
85+
options = [i for i in commands if i.startswith(text)]
86+
if state < len(options):
87+
return options[state]
88+
else:
89+
return None
90+
91+
7692
signal.signal(signal.SIGINT, signal_handler)
93+
readline.parse_and_bind("tab: complete")
94+
readline.set_completer(completer)
7795

7896
printlogo()
7997

@@ -108,6 +126,8 @@ def signal_handler(sig, frame):
108126
api.get_followings()
109127
elif cmd == 'fwersemail':
110128
api.get_fwersemail()
129+
elif cmd == 'fwingsemail':
130+
api.get_fwingsemail()
111131
elif cmd == "hashtags":
112132
api.get_hashtags()
113133
elif cmd == "info":

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
requests==2.24.0
22
requests-toolbelt==0.9.1
3-
moviepy==0.2.2.11
43
geopy==1.11
54
prettytable==0.7.2
65
instagram-private-api==1.6.0

0 commit comments

Comments
 (0)