CraftiGames.py 2.2.5__tar.gz → 2.2.7__tar.gz

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/CraftiGames/JartexnetworkWrapper.py

@@ -593,12 +593,16 @@ class Jartexnetwork:
     async def Punishment(
             self,
             player: str,
+            type: Literal["ban", "mute", "warn", "kick", "all"] = "all",
+            list_console: bool = False,
             **kwargs
         ) -> Union[History, None]:
         """Fetch a player's punishment history from the public ban endpoint.
 
         Args:
             player: In-game username to search for.
+            type: The type of punishment to search for.
+            list_console: Whether to include console punishments.
             **kwargs: Optional request controls such as ``use_proxy``.
 
         Returns:
@@ -612,22 +616,22 @@ class Jartexnetwork:
         proxy, _ = self._get_next_proxy() if use_proxy else (None, self.api_key)
         await jr_.avoid_rate_limits(proxy=proxy)
         try:
-            async with self.session.get(f'https://jartexnetwork.com/bans/search/{player}/', proxy=proxy) as resp:
+            async with self.session.get(f'https://jartexnetwork.com/bans/search/{player}/?filter={type}', proxy=proxy) as resp:
                 status = resp.status
                 if status == 200:
-                    return History(await resp.text())
+                    return History(await resp.text()).all(list_console=list_console)
                 elif status == 429 and Recursion <= allowed_recursion:
                     Recursion += 1
                     packages.asyncio.create_task(log('Exceeded ratelimit: ', Recursion, 'X'))
                     await packages.asyncio.sleep(delay_after_exceeding_ratelimit)
-                    return await self.Punishment(player)
+                    return await self.Punishment(player, type=type, list_console=list_console, Recursion=Recursion)
                 elif status == 403:
                     if proxy:
                         await self._mark_proxy_banned(proxy)
                         ProxyAttempts += 1
                         if self.proxies and ProxyAttempts < len(self.proxies) + 1:
                             packages.asyncio.create_task(log(f'Proxy blocked, cycling to next proxy (attempt {ProxyAttempts})'))
-                            return await self.Punishment(player)
+                            return await self.Punishment(player, type=type, list_console=list_console, Recursion=Recursion)
                     raise APIBlockedException()
                 else:
                     raise APIResponseError()
@@ -637,7 +641,7 @@ class Jartexnetwork:
                 ProxyAttempts += 1
                 if self.proxies and ProxyAttempts < len(self.proxies) + 1:
                     packages.asyncio.create_task(log(f'Connection error with proxy, cycling to next (attempt {ProxyAttempts}): {str(e)[:80]}'))
-                    return await self.Punishment(player)
+                    return await self.Punishment(player, type=type, list_console=list_console, Recursion=Recursion)
             raise APIBlockedException(f'All proxies failed: {str(e)}')
 
 

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/CraftiGames/PikanetworkWrapper.py

@@ -645,12 +645,15 @@ class Pikanetwork:
     async def Punishment(
             self,
             player: str,
+            type: Literal["ban", "mute", "warn", "kick", "all"] = "all",
+            list_console: bool = False,
             **kwargs: Missing
         ) -> Union[History, None]:
         """Fetch a player's punishment history from the public ban endpoint.
 
         Args:
             player: In-game username to search for.
+            type: The type of punishment to search for.
             **kwargs: Optional request controls such as ``use_proxy`` and
                 ``RaiseError``.
 
@@ -668,18 +671,18 @@ class Pikanetwork:
         proxy, api_key = self._get_next_proxy() if use_proxy else (None, self.api_key)
         await RateLimits.avoid_rate_limits(proxy=proxy, api_key=None)
         try:
-            async with self.session.get(f'https://pika-network.net/bans/search/{player}/', proxy=proxy) as resp:
+            async with self.session.get(f'https://pika-network.net/bans/search/{player}/?filter={type}', proxy=proxy) as resp:
                 status = resp.status
 
                 if status == 200:
-                    return History(await resp.text())
+                    return History(await resp.text()).all(list_console=list_console)
                 
                 elif status == 429 and Recursion <= config.allowed_recursion:
 
                     Recursion += 1
                     packages.asyncio.create_task(log('Exceeded ratelimit: ', Recursion, 'X'))
                     await packages.asyncio.sleep(config.delay_after_exceeding_ratelimit)
-                    return await self.Punishment(player)
+                    return await self.Punishment(player, type=type, Recursion=Recursion)
                 
                 elif status == 403:
                     if proxy:
@@ -687,7 +690,7 @@ class Pikanetwork:
                         ProxyAttempts += 1
                         if self.proxies and ProxyAttempts < len(self.proxies) + 1:
                             packages.asyncio.create_task(log(f'Proxy blocked, cycling to next proxy (attempt {ProxyAttempts})'))
-                            return await self.Punishment(player, ProxyAttempts=ProxyAttempts)
+                            return await self.Punishment(player, type=type, ProxyAttempts=ProxyAttempts)
                     
                     if RaiseError:
                         raise APIBlockedException()
@@ -702,7 +705,7 @@ class Pikanetwork:
                 ProxyAttempts += 1
                 if self.proxies and ProxyAttempts < len(self.proxies) + 1:
                     packages.asyncio.create_task(log(f'Connection error with proxy, cycling to next (attempt {ProxyAttempts}): {str(e)[:80]}'))
-                    return await self.Punishment(player, ProxyAttempts=ProxyAttempts)
+                    return await self.Punishment(player, type=type, ProxyAttempts=ProxyAttempts)
             if RaiseError:
                 raise APIBlockedException(f'All proxies failed: {str(e)}')
 

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/CraftiGames/Punishments/__init__.py

@@ -58,35 +58,9 @@ class History:
     def __init__(self, html_) -> None:
         self.__html_parser__: str = html_
 
-
-    def bans(
-            self,
-            list_console: bool = True
-            ) -> dict:
-        return self.all(list_console, "ban")
-    
-    def warns(
-            self,
-            list_console: bool = True
-            ) -> dict:
-        return self.all(list_console, "warn")
-    
-    def kicks(
-            self,
-            list_console: bool = True
-            ) -> dict:
-        return self.all(list_console, "kick")
-    
-    def mutes(
-            self,
-            list_console: bool = True
-            ) -> dict:
-        return self.all(list_console, "mute")
-
     def all(
             self, 
-            list_console: bool = True,
-            punishement_type: packages.Literal["all", "ban", "warn", "kick", "mute"] = "all"
+            list_console: bool = True
             ) -> dict:
 
         soup = packages.BeautifulSoup(self.__html_parser__, 'html.parser')
@@ -104,9 +78,6 @@ class History:
             
             if list_console is False and by.lower() == 'console':
                 continue
-            
-            if punishement_type.lower() != 'all' and ptype.lower() != punishement_type.lower():
-                continue
 
             prow.append(
                 {

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/CraftiGames.py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CraftiGames.py
-Version: 2.2.5
+Version: 2.2.7
 Summary: A Python based API wrapper for CraftiGames community
 Home-page: https://github.com/sti1ltyping/CraftiGames.py
 Author: sti1ltyping

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CraftiGames.py
-Version: 2.2.5
+Version: 2.2.7
 Summary: A Python based API wrapper for CraftiGames community
 Home-page: https://github.com/sti1ltyping/CraftiGames.py
 Author: sti1ltyping

{craftigames_py-2.2.5 → craftigames_py-2.2.7}/setup.py

@@ -9,7 +9,7 @@ with open('README.md') as README_file:
 
 setup(
     name='CraftiGames.py',
-    version='2.2.5',
+    version='2.2.7',
     author='sti1ltyping',
     author_email='sti1ltyping.chillax@gmail.com',
     url='https://github.com/sti1ltyping/CraftiGames.py',