Merge pull request #69 from khast3x/2.5.2

2.5.2 Pull request is the funny number 👀
khast3x · Apr 27, 2020 · 18563da · 18563da
2 parents cd94173 + 52c87fc
commit 18563da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/h8mail/utils/helpers.py b/h8mail/utils/helpers.py
@@ -71,7 +71,7 @@ def print_banner(b_type="intro"):
         print(
             "\t",
             c.fg.lightgrey,
-            "Version " + __version__ + ' - "ROCKSMASSON.1" ',
+            "Version " + __version__ + ' - "ROCKSMASSON.2" ',
             c.reset,
         )
 

diff --git a/h8mail/utils/run.py b/h8mail/utils/run.py
@@ -74,13 +74,11 @@ def target_factory(targets, user_args):
                 # ):
                 #     current_target.get_emailrepio(api_keys["emailrep"])
 
-        if scylla_up:
-            current_target.get_scylla(query)
-
         if api_keys is not None:
             if "hibp" in api_keys and query == "email":
                 current_target.get_hibp3(api_keys["hibp"])
-
+            if "emailrep" in api_keys and query == "email":
+                current_target.get_emailrepio(api_keys["emailrep"])
             if "hunterio" in api_keys and query == "email":
                 current_target.get_hunterio_private(api_keys["hunterio"])
             if "snusbase_token" in api_keys:
@@ -106,6 +104,9 @@ def target_factory(targets, user_args):
                     )
                 else:
                     c.bad_news("Missing Dehashed email")
+        if scylla_up:
+            current_target.get_scylla(query)
+
         # Chasing
         if user_args.chase_limit and counter <= init_targets_len:
             user_args_force_email = user_args

diff --git a/h8mail/utils/version.py b/h8mail/utils/version.py
@@ -1 +1 @@
-__version__ = "2.5.1"
+__version__ = "2.5.2"