igmapper 1.1.0__tar.gz → 1.2.0__tar.gz

{igmapper-1.1.0/igmapper.egg-info → igmapper-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: igmapper
-Version: 1.1.0
+Version: 1.2.0
 Summary: Unofficial Instagram API to request available data
 Author: lucasoal
 License: MIT

{igmapper-1.1.0 → igmapper-1.2.0}/igmapper/client.py

@@ -2,7 +2,8 @@ import json
 import subprocess
 import urllib.parse
 
-from .models import FeedData, ProfileData, CommentsData
+import requests
+
 from .session import InstagramSession
 
 
@@ -10,6 +11,7 @@ class InstaClient:
     def __init__(self, csrftoken, ds_user_id, sessionid, proxy=None, use_curl=False):
         self.state = InstagramSession(csrftoken, ds_user_id, sessionid, proxy=proxy)
         self.use_curl = use_curl
+        self.csrftoken = csrftoken
 
     def _execute_request(self, method, url, params=None, data=None, extra_headers=None):
         headers = {}
@@ -20,7 +22,9 @@ class InstaClient:
             url = f"{url}?{urllib.parse.urlencode(params)}"
 
         if not self.use_curl:
-            return self.state.request_on_session(method, url, data=data, headers=headers if headers else None)
+            return self.state.request_on_session(
+                method, url, data=data, headers=headers if headers else None
+            )
 
         return self._curl_request(method, url, data=data, extra_headers=headers)
 
@@ -72,72 +76,72 @@ class InstaClient:
         status = 200 if result.returncode == 0 else 500
         return MockResponse(result.stdout, status)
 
-    def get_profile_info(self, username: str, return_raw: bool = False):
+    def get_profile_info(self, username: str, lsd=None, doc_id=None):
+        # 1º - FUNCIONA COM TODOS PERFIS, MENOS BUSINESS
         url = "https://www.instagram.com/api/v1/users/web_profile_info/"
         res = self._execute_request("GET", url, params={"username": username})
 
         if res.status_code == 200:
             data = res.json()
             if data.get("status") != "fail" and data.get("data", {}).get("user"):
-                return data if return_raw else ProfileData.parse_instagram_json(data)
+                return data
+
+        # 2º - USANDO GRAPHQL (caso o 1 dê errado, pode ser perfil business)
+        user_id = self.get_feed(username)["user"].get("pk", None)
+        url = "https://www.instagram.com/api/graphql"
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "x-csrftoken": self.csrftoken,
+            "x-fb-lsd": lsd,
+        }
+        payload_vars = {
+            "enable_integrity_filters": True,
+            "id": user_id,
+            "__relay_internal__pv__PolarisCASB976ProfileEnabledrelayprovider": False,
+            "__relay_internal__pv__PolarisCannesGuardianExperienceEnabledrelayprovider": True,
+            "__relay_internal__pv__PolarisLongformEnabledrelayprovider": False,
+            "__relay_internal__pv__PolarisRepostsConsumptionEnabledrelayprovider": True,
+            "__relay_internal__pv__PolarisShortDramaEnabledrelayprovider": False,
+            "__relay_internal__pv__PolarisWebSchoolsEnabledrelayprovider": False,
+        }
+        payload = urllib.parse.urlencode(
+            {"doc_id": doc_id, "lsd": lsd, "variables": json.dumps(payload_vars)}
+        )
 
-        feed_url = f"https://www.instagram.com/api/v1/feed/user/{username}/username/"
-        feed_res = self._execute_request("GET", feed_url, params={"count": 1})
+        res = requests.post(url, headers=headers, data=payload)
 
-        if feed_res.status_code == 200:
-            feed_data = feed_res.json()
-            if feed_data.get("user"):
-                return feed_data if return_raw else ProfileData.parse_instagram_json(feed_data)
+        if res.status_code == 200:
+            data = res.json()
+            if data.get("status") != "fail":
+                return data
 
         return None
 
-    def get_feed(self, username: str, max_id: str = "", return_raw: bool = False):
+    def get_feed(self, username: str, max_id: str = ""):
         url = f"https://www.instagram.com/api/v1/feed/user/{username}/username/"
         params = {"count": 33, "max_id": max_id}
 
-        response = self._execute_request("GET", url, params=params)
-
-        if response.status_code != 200:
-            return None
+        res = self._execute_request("GET", url, params=params)
 
-        data = response.json()
-
-        if return_raw:
-            return data
-
-        items = data.get("items", [])
-        posts = [FeedData.parse_item(item) for item in items]
+        if res.status_code == 200:
+            data = res.json()
+            if data.get("status") != "fail":
+                return data
 
-        return FeedData(
-            posts=posts,
-            next_max_id=data.get("next_max_id"),
-            num_results=data.get("num_results", 0),
-            more_available=data.get("more_available", False),
-        )
+        return None
 
-    def get_comments(self, media_id: str, next_min_id: str = None, return_raw: bool = False):
+    def get_comments(self, media_id: str, next_min_id: str = None):
         url = f"https://www.instagram.com/api/v1/media/{media_id}/comments/"
 
         params = {"can_support_threading": "true"}
         if next_min_id:
             params["min_id"] = next_min_id
 
-        response = self._execute_request("GET", url, params=params)
-
-        if response.status_code != 200:
-            return None
-
-        data = response.json()
-
-        if return_raw:
-            return data
+        res = self._execute_request("GET", url, params=params)
 
-        comments_data = data.get("comments", [])
-        comments = [CommentsData.parse_item(item) for item in comments_data]
+        if res.status_code == 200:
+            data = res.json()
+            if data.get("status") != "fail":
+                return data
 
-        return CommentsData(
-            comments=comments,
-            next_max_id=data.get("next_min_id"),
-            num_results=len(comments),
-            more_available=data.get("has_more_comments", False),
-        )
+        return None

{igmapper-1.1.0 → igmapper-1.2.0/igmapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: igmapper
-Version: 1.1.0
+Version: 1.2.0
 Summary: Unofficial Instagram API to request available data
 Author: lucasoal
 License: MIT

{igmapper-1.1.0 → igmapper-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "igmapper"
-version = "1.1.0"
+version = "1.2.0"
 description = "Unofficial Instagram API to request available data"
 readme = "README.md"
 requires-python = ">=3.10"