mc5-api-client 1.0.20__py3-none-any.whl → 1.0.21__py3-none-any.whl

mc5_api_client/__init__.py

@@ -15,7 +15,7 @@ messaging, and more.
 
 from typing import Optional, Dict, Any
 
-__version__ = "1.0.20"
+__version__ = "1.0.21"
 __author__ = "Chizoba"
 __email__ = "chizoba2026@hotmail.com"
 __license__ = "MIT"
@@ -88,6 +88,37 @@ from .auth import TokenGenerator
 from .exceptions import MC5APIError, AuthenticationError, RateLimitError
 from .help import help, examples, quick_reference
 
+# Automatic Squad Management (NEW!)
+from .client import MC5Client
+
+# Add automatic squad management methods as standalone functions
+def get_my_squad_id(client=None, **kwargs):
+    """Get user's squad ID automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_id()
+
+def get_my_squad_info(client=None, **kwargs):
+    """Get user's squad information automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_info()
+
+def update_my_squad_info(client=None, **squad_kwargs):
+    """Update user's squad information automatically."""
+    client_kwargs = {k: v for k, v in squad_kwargs.items() if k in ['username', 'password', 'client_id']}
+    update_kwargs = {k: v for k, v in squad_kwargs.items() if k not in ['username', 'password', 'client_id']}
+    
+    if client is None:
+        client = MC5Client(**client_kwargs)
+    return client.update_my_squad_info(**update_kwargs)
+
+def get_my_squad_members(client=None, **kwargs):
+    """Get user's squad members automatically."""
+    if client is None:
+        client = MC5Client(**kwargs)
+    return client.get_my_squad_members()
+
 # Add MC5ApiClient as an alias for backward compatibility
 MC5ApiClient = MC5Client
 from .admin_client import (
@@ -399,9 +430,13 @@ __all__ = [
     "MC5Easy",
     "quick_connect",
     "check_my_daily_tasks",
-    "get_my_mc5_profile",
-    "find_mc5_player",
-    "get_global_id",
+    "get_server_status",
+    "get_online_players", 
+    "get_server_info",
+    "get_my_squad_id",
+    "get_my_squad_info",
+    "update_my_squad_info",
+    "get_my_squad_members",
     "generate_device_id",
     "create_federation_session",
     "locate_service",

mc5_api_client/client.py

@@ -1652,6 +1652,186 @@ class MC5Client(SquadBattleMixin, FederationMixin, AlertsMixin, AccountMixin, Tr
                 "timestamp": time.time()
             }
     
+    # Automatic Squad Management (NEW!)
+    
+    def get_my_squad_id(self) -> Optional[str]:
+        """
+        Automatically fetch the user's squad ID from their profile.
+        
+        This method eliminates the need to manually specify squad ID for squad operations.
+        It fetches the user's profile and extracts the squad/group ID from their groups.
+        
+        Returns:
+            Squad ID if found, None otherwise
+        """
+        try:
+            # Get user profile which contains groups information
+            profile = self.get_profile()
+            
+            if not profile:
+                return None
+                
+            # Check if user has groups
+            groups = profile.get('groups', [])
+            if not groups:
+                return None
+            
+            # Extract squad ID from groups (usually the first group is the squad)
+            # Groups can be in different formats, handle multiple cases
+            for group in groups:
+                if isinstance(group, str):
+                    # Simple string ID
+                    return group
+                elif isinstance(group, dict):
+                    # Dictionary with ID field
+                    if 'id' in group:
+                        return group['id']
+                    elif '_id' in group:
+                        return group['_id']
+                    elif 'group_id' in group:
+                        return group['group_id']
+            
+            # If no group found in the expected format, try to extract from the groups string
+            if groups and isinstance(groups[0], str):
+                return groups[0]
+                
+            return None
+            
+        except Exception as e:
+            print(f"🔴 Error fetching squad ID: {e}")
+            return None
+    
+    def get_my_squad_info(self) -> Dict[str, Any]:
+        """
+        Get complete squad information using automatically fetched squad ID.
+        
+        Returns:
+            Dictionary with squad information or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "User is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Get squad information using the fetched ID
+            squad_info = self.get_clan_settings(squad_id)
+            
+            if squad_info:
+                squad_info['auto_fetched_squad_id'] = squad_id
+                squad_info['fetch_method'] = 'automatic'
+                return squad_info
+            else:
+                return {
+                    "error": "Failed to fetch squad details",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but could not fetch details",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to get squad information",
+                "timestamp": time.time()
+            }
+    
+    def update_my_squad_info(self, **kwargs) -> Dict[str, Any]:
+        """
+        Update squad information using automatically fetched squad ID.
+        
+        This is a convenience method that combines get_my_squad_id() and update_clan_settings().
+        Users don't need to specify squad ID - it's automatically fetched from their profile.
+        
+        Args:
+            **kwargs: Squad settings to update (same as update_clan_settings)
+                - name: Squad name
+                - description: Squad description  
+                - rating: Squad rating
+                - min_join_value: Minimum join value
+                - logo: Squad logo ID
+                - logo_clr_prim: Primary logo color
+                - logo_clr_sec: Secondary logo color
+        
+        Returns:
+            Dictionary with update result or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "Cannot update squad - user is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Update squad using the fetched ID
+            result = self.update_clan_settings(squad_id, **kwargs)
+            
+            if result:
+                result['auto_fetched_squad_id'] = squad_id
+                result['update_method'] = 'automatic'
+                return result
+            else:
+                return {
+                    "error": "Failed to update squad",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but update failed",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to update squad information",
+                "timestamp": time.time()
+            }
+    
+    def get_my_squad_members(self) -> Dict[str, Any]:
+        """
+        Get squad members using automatically fetched squad ID.
+        
+        Returns:
+            Dictionary with squad members or error details
+        """
+        try:
+            squad_id = self.get_my_squad_id()
+            if not squad_id:
+                return {
+                    "error": "No squad found for this user",
+                    "message": "Cannot get squad members - user is not in any squad",
+                    "timestamp": time.time()
+                }
+            
+            # Get squad members using the fetched ID
+            members = self.get_clan_members(squad_id)
+            
+            if members:
+                return {
+                    "squad_id": squad_id,
+                    "members": members,
+                    "member_count": len(members) if isinstance(members, list) else 0,
+                    "fetch_method": "automatic",
+                    "timestamp": time.time()
+                }
+            else:
+                return {
+                    "error": "Failed to fetch squad members",
+                    "squad_id": squad_id,
+                    "message": "Squad ID found but could not fetch members",
+                    "timestamp": time.time()
+                }
+                
+        except Exception as e:
+            return {
+                "error": str(e),
+                "message": "Failed to get squad members",
+                "timestamp": time.time()
+            }
+    
     # Events API
     
     def get_events(self, event_type: str = None, status: str = None) -> List[Dict[str, Any]]:

{mc5_api_client-1.0.20.dist-info → mc5_api_client-1.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc5_api_client
-Version: 1.0.20
+Version: 1.0.21
 Summary: A comprehensive Python library for interacting with the Modern Combat 5 API
 Home-page: https://pypi.org/project/mc5-api-client/
 Author: Chizoba

{mc5_api_client-1.0.20.dist-info → mc5_api_client-1.0.21.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mc5_api_client/__init__.py,sha256=lxGygRXrG6aUTZ_Em_TLyMzMxR7ylTXgXOhA5OEXfnM,11942
+mc5_api_client/__init__.py,sha256=it6XDA9bQyWk2T_J0MBPa06usNQix2f1vFioAUmY5Zw,13226
 mc5_api_client/account.py,sha256=EmydXCsCXaKqMw21oVttQfYuDl50pa2dwhcTeHtnxbQ,14396
 mc5_api_client/account_quick.py,sha256=t4ki4ujYENmcnd_004f0pO9SPxPyCllz4WHpBG9wNbo,10458
 mc5_api_client/admin_client.py,sha256=527aavolxVhY2M5ceFxVbbE5YTczU9Z86Fdt1UzdRZM,15220
@@ -6,7 +6,7 @@ mc5_api_client/alerts.py,sha256=zW-cEwSSShuHkGxTBQaS8Ynf1a0hh5RMQ0G3WC_ajI0,1322
 mc5_api_client/alerts_quick.py,sha256=D1j0RiHteYqoAgc4KYqTxYG1Hkud3b-xWRV_VOUEnY0,7946
 mc5_api_client/auth.py,sha256=z8vmyQIHUdAzk0pUyKCesT8gTv4jboLIFGBxAu1v_-8,13396
 mc5_api_client/cli.py,sha256=6xciRjWkUMOxgxlbDsoOiHRuirXPy7uc9WURXPKmgGc,17255
-mc5_api_client/client.py,sha256=EWL0IWiP9mwr9GTnnzWwTKHZUPe2LXaY7YxzjKTDjWM,112524
+mc5_api_client/client.py,sha256=v3EQYzuSpNPF0n3xGaSsP8GjaJ0eOjchh0ZbiCvInQA,119226
 mc5_api_client/debug.py,sha256=524vNCE7jM_KP5JM81-3eI2cmFBBA-Hf7Uy0cIL75W0,8240
 mc5_api_client/easy_mc5.py,sha256=kfjOJMW-VRAZcXEF1yHiGsACgjb-ZjXGuw1U_gepSQY,24202
 mc5_api_client/exceptions.py,sha256=o7od4GrEIlgq6xSNUjZdh74xoDTytF3PLcMq5ewRiJw,2683
@@ -24,9 +24,9 @@ mc5_api_client/storage_admin.py,sha256=l-nwskbpa3KpeIoWcwVRicgBSvrTvQ5aE2QU_e366
 mc5_api_client/telemetry.py,sha256=k8qOimPg-AKsnMclIgeqYCJ_97j2pWyiN7Lg80D4sKo,13246
 mc5_api_client/transfer.py,sha256=-pln70360mo4cKBQIUzp_wt9ce1Cr4YA6aJDFPKEjzQ,14381
 mc5_api_client/transfer_quick.py,sha256=HhRbp4FVzFwuzHDcqOyYiVjeVEIfgezlWd8SN6sh874,11310
-mc5_api_client-1.0.20.dist-info/licenses/LICENSE,sha256=M0UBQ4B3pB9XcV54_jhVP681xyauF8GB6YK_rKmuXzk,1064
-mc5_api_client-1.0.20.dist-info/METADATA,sha256=jcN6JTeojDPA5C_0U9l1_bCcwKNwkPNbf-1s17Uci3w,83121
-mc5_api_client-1.0.20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mc5_api_client-1.0.20.dist-info/entry_points.txt,sha256=2kruOpleFYK3Jl1MoQwGyqCd-Pj4kQWngXmIjnXx_gE,48
-mc5_api_client-1.0.20.dist-info/top_level.txt,sha256=eYJe4ue9j1ig_jFY5Z05mDqpizUEV7TYpk5lBXVd4kA,15
-mc5_api_client-1.0.20.dist-info/RECORD,,
+mc5_api_client-1.0.21.dist-info/licenses/LICENSE,sha256=M0UBQ4B3pB9XcV54_jhVP681xyauF8GB6YK_rKmuXzk,1064
+mc5_api_client-1.0.21.dist-info/METADATA,sha256=DbiivFEmDu7_UhtTFUCqBc9S95HQhZ0NpyiHPSTrnUY,83121
+mc5_api_client-1.0.21.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mc5_api_client-1.0.21.dist-info/entry_points.txt,sha256=2kruOpleFYK3Jl1MoQwGyqCd-Pj4kQWngXmIjnXx_gE,48
+mc5_api_client-1.0.21.dist-info/top_level.txt,sha256=eYJe4ue9j1ig_jFY5Z05mDqpizUEV7TYpk5lBXVd4kA,15
+mc5_api_client-1.0.21.dist-info/RECORD,,