Push new files and changes

Author: PokestarFan

.gitignore

@@ -107,3 +107,4 @@ login.py
 blockusers.txt
 posts_written_to.txt
 writes.txt
+replies.txt

delete.py

@@ -0,0 +1,15 @@
+import praw
+from login import reddit
+
+
+def main(limit, count=0):
+	for comment in r.redditor(str(user)).comments.new(limit=limit):
+		comment.delete()
+		count = count + 1
+		print('Finished comment #'+str(count))
+		
+if __name__ == '__main__':
+	limit = input('How many recent comments to delete? Type None for all comments')
+	count = 0
+	main(limit, count)
+	print('Complete')

duplicate.py

@@ -1,53 +1,55 @@
-import re
+import datetime
 import praw
 from login import reddit
 
 def action():
     for sub_id in reddit.subreddit('all').stream.submissions():
         blockeduser = 0
-        item_written_to = 0
-        for item in reddit.inbox.unread(limit=None):
+        for item in reddit.inbox.messages(limit=5):
             if str(item.subject) == 'Remove me from posts':
                 body = str(item.body)
-                yes = re.search('\/u\/[a-zA-Z0-9]+',body)
-                username = yes.group(0)
-                if str(item.author) == username:
-                    with open('blockedusers.txt', 'a') as file:
+                with open('blockusers.txt', 'a+') as file:
+                    if str(item.author) == body and body not in file.read():
                         newstring = username.replace(r'/u/','')
+                        newstring = newstring = '\n'
                         file.write(newstring)
-        with open('posts_written_to.txt','r') as writefile:
-            for id_to_use in writefile.readlines():
-                if item_written_to == 0:
-                    if sub_id == id_to_use:
-                        item_written_to = 1
         duplicates = []
         submission = praw.models.Submission(reddit, id = sub_id)
         with open('blockusers.txt','r') as newfile:
             for line in newfile.readlines():
-                if submission.author == line and blockeduser == 0:
-                    pass
-                else:
+                line = line.strip('\n')
+                if str(submission.author) == line:
                     blockeduser = 1
-        if blockeduser == 0 and item_written_to == 0:
+                else:
+                    pass
+        if blockeduser == 0:
             for duplicate in submission.duplicates():            
                 dup_sub = praw.models.Submission(reddit, id = duplicate)
-                duplicates.append({'title':str(dup_sub.title), 'subreddit':str(dup_sub.subreddit), 'link':str(
-                    dup_sub.shortlink)})
-                if len(duplicates) > 0:
-                    message = 'Here is a list of threads in other subreddits about the same content:\n'
-                    for dup in duplicates:
-                        message = str(message + '\n # [{}]({}) on /r/{}').format(dup['title'], dup['link'], dup['subreddit'])
-                    message = message + '\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/)-[How to block](https://www.reddit.com/r/DuplicatesBot/wiki/index#wiki_block_bot_from_tagging_on_your_posts'
+                if 'ImagesOf' not in str(dup_sub.subreddit) and 'auto' not in str(dup_sub.subreddit):
+                    time = dup_sub.created
+                    time = str(datetime.datetime.fromtimestamp(time))
+                    author = str(dup_sub.author)
+                    if str(submission.author) == author:
+                        author = author + '[author of both threads]'
+                    duplicates.append({'title':str(dup_sub.title), 'subreddit':str(dup_sub.subreddit), 'link':'https://www.reddit.com'+str(dup_sub.permalink), 'time':str(time), 'author':author})
+                    if len(duplicates) > 0:
+                        message = 'Here is a list of threads in other subreddits about the same content:\n'
+                        for dup in duplicates:
+                            message = str(message + '\n * [{}]({}) on /r/{} (created at {} by {})').format(dup['title'], dup['link'], dup['subreddit'], dup['time'], dup['author'])
+                        message = message + '\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](https://www.reddit.com/r/DuplicatesBot/wiki/index#wiki_block_bot_from_tagging_on_your_posts)'
             try:
                 submission.reply(message)
-                with open('writes.log', 'a') as logfile:
-                        logfile.write('Replied to submission id {}'.format(sub_id))
-                        print('Replied to submission id {}'.format(sub_id))
-                        with open('posts_written_to.txt','a') as writefile2:
-                            writefile2.write(sub_id)
-            except(UnboundLocalError):
+                message = ''
+            except:
                 pass
-        
+                message = ''
+            
 
 if __name__ == '__main__':
-    action()
+    while True:
+        try:
+            action()
+        except(KeyboardInterrupt):
+            raise KeyboardInterrupt
+        except:
+            pass

goodbadbot.py

@@ -0,0 +1,27 @@
+import time
+import praw
+from login import reddit
+
+
+def main():
+	while True:
+		for item in reddit.inbox.all(limit=5):
+			with open('replies.txt', 'r') as readfile:
+				for line in readfile.readlines():
+					if line == item:
+						pass
+					else:
+						try:
+							if 'good' and 'bot' in item.body:
+								item.reply('Good human')
+								with open('replies.txt', 'a') as file:
+										file.write(str(item)+'\n')
+							elif 'bad' and 'bot' in item.body:
+								item.reply('bad human')
+								with open('replies.txt', 'a') as file:
+									file.write(str(item)+'\n')
+						except:
+							pass
+
+if __name__ == '__main__':
+	main()