From fbc18058bdf4c0e4e0d5298c915ca9ac47dd3498 Mon Sep 17 00:00:00 2001
From: Wesley Kerfoot <wjak56@gmail.com>
Date: Wed, 3 Jul 2019 19:33:57 -0400
Subject: [PATCH] Clean up new modules

---
 deletefb/deletefb.py                             | 11 ++++++++++-
 deletefb/tools/{messages.py => conversations.py} |  4 ++--
 deletefb/types.py                                |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename deletefb/tools/{messages.py => conversations.py} (81%)

diff --git a/deletefb/deletefb.py b/deletefb/deletefb.py
index 6688f4c..ec82c95 100755
--- a/deletefb/deletefb.py
+++ b/deletefb/deletefb.py
@@ -4,6 +4,8 @@ from .tools.config import settings
 from .tools.likes import unlike_pages
 from .tools.login import login
 from .tools.wall import delete_posts
+from .tools.conversations import delete_conversations
+from .tools.comments import delete_comments
 
 import argparse
 import getpass
@@ -21,7 +23,7 @@ def run_delete():
         default="wall",
         dest="mode",
         type=str,
-        choices=["wall", "unlike_pages"],
+        choices=["wall", "unlike_pages", "comments", "conversations"],
         help="The mode you want to run in. Default is `wall' which deletes wall posts"
     )
 
@@ -112,6 +114,13 @@ def run_delete():
 
     elif args.mode == "unlike_pages":
         unlike_pages(driver, args.profile_url)
+
+    elif args.mode == "comments":
+        delete_comments(driver, args.profile_url)
+
+    elif args.mode == "conversations":
+        delete_conversations(driver)
+
     else:
         print("Please enter a valid mode")
         sys.exit(1)
diff --git a/deletefb/tools/messages.py b/deletefb/tools/conversations.py
similarity index 81%
rename from deletefb/tools/messages.py
rename to deletefb/tools/conversations.py
index be4a745..a1870f0 100644
--- a/deletefb/tools/messages.py
+++ b/deletefb/tools/conversations.py
@@ -7,9 +7,9 @@ from selenium.webdriver.support.ui import WebDriverWait
 
 LOG = logger(__name__)
 
-def delete_comments(driver):
+def delete_conversations(driver):
     """
     Remove all conversations within a specified range
     """
 
-    driver.get("https://www.facebook.com/messages/t/"
+    driver.get("https://www.facebook.com/messages/t/")
diff --git a/deletefb/types.py b/deletefb/types.py
index 8cae509..44672bb 100644
--- a/deletefb/types.py
+++ b/deletefb/types.py
@@ -26,8 +26,8 @@ class Comment:
 @attr.s
 class Conversation:
     recipient = attr.ib()
-    last_message_time = attr.ib(factory=timestamp_now)
     name = attr.ib()
+    last_message_time = attr.ib(factory=timestamp_now)
 
 @attr.s
 class Page: