From b110dfc232bfae22d459353e2273b430ba90f27f Mon Sep 17 00:00:00 2001
From: Thomas Wu <orangeleaves@Thomass-MBP.ht.home>
Date: Fri, 2 Sep 2022 17:16:53 -0400
Subject: [PATCH] removed try-catch + edited guild_id ternary operator

---
 python/mongo_client.py | 37 +++++++++++++++++--------------------
 python/utils.py        |  2 +-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/python/mongo_client.py b/python/mongo_client.py
index 492983e..253952c 100644
--- a/python/mongo_client.py
+++ b/python/mongo_client.py
@@ -179,26 +179,23 @@ async def add_file(self, message: discord.Message) -> int:
             return 0
         files_coll = self.db.files
         files_added = 0
-        try:
-            # We've already added the files in this message id
-            num_docs = await files_coll.count_documents({"message_id": message.id}, limit=1)
-            if num_docs:
-                return True
-            for file in message.attachments:
-                # We've already added this file
-                n_doc = await files_coll.count_documents({"_id": file.id}, limit=1)
-                if n_doc:
-                    continue
-                file_info = utils.attachment_to_mongo_dict(message, file)
-                res = await files_coll.insert_one(file_info)
-                if res.acknowledged:
-                    logger.info(f"Inserted new file: {res.inserted_id} with file id: {file.id}")
-                    files_added += 1
-                else:
-                    logger.error(f"Failed to insert file with _id: {file.id}")
-            return files_added
-        except:
-            return 0
+        # We've already added the files in this message id
+        num_docs = await files_coll.count_documents({"message_id": message.id}, limit=1)
+        if num_docs:
+            return True
+        for file in message.attachments:
+            # We've already added this file
+            n_doc = await files_coll.count_documents({"_id": file.id}, limit=1)
+            if n_doc:
+                continue
+            file_info = utils.attachment_to_mongo_dict(message, file)
+            res = await files_coll.insert_one(file_info)
+            if res.acknowledged:
+                logger.info(f"Inserted new file: {res.inserted_id} with file id: {file.id}")
+                files_added += 1
+            else:
+                logger.error(f"Failed to insert file with _id: {file.id}")
+        return files_added
 
     async def remove_file(self, ids: List[str], field: str = "_id") -> bool:
         """
diff --git a/python/utils.py b/python/utils.py
index 8fc60a6..98cd12b 100644
--- a/python/utils.py
+++ b/python/utils.py
@@ -255,7 +255,7 @@ def attachment_to_mongo_dict(message: discord.Message, file: discord.Attachment)
         "author": message.author.id,
         "author_name": message.author.name + '#' + str(message.author.discriminator),
         "channel_id": message.channel.id,
-        "guild_id": message.guild.id if message.guild.id is not None else -1,
+        "guild_id": message.guild.id if message.guild is not None else -1,
         "content": message.content,
         "created_at": message.created_at,
         "file_name": file.filename,