Skip to content

Commit bd98b02

Browse files
Merge pull request #18 from killswitch-GUI/dev-domain
Dev domain- Add in domain checking
2 parents b42bafb + 3fb48b8 commit bd98b02

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

Common/SimplyEmail.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
UserAgent: (Mozilla/5.0 (Windows; U; Windows NT 6.0;en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6
33
SaveFile: Email_List.txt
44
HtmlFile: Email_List.html
5-
Version: v1.4
5+
Version: v1.4.1
66
VersionRepoCheck: Yes
77
VersionRepoCheckLocation: https://raw.githubusercontent.com/killswitch-GUI/SimplyEmail/master/License/LICENSE-Version
88

Common/TaskController.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def CleanResults(self, domain, scope=False):
213213
SecondList.append(item)
214214
else:
215215
for item in self.ConsumerList:
216-
if domain.lower() in item.lower():
216+
if domain.lower() in helpers.split_email(item)[-1]:
217217
SecondList.append(item)
218218
FinalList = []
219219
HtmlFinalList = []
@@ -225,7 +225,7 @@ def CleanResults(self, domain, scope=False):
225225
HtmlSecondList.append(item)
226226
else:
227227
for item in self.HtmlList:
228-
if domain.lower() in item.lower():
228+
if domain.lower() in helpers.split_email(item)[-1]:
229229
HtmlSecondList.append(item)
230230
# Iter over all items in the list
231231
for item in SecondList:

Helpers/helpers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
import logging
66
import time
77
import magic
8+
import configparser
9+
import collections
810
from fake_useragent import UserAgent
911

10-
1112
def color(string, status=True, warning=False, bold=True, blue=False, firewall=False):
1213
# Change text color for the linux terminal, defaults to green.
1314
# Set "warning=True" for red.
@@ -65,6 +66,10 @@ def DirectoryListing(directory):
6566
dirs.append(path)
6667
return dirs
6768

69+
def split_email(email):
70+
email = email.lower()
71+
se = email.split("@")
72+
return se
6873

6974
def getua():
7075
# gets a random useragent and returns the UA

License/LICENSE-Version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.4
1+
v1.4.1

0 commit comments

Comments
 (0)