Merge branch 'main' into dev

Whatsapp_Chat_Exporter/__main__.py

@@ -43,7 +43,6 @@ def main():
     parser.add_argument(
         '-i',
         '--ios',
-        '--iphone',
         dest='ios',
         default=False,
         action='store_true',
@@ -475,12 +474,6 @@ def main():
                 db.row_factory = sqlite3.Row
                 contacts(db, data)
     elif args.ios:
-        import sys
-        if "--iphone" in sys.argv:
-            print(
-                "WARNING: The --iphone flag is deprecated and will"
-                "be removed in the future. Use --ios instead."
-            )
         contacts = ios_handler.contacts
         messages = ios_handler.messages
         media = ios_handler.media

Whatsapp_Chat_Exporter/ios_handler.py

@@ -199,7 +199,10 @@ def messages(db, data, media_folder, timezone_offset, filter_date, filter_chat,
                                     FROM ZWAMESSAGE
                                     WHERE ZSTANZAID LIKE '{message.reply}%'""")
                 quoted_content = cursor2.fetchone()
-                message.quoted_data = quoted_content["ZTEXT"] or quoted_content
+                if quoted_content and "ZTEXT" in quoted_content:
+                    message.quoted_data = quoted_content["ZTEXT"] 
+                else:
+                    message.quoted_data = None
             if content["ZMESSAGETYPE"] == 15: # Sticker
                 message.sticker = True