Added initial settings config and other fixes

Author: yash-dk

.gitignore

@@ -161,3 +161,4 @@ cython_debug/
 
 # Project Specific
 threads_token.bin
+settings.json

threadspy/auth.py

@@ -6,18 +6,73 @@
 from instagrapi import Client
 from cryptography.fernet import Fernet
 import os
+from dataclasses import dataclass
+from typing import Optional
+
+@dataclass
+class Settings:
+    uuids: dict
+    mid: str
+    ig_u_rur: Optional[str]
+    ig_www_claim: Optional[str]
+    authorization_data: dict
+    cookies: dict
+    last_login: float
+    device_settings: dict
+    user_agent: str
+    country: str
+    country_code: int
+    locale: str
+    timezone_offset: int
+    
+    @classmethod
+    def from_dict(cls, data: dict) -> 'Settings':
+        return cls(
+            uuids=data.get('uuids', {}),
+            mid=data.get('mid', ''),
+            ig_u_rur=data.get('ig_u_rur'),
+            ig_www_claim=data.get('ig_www_claim'),
+            authorization_data=data.get('authorization_data', {}),
+            cookies=data.get('cookies', {}),
+            last_login=data.get('last_login', 0.0),
+            device_settings=data.get('device_settings', {}),
+            user_agent=data.get('user_agent', ''),
+            country=data.get('country', ''),
+            country_code=data.get('country_code', 0),
+            locale=data.get('locale', ''),
+            timezone_offset=data.get('timezone_offset', 0)
+        )
+
+    def to_dict(self) -> dict:
+        return {
+            'uuids': self.uuids,
+            'mid': self.mid,
+            'ig_u_rur': self.ig_u_rur,
+            'ig_www_claim': self.ig_www_claim,
+            'authorization_data': self.authorization_data,
+            'cookies': self.cookies,
+            'last_login': self.last_login,
+            'device_settings': self.device_settings,
+            'user_agent': self.user_agent,
+            'country': self.country,
+            'country_code': self.country_code,
+            'locale': self.locale,
+            'timezone_offset': self.timezone_offset
+        }
+
 
 class Authorization:
     def __init__(
             self,
             username: str = None,
             password: str = None,
             token_path: str = "",
+            settings: Settings = None,
     ):
         self.username = username
         self.password = password
         self.token_path = token_path if token_path else "threads_token.bin"
-        
+        self.settings = settings
         self.headers = get_default_headers()
 
     def generate_key_from_password(self, password):
@@ -47,20 +102,33 @@ def _retrieve_token(self):
 
 
     def get_instagram_api_token(self, refresh: bool = False) -> Union[str, None]:
-        token = self._retrieve_token()
+        # token = self._retrieve_token()
+        token = None
         if token is not None and not refresh:
             return token
 
         try:      
             iapi = Client()
-            iapi.login(self.username, self.password)
+            if self.settings is not None:
+                print("cached")
+                iapi.set_settings(self.settings.to_dict())
+                iapi.login(self.username, self.password)
+            else:
+                print("not cached")
+                iapi.login(self.username, self.password)
+                self.settings = Settings.from_dict(iapi.get_settings())
+            
             token = iapi.private.headers['Authorization'].split("Bearer IGT:2:")[1]
+            print(token)
             self._store_token(token)
             return token
         except Exception as e:
             print(e)
             raise
 
+    def get_settings(self) -> Settings:
+        return self.settings
+
     def get_public_api_token(self) -> str:
         response = requests.get(
             url='https://www.instagram.com/instagram',

threadspy/client.py

@@ -6,7 +6,7 @@
 import re
 from threadspy.models import *
 from threadspy.utils import get_default_headers
-from threadspy.auth import Authorization
+from threadspy.auth import Authorization, Settings
 import mimetypes
 import json
 from urllib.parse import quote
@@ -24,9 +24,8 @@ def __init__(
             password: str = None,
             timeout: int = 10,
             retries: int = 3,
+            settings_file: str = "settings.json"
     ):
-
-        self.auth = Authorization(username, password)
         self.timeout = timeout
         self.retries = retries
         self.session = self._create_session()
@@ -35,6 +34,10 @@ def __init__(
         self.private_token = None
         self.is_logged_in = False
         self.user_id = None
+        self.settings = None
+        self.settings_file = settings_file
+        self._load_settings()
+        self.auth = Authorization(username, password, self.settings)
 
     @property
     def get_public_headers(self):
@@ -54,7 +57,18 @@ def get_private_headers(self):
         })
 
         return headers
-         
+
+    def _save_settings(self):
+        with open(self.settings_file, 'w') as file:
+            file.write(json.dumps(self.settings.to_dict(), indent=4))
+
+    def _load_settings(self):
+        if os.path.exists(self.settings_file):
+            with open(self.settings_file, 'r') as file:
+                self.settings = Settings.from_dict(json.loads(file.read()))
+        else:
+            self.settings = None 
+    
     def _create_session(self):
         session = requests.Session()
         retry_strategy = Retry(
@@ -119,6 +133,10 @@ def login(self) -> bool:
         else:
             self.is_logged_in = True
 
+        if self.is_logged_in:
+            self.settings = self.auth.get_settings()
+            self._save_settings()
+
         return self.is_logged_in
 
     def get_user_id(self, username: str, instagram: bool = False) -> int:

threadspy/utils.py

@@ -23,7 +23,6 @@ def get_default_headers() -> dict:
             'AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1.2 Safari/605.1.15'
         ),
         'X-ASBD-ID': '129477',
-        'X-FB-LSD': 'NjppQDEgONsU_1LCzrmp6q',
         'X-IG-App-ID': '238260118697367',
     }