Finally done

Author: PokestarFan

delete.py

@@ -1,30 +1,33 @@
-import praw
-from modules.logger import setup_logger
-from modules.login import reddit
-from modules.footer import footer
 import logging
 import time
 
+from modules.logger import setup_logger
+from modules.login import reddit
+
 logger = setup_logger('user_removed_comments')
 
 
 def main():
-	try:
-		for item in reddit.inbox.stream():
-			logger.debug('On item {}'.format(str(item)))
-			try:
-				if 'delete' in item.body.lower():
-					item.parent().delete()
-					logging.info('Comment {} removed'.format(str(item.parent())))
-					item.author.message('Removal of comment {}'.format(str(item.parent())),'The top level post has been removed.')
-			except:
-				logging.debug('Item {} skipped'.format(str(item)))
-	except(KeyboardInterrupt):
-		raise KeyboardInterrupt
-	except:
-		logging.error('Error!', exc_info=True)
-		main()
-		
+    try:
+        for item in reddit.inbox.stream():
+            logger.debug('On item {}'.format(str(item)))
+            try:
+                if 'delete' in item.body.lower() and item.author == item.submission.author:
+                    item.parent().delete()
+                    logging.info('Comment {} removed'.format(str(item.parent())))
+                    item.author.message('Removal of comment {}'.format(str(item.parent())),
+                                        'The top level post has been removed.')
+            except AttributeError:
+                pass
+            except:
+                logging.debug('Item {} skipped'.format(str(item)))
+    except(KeyboardInterrupt):
+        raise KeyboardInterrupt
+    except:
+        logging.error('Error!', exc_info=True)
+        main()
+
+
 while True:
-	main()
-	time.sleep(30)
+    main()
+    time.sleep(30)

duplicate.py

@@ -3,18 +3,20 @@
 
 import praw
 import prawcore
+from markdowntable import Table as ta
 from pokestarfansloggingsetup import setup_logger
 
 from modules.login import reddit
-from modules.table import starter
 
 logger = setup_logger('duplicates')
 
 
 # noinspection PyBroadException
 def generate_and_reply(submission):
-    footer = '\n\n----\n\n ^^I ^^am ^^a ^^bot  ^^[FAQ](https://www.reddit.com/r/DuplicatesBot/wiki/index)-[' \
-                      'Code](https://github.com/PokestarFan/DuplicateBot)-[Bugs](' \
+    starter = ta('Title')
+    starter.all_columns('Subreddit', 'Author', 'Time', 'Karma')
+    footer = '\n\n----\n\n I am a bot [FAQ](https://www.reddit.com/r/DuplicatesBot/wiki/index)-[' \
+             'Code](https://github.com/PokestarFan/DuplicateBot)-[Bugs](' \
                       'https://www.reddit.com/r/DuplicatesBot/comments/6ypgmx/bugs_and_problems/)-[Suggestions](' \
                       'https://www.reddit.com/r/DuplicatesBot/comments/6ypg85/suggestion_for_duplicatesbot/)-[Block ' \
                       'user (op only)' \
@@ -23,7 +25,7 @@ def generate_and_reply(submission):
                       '={user})-[Block from subreddit (mods only)](' \
                       'https://www.reddit.com/message/compose/?to=DuplicatesBotBlocker&subject=remove%20subreddit' \
                       '&message={sub})\n' \
-                      '\n^^Now ^^you ^^can ^^remove ^^the ^^comment ^^by ^^replying ^^delete! '.format(user=
+             '\nNow you can remove the comment by replying delete! '.format(user=
     str(
         submission.author), sub=str(submission.subreddit))
     global message
@@ -36,7 +38,7 @@ def generate_and_reply(submission):
         if str(submission.author) == author:
             author = author + ' [author of both threads]'
         duplicates.append(['[{}]({})'.format(str(dup_sub.title), 'https://www.reddit.com' + str(dup_sub.permalink)),
-                           str(dup_sub.subreddit), author, str(time), str(dup_sub.score)])
+                           '/r/' + str(dup_sub.subreddit), author, str(time), str(dup_sub.score)])
         if len(duplicates) > 0:
             message = 'Here is a list of threads in other subreddits about the same content:\n'
             for dup in duplicates:
@@ -45,28 +47,24 @@ def generate_and_reply(submission):
             message += '\n' + footer
     try:
         submission.reply(message)
-        logger.info('Message posted on {}'.format(sub_id))
+        logger.info('Message posted on {}'.format(str(submission)))
         logger.debug('Message: {}'.format(message))
-        message = ''
-    except praw.exceptions.APIException:
+    except(praw.exceptions.APIException, UnboundLocalError):
         logger.debug('Submission {} has been skipped due to missing text.'.format(sub_id))
-        message = ''
     except prawcore.exceptions.Forbidden:
         logger.debug('You are blocked on /r/{}'.format(str(submission.subreddit)))
-        message = ''
     except AssertionError:
         logger.debug('Assertion Error occured! Printing message and traceback.')
         logger.debug(message + str(len(message)), exc_info=True)
-        message = ''
     except(KeyboardInterrupt, SystemExit):
         raise
     except Exception:
         logger.error('Error occurred!', exc_info=True)
-        message = ''
     except:
         logger.critical(
             'Massive Error occurred! Not part of the Exception, KeyboardInterrupt or SystemExit exceptions. Fix ASAP.',
             exc_info=True)
+    finally:
         message = ''
 
 

entriesadder.py

@@ -1,6 +1,7 @@
-import praw
-from pokestarfansloggingsetup import setup_logger
 import logging
+
+from pokestarfansloggingsetup import setup_logger
+
 from modules.entrylogin import reddit
 
 logger = setup_logger('usersubblocker')
@@ -39,6 +40,13 @@ def strip_message(message):
 
 
 def check_for_messages(reddit):
-    for message in reddit.inbox.unread(mark_read=True):
-        strip_message(message)
-        reddit.inbox.mark_read(message)
+    try:
+        for message in reddit.inbox.unread(mark_read=True):
+            strip_message(message)
+            reddit.inbox.mark_read(message)
+    except Exception:
+        logging.error('error!', exc_info=True)
+
+
+while True:
+    check_for_messages(reddit)