Skip to content

Commit

Permalink
Merge pull request #47 from Datalux/development
Browse files Browse the repository at this point in the history
v 0.9
  • Loading branch information
Datalux authored Sep 8, 2020
2 parents 4328caa + fb069af commit 72b8b98
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 123 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![](https://img.shields.io/badge/version-0.8-green)](https://github.com/Datalux/Osintgram/releases/tag/0.8)
[![](https://img.shields.io/badge/version-0.9-green)](https://github.com/Datalux/Osintgram/releases/tag/0.9)
[![](https://img.shields.io/badge/license-GPLv3-blue)](https://img.shields.io/badge/license-GPLv3-blue)
[![](https://img.shields.io/badge/language-Python3-red)](https://img.shields.io/badge/language-Python3-red)

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

[**Latest version**](https://github.com/Datalux/Osintgram/releases/tag/0.8) |
[**Latest version**](https://github.com/Datalux/Osintgram/releases/tag/0.9) |
[CHANGELOG](doc/CHANGELOG.md)

## Tools
Expand Down
11 changes: 11 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [0.9](https://github.com/Datalux/Osintgram/releases/tag/0.9)

**Enhancements**
- Send a follow request if user not following target (#44)
- Added new `fwingsemail` command (#50)
- Added autocomplete with TAB (07e0fe8)

**Bug fixes**
- Decoding error of response [bug #46] (f9c5f73)
- `stories` command not working (#49)

## [0.8](https://github.com/Datalux/Osintgram/releases/tag/0.8)

**Enhancements**
Expand Down
6 changes: 5 additions & 1 deletion doc/COMMANDS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
- comments Get total comments of target's posts
- followers Get target followers
- followings Get users followed by target
- fwersemail Get email of users followed by target
- fwersemail Get email of target followers
- fwingsemail Get email of users followed by target
- hashtags Get hashtags used by target
- info Get target info
- likes Get total likes of target's posts
Expand Down Expand Up @@ -48,6 +49,9 @@ Return a list with users followed by target with id, nickname and full name
### fwersemail
Return a list of emails of target followers

### fwingsemail
Return a list of emails of user followed by target

### hashtags
Return a list with all hashtag used by target in his photos

Expand Down
22 changes: 21 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
from src import printcolors as pc
import sys
import signal
import readline

commands = ["quit", "exit", "list", "help", "addrs", "captions", "comments", "followers",
"followings", "fwersemail", "fwingsemail", "hashtags", "info", "likes",
"mediatype", "photodes", "photos", "propic", "stories", "tagged", "target",
"wcommented", "wtagged"]


def printlogo():
Expand All @@ -16,7 +22,7 @@ def printlogo():
pc.printout("\_______ /____ >__|___| /__| \___ /|__| (____ /__|_| /\n", pc.YELLOW)
pc.printout(" \/ \/ \/ /_____/ \/ \/ \n", pc.YELLOW)
print('\n')
pc.printout("Version 0.8 - Developed by Giuseppe Criscione - 2019\n\n", pc.YELLOW)
pc.printout("Version 0.9 - Developed by Giuseppe Criscione - 2019\n\n", pc.YELLOW)
pc.printout("Type 'list' to show all allowed commands\n")
pc.printout("Type 'FILE=y' to save results to files like '<target username>_<command>.txt (deafult is disabled)'\n")
pc.printout("Type 'FILE=n' to disable saving to files'\n")
Expand All @@ -41,6 +47,8 @@ def cmdlist():
pc.printout("followings\t")
print("Get users followed by target")
pc.printout("fwersemail\t")
print("Get email of target followers")
pc.printout("fwingsemail\t")
print("Get email of users followed by target")
pc.printout("hashtags\t")
print("Get hashtags used by target")
Expand Down Expand Up @@ -73,7 +81,17 @@ def signal_handler(sig, frame):
sys.exit(0)


def completer(text, state):
options = [i for i in commands if i.startswith(text)]
if state < len(options):
return options[state]
else:
return None


signal.signal(signal.SIGINT, signal_handler)
readline.parse_and_bind("tab: complete")
readline.set_completer(completer)

printlogo()

Expand Down Expand Up @@ -108,6 +126,8 @@ def signal_handler(sig, frame):
api.get_followings()
elif cmd == 'fwersemail':
api.get_fwersemail()
elif cmd == 'fwingsemail':
api.get_fwingsemail()
elif cmd == "hashtags":
api.get_hashtags()
elif cmd == "info":
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
requests==2.24.0
requests-toolbelt==0.9.1
moviepy==0.2.2.11
geopy==1.11
prettytable==0.7.2
instagram-private-api==1.6.0
Loading

0 comments on commit 72b8b98

Please sign in to comment.