From e18f35cf7f4043c752cd794e241690b6b3ab0928 Mon Sep 17 00:00:00 2001
From: Ryan Luu <ryan.luu@ryanluu.dev>
Date: Sun, 7 Jul 2024 08:19:17 +0000
Subject: [PATCH] Cleanup code

---
 src/instagram_to_discord.py | 39 +++++++++++++++----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/instagram_to_discord.py b/src/instagram_to_discord.py
index c20a530..627e737 100644
--- a/src/instagram_to_discord.py
+++ b/src/instagram_to_discord.py
@@ -11,11 +11,9 @@
 For more details, see https://instaloader.github.io/troubleshooting.html#login-error.
 """
 
-from datetime import datetime
-from itertools import dropwhile, takewhile
-import time
-import requests
+from time import sleep
 from instaloader import Instaloader, Profile
+import requests
 
 L = Instaloader()
 
@@ -28,8 +26,7 @@
 profile = Profile.from_username(
     L.context, TARGET_INSTAGRAM_USER)
 
-print(f"""
-Creating webhook for {profile.full_name} (@{profile.username})
+print(f"""Creating webhook for {profile.full_name} (@{profile.username})
 
 Posts: {profile.mediacount}
 Followers: {profile.followers}
@@ -38,37 +35,36 @@
 
 DISCORD_WEBHOOK_URL = input("Enter your Discord webhook URL: ")
 
-print("\nWebhook URL set to:", DISCORD_WEBHOOK_URL)
-
 
 def send_to_discord(post_details):
     """Send a new Instagram post to Discord using a webhook."""
     icon_url = "https://www.instagram.com/static/images/ico/favicon-192.png/68d99ba29cc8.png"
     data = {
-        "content": f"{post_details.post_url}",
+        "content": f"{post_details['post_url']}",
         "embeds": [
             {
-                "title": post_details.author_fullname,
-                "description": post_details.post_description,
-                "url": post_details.post_url,
+                "title": post_details['author_fullname'],
+                "description": post_details['post_description'],
+                "url": post_details['post_url'],
                 "color": 13500529,
-                "timestamp": post_details.post_timestamp.strftime("%Y-%m-%dT%H:%M:%S"),
+                "timestamp": post_details['post_timestamp'].strftime("%Y-%m-%dT%H:%M:%S"),
                 "author": {
-                    "name": post_details.author_name,
-                    "url": f"https://www.instagram.com/{post_details.author_name}/",
-                    "icon_url": post_details.author_icon_url
+                    "name": post_details['author_name'],
+                    "url": f"https://www.instagram.com/{post_details['author_name']}/",
+                    "icon_url": post_details['author_icon_url']
                 },
                 "footer": {
                     "text": "Instagram",
                     "icon_url": icon_url
                 },
                 "image": {
-                    "url": post_details.image_url
+                    "url": post_details['image_url']
                 }
             }
         ],
         "attachments": []
     }
+
     response = requests.post(DISCORD_WEBHOOK_URL, json=data, timeout=10)
     print("Post sent to Discord:", response.status_code)
 
@@ -76,14 +72,11 @@ def send_to_discord(post_details):
 def check_for_new_posts():
     """Check for new Instagram posts and send them to Discord."""
 
-    print("\nChecking for new posts...")
+    print("Checking for new posts...")
 
     posts = profile.get_posts()
 
-    until = datetime.now()
-    since = until.replace(second=until.second-REFRESH_INTERVAL_SECONDS)
-
-    for post in takewhile(lambda p: p.date > until, dropwhile(lambda p: p.date > since, posts)):
+    for post in posts:
         post_details = {
             "post_url": "https://instagram.com/p/" + post.shortcode + "/",
             "image_url": post.url,
@@ -101,4 +94,4 @@ def check_for_new_posts():
 
 while __name__ == "__main__":
     check_for_new_posts()
-    time.sleep(REFRESH_INTERVAL_SECONDS)
+    sleep(REFRESH_INTERVAL_SECONDS)