blacklist.txt.sample

@@ -1,2 +1,3 @@
 someone@trolling.com
-someone@apple.com
+someone@apple.com
+jbrander@openmailbox.org

configuration.py

@@ -4,6 +4,7 @@ import json
 settings = {
     'subscribersFile': './subscribers.json',
     'listName': None,
+    'blacklistFile': './blacklist.txt',
     'debug': False,
     'logFile': './hackymod.log',
     'listContactEmail': None,

init.sh

@@ -8,4 +8,4 @@ cp blacklist.txt.sample blacklist.txt
 echo "[OK] Files created"
 echo "  [-] Put your settings on settings.json"
 echo "  [-] Put your list's subscribers on subscribers.json following the given format"
-echo "  [-] Put the moderated emails on listanegra.txt (one email per line)"
+echo "  [-] Put the moderated emails on blacklist.txt (one email per line)"

main.py

@@ -10,11 +10,10 @@ def main():
     loadConfiguration('./settings.json')
     initLogs(settings['logFile'], debug=settings['debug'])
 
-
     users = getSubscribers(settings['subscribersFile'])
+
     mod = HackyMod(users=users,
-#        blacklist=[],
-        blacklistFile=['blacklistFile'],
+        blacklistFile=settings['blacklistFile'],
         listName=settings['listName'],
         listContactEmail=settings['listContactEmail'],
         moderatorEmail=settings['moderatorEmail'],

sympa/mail.py

@@ -56,9 +56,9 @@ def getEmailsFromUser(fromEmail, userEmail, password, imapServer, imapPort):
 
         content = content.decode('utf-8')
         if sender.find(fromEmail) != -1:
-            print("""Subject: %s
-                From: %s
-                """ % (subject, sender))
+            print('     Subject: %s' % subject)
+            print('     From: %s' % sender)
+
             result.append({
                 'subject': subject,
                 'from': sender,
@@ -80,12 +80,10 @@ def concatenateMultipartEmail(emailMessage):
 
 def getModerationData(emailContent='', listName='', senderEmail=''):
 
-    # agregado para probrar
-    print('######################################')
-    print('##### Message body from %s ######' % senderEmail)
-    print(' %s ' % emailContent)
-    print('###### END OF BODY####################')
-    # ---
+    # print('######################################')
+    # print('##### Message body from %s ######' % senderEmail)
+    # print(' %s ' % emailContent)
+    # print('###### END OF BODY####################')
 
     MODERATION_CODE_PATTERN = 'DISTRIBUTE %s' % listName
 

sympa/mod.py

@@ -32,12 +32,14 @@ class HackyMod:
         return False
 
     def __isUserInBlackList(self, email):
-        #blacklist = self.blacklist
         # Added a blacklist file (testing)
         blf = open(self.blacklistFile, 'r')
-        blacklist = blf.reeadlines()
+        blacklist = blf.readlines()
 
         for usr in blacklist:
+            # cleaning newline characters
+            usr = usr.replace('\n', '')
+            usr = usr.replace('\r', '')
             if usr == email:
                 return True
         return False