CraftiGames.py 2.2.8__tar.gz → 2.2.9__tar.gz

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/CraftiGames/JartexnetworkWrapper.py

@@ -593,7 +593,7 @@ class Jartexnetwork:
     async def Punishment(
             self,
             player: str,
-            type: Literal["ban", "mute", "warn", "kick", "all"] = "all",
+            type: Literal["bans", "mutes", "warnings", "kicks", "all"] = "all",
             list_console: bool = False,
             **kwargs
         ) -> Union[dict, None]:
@@ -619,7 +619,10 @@ class Jartexnetwork:
             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()).all(list_console=list_console)
+                    return History(await resp.text()).all(
+                        list_console=list_console,
+                        punishment_type=type,
+                    )
                 elif status == 429 and Recursion <= allowed_recursion:
                     Recursion += 1
                     packages.asyncio.create_task(log('Exceeded ratelimit: ', Recursion, 'X'))

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/CraftiGames/PikanetworkWrapper.py

@@ -645,7 +645,7 @@ class Pikanetwork:
     async def Punishment(
             self,
             player: str,
-            type: Literal["ban", "mute", "warn", "kick", "all"] = "all",
+            type: Literal["bans", "mutes", "warnings", "kicks", "all"] = "all",
             list_console: bool = False,
             **kwargs: Missing
         ) -> Union[dict, None]:
@@ -675,7 +675,10 @@ class Pikanetwork:
                 status = resp.status
 
                 if status == 200:
-                    return History(await resp.text()).all(list_console=list_console)
+                    return History(await resp.text()).all(
+                        list_console=list_console,
+                        punishment_type=type,
+                    )
                 
                 elif status == 429 and Recursion <= config.allowed_recursion:
 

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/CraftiGames/Punishments/__init__.py

@@ -60,21 +60,42 @@ class History:
 
     def all(
             self, 
-            list_console: bool = True
+            list_console: bool = True,
+            punishment_type: str = "all"
             ) -> dict:
 
         soup = packages.BeautifulSoup(self.__html_parser__, 'html.parser')
         player = soup.title.string[:-28] if soup.title is not None else "Not found"
         punishments: dict = {}
         prow = []
+        type_by_filter = {
+            "bans": "ban",
+            "kicks": "kick",
+            "mutes": "mute",
+            "warnings": "warning",
+        }
         for row in soup.find_all(class_='row'):
             row: packages.BeautifulSoup
 
-            reason = row.find(class_='_reason').text.strip()
-            date = row.find(class_='_date').text.strip()
-            expires = row.find(class_='_expires').text.strip()
-            ptype = row.find(class_='_type').find('b').text.strip()
-            by = row.find(class_='user-link').text.strip()
+            reason_element = row.find(class_='_reason')
+            date_element = row.find(class_='_date')
+            staff_element = row.find(class_='user-link')
+            if reason_element is None or date_element is None or staff_element is None:
+                raise ValueError("Punishment row is missing its reason, date, or staff member.")
+
+            reason = reason_element.get_text(strip=True)
+            date = date_element.get_text(strip=True)
+            expires_element = row.find(class_='_expires')
+            expires = expires_element.get_text(strip=True) if expires_element else "N/A"
+            type_element = row.find(class_='_type')
+            ptype = (
+                type_element.get_text(strip=True)
+                if type_element is not None
+                else type_by_filter.get(punishment_type, "")
+            )
+            if not ptype:
+                raise ValueError("Punishment row is missing its type.")
+            by = staff_element.get_text(strip=True)
             
             if list_console is False and by.lower() == 'console':
                 continue

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/CraftiGames.py.egg-info/PKG-INFO

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

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/PKG-INFO

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

{craftigames_py-2.2.8 → craftigames_py-2.2.9}/setup.py

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