modifyself 0.3.7__tar.gz → 0.3.8__tar.gz

{modifyself-0.3.7 → modifyself-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modifyself
-Version: 0.3.7
+Version: 0.3.8
 Summary: A clean, pythonic Discord self-bot library
 Author-email: modifyself <modifyself@example.com>
 License-Expression: MIT
@@ -15,7 +15,6 @@ Requires-Dist: wreq>=0.1.0
 Requires-Dist: aiohttp>=3.8.0
 Requires-Dist: plyer>=0.9
 Requires-Dist: pillow>=10.0
-Requires-Dist: requests>=2.28
 Requires-Dist: PyNaCl>=1.5.0
 Requires-Dist: opuslib>=3.0.0
 Dynamic: license-file

{modifyself-0.3.7 → modifyself-0.3.8}/modifyself/__init__.py

@@ -2,7 +2,7 @@
 modifyself ? a clean, pythonic Discord self-bot library.
 """
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"
 
 from .client import Client
 from .commands.core import command

{modifyself-0.3.7 → modifyself-0.3.8}/modifyself/headers.py

@@ -9,8 +9,9 @@ import hashlib
 from dataclasses import dataclass
 from typing import Dict, Optional, Tuple, List, Any, Union
 
+import urllib.request as _urllib_req
+
 from wreq import Emulation
-import requests as _requests
 
 _GREASE_BRANDS = [
     ('"Not A(Brand"', "99"),
@@ -72,8 +73,6 @@ class HeaderSpoofer:
         self._rng = random.Random(self._seed)
         self._emulation = emulation
         self.profile = self._make_profile()
-        self.session = _requests.Session()
-        self.session.headers.update({"User-Agent": self.profile.user_agent})
         self._async_client: Optional[Any] = None
         self.build_number = self._get_build_number()
         self._launch_id = str(uuid.uuid4())
@@ -105,11 +104,12 @@ class HeaderSpoofer:
 
         cache_file = os.path.join(os.path.dirname(__file__), ".chrome_version.json")
         try:
-            r = self.session.get(
+            _req = _urllib_req.Request(
                 "https://versionhistory.googleapis.com/v1/chrome/platforms/win/channels/stable/versions/all/releases?filter=endtime=none",
-                timeout=5,
+                headers={"User-Agent": "Mozilla/5.0"},
             )
-            data = r.json()
+            with _urllib_req.urlopen(_req, timeout=5) as _resp:
+                data = json.loads(_resp.read())
             latest = max(data["releases"], key=lambda x: [int(p) for p in x["version"].split(".")])
             major = latest["version"].split(".")[0]
             HeaderSpoofer._chrome_cache = {"major": major}
@@ -162,18 +162,20 @@ class HeaderSpoofer:
         build_cache_file = os.path.join(os.path.dirname(__file__), ".build_cache.json")
 
         try:
-            r = self.session.get(
+            _req1 = _urllib_req.Request(
                 "https://discord.com/login",
                 headers={"User-Agent": self.profile.user_agent},
-                timeout=30,
             )
-            scripts = re.findall(r'<script[^>]+src="(/assets/[^"]+\.js)"', r.text)
+            with _urllib_req.urlopen(_req1, timeout=30) as _resp1:
+                _html = _resp1.read().decode("utf-8", errors="replace")
+            scripts = re.findall(r'<script[^>]+src="(/assets/[^"]+\.js)"', _html)
             for path in reversed(scripts):
-                js = self.session.get(
+                _req2 = _urllib_req.Request(
                     f"https://discord.com{path}",
                     headers={"User-Agent": self.profile.user_agent},
-                    timeout=30,
                 )
+                with _urllib_req.urlopen(_req2, timeout=30) as _resp2:
+                    _js_text = _resp2.read().decode("utf-8", errors="replace")
                 for pat in [
                     r'buildNumber\s*[=:]\s*"?(\d{5,7})"?',
                     r'"buildNumber","(\d{5,7})"',
@@ -181,7 +183,7 @@ class HeaderSpoofer:
                     r'build_number["\s:=]+(\d{5,7})',
                     r'"(\d{6,7})"\s*,\s*"stable"',
                 ]:
-                    m = re.search(pat, js.text)
+                    m = re.search(pat, _js_text)
                     if m:
                         build = int(m.group(1))
                         HeaderSpoofer._build_cache = build

modifyself-0.3.8/modifyself/utils.py

@@ -0,0 +1,137 @@
+"""
+Pure utility functions. No Discord-specific state here.
+"""
+
+import re
+import os
+import sys
+import tempfile
+from datetime import datetime, timezone
+from typing import Optional
+
+
+
+MARKDOWN_ESCAPE_RE = re.compile(r"([*_{\[\]()~`>\#+\-=|.!])")
+
+
+def escape_markdown(text: str) -> str:
+    """Escape Discord markdown characters."""
+    return MARKDOWN_ESCAPE_RE.sub(r"\\\1", text)
+
+
+def parse_time(timestamp: str) -> datetime:
+    """Parse an ISO 8601 timestamp from Discord."""
+    if timestamp.endswith("Z"):
+        timestamp = timestamp[:-1] + "+00:00"
+    return datetime.fromisoformat(timestamp)
+
+
+def snowflake_time(snowflake: int) -> datetime:
+    """Extract the creation time from a snowflake ID."""
+    from .core.snowflake import Snowflake
+    return datetime.fromtimestamp(
+        ((snowflake >> 22) + Snowflake.EPOCH) / 1000,
+        tz=timezone.utc,
+    )
+
+
+def chunk_list(lst: list, size: int):
+    """Yield successive chunks of a list."""
+    for i in range(0, len(lst), size):
+        yield lst[i : i + size]
+
+
+def find(predicate, iterable):
+    """Return the first item in iterable matching predicate."""
+    for item in iterable:
+        if predicate(item):
+            return item
+    return None
+
+
+def get(iterable, **attrs):
+    """Return the first item in iterable with matching attributes."""
+    for item in iterable:
+        if all(getattr(item, k, None) == v for k, v in attrs.items()):
+            return item
+    return None
+
+
+def oauth_url(client_id: int, *, permissions: int = 0, guild_id: int | None = None):
+    """Generate an OAuth2 authorization URL."""
+    url = f"https://discord.com/oauth2/authorize?client_id={client_id}&scope=bot"
+    if permissions:
+        url += f"&permissions={permissions}"
+    if guild_id:
+        url += f"&guild_id={guild_id}"
+    return url
+
+
+def send_notification(
+    title: str,
+    message: str,
+    image_url: Optional[str] = None,
+    timeout: int = 5,
+    app_name: str = "modifyself"
+) -> bool:
+    """Send a system desktop notification with an optional image icon."""
+    try:
+        from plyer import notification as _notify
+    except ImportError:
+        print("[modifyself] plyer not installed. Install with: pip install plyer pillow")
+        return False
+
+    try:
+        icon_path = None
+
+        if image_url:
+            try:
+                import urllib.request as _ureq
+                with _ureq.urlopen(image_url, timeout=10) as _resp:
+                    img_data = _resp.read()
+                is_windows = sys.platform.startswith("win")
+                suffix = ".ico" if is_windows else ".png"
+                icon_temp = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
+                icon_temp.write(img_data)
+                icon_temp.close()
+                icon_path = icon_temp.name
+                if is_windows:
+                    try:
+                        from PIL import Image
+                        with Image.open(icon_path) as img:
+                            if img.format != "ICO":
+                                ico_path = icon_path.replace(".ico", "_converted.ico")
+                                img.save(ico_path, format="ICO", sizes=[(32, 32), (48, 48), (64, 64)])
+                        try:
+                            os.unlink(icon_path)
+                        except Exception:
+                            pass
+                        icon_path = ico_path
+                    except Exception as e:
+                        print(f"[modifyself] ICO conversion warning: {e}")
+            except Exception as e:
+                print(f"[modifyself] Error downloading notification image: {e}")
+
+        _notify.notify(
+            title=title,
+            message=message,
+            app_name=app_name,
+            app_icon=icon_path,
+            timeout=timeout,
+        )
+
+        if icon_path and os.path.exists(icon_path):
+            try:
+                os.unlink(icon_path)
+            except Exception:
+                pass
+
+        return True
+
+    except Exception as e:
+        print(f"[modifyself] Failed to send notification: {e}")
+        return False
+
+# Default notification images - using GitHub raw URL
+START_IMAGE = None
+ERROR_IMAGE = None

{modifyself-0.3.7 → modifyself-0.3.8}/modifyself.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modifyself
-Version: 0.3.7
+Version: 0.3.8
 Summary: A clean, pythonic Discord self-bot library
 Author-email: modifyself <modifyself@example.com>
 License-Expression: MIT
@@ -15,7 +15,6 @@ Requires-Dist: wreq>=0.1.0
 Requires-Dist: aiohttp>=3.8.0
 Requires-Dist: plyer>=0.9
 Requires-Dist: pillow>=10.0
-Requires-Dist: requests>=2.28
 Requires-Dist: PyNaCl>=1.5.0
 Requires-Dist: opuslib>=3.0.0
 Dynamic: license-file

{modifyself-0.3.7 → modifyself-0.3.8}/modifyself.egg-info/requires.txt

@@ -3,6 +3,5 @@ wreq>=0.1.0
 aiohttp>=3.8.0
 plyer>=0.9
 pillow>=10.0
-requests>=2.28
 PyNaCl>=1.5.0
 opuslib>=3.0.0

{modifyself-0.3.7 → modifyself-0.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "modifyself"
-version = "0.3.7"
+version = "0.3.8"
 description = "A clean, pythonic Discord self-bot library"
 readme = "README.md"
 license = "MIT"
@@ -18,7 +18,6 @@ dependencies = [
     "aiohttp>=3.8.0",
     "plyer>=0.9",
     "pillow>=10.0",
-    "requests>=2.28",
     "PyNaCl>=1.5.0",
     "opuslib>=3.0.0",
 ]

modifyself-0.3.7/modifyself/utils.py

@@ -1,177 +0,0 @@
-"""
-Pure utility functions. No Discord-specific state here.
-"""
-
-import re
-import os
-import sys
-import tempfile
-from datetime import datetime, timezone
-from typing import Optional
-
-# Notification imports
-try:
-    from plyer import notification
-    import requests
-    from PIL import Image
-    NOTIFICATION_AVAILABLE = True
-except ImportError:
-    NOTIFICATION_AVAILABLE = False
-
-
-MARKDOWN_ESCAPE_RE = re.compile(r"([*_{\[\]()~`>\#+\-=|.!])")
-
-
-def escape_markdown(text: str) -> str:
-    """Escape Discord markdown characters."""
-    return MARKDOWN_ESCAPE_RE.sub(r"\\\1", text)
-
-
-def parse_time(timestamp: str) -> datetime:
-    """Parse an ISO 8601 timestamp from Discord."""
-    if timestamp.endswith("Z"):
-        timestamp = timestamp[:-1] + "+00:00"
-    return datetime.fromisoformat(timestamp)
-
-
-def snowflake_time(snowflake: int) -> datetime:
-    """Extract the creation time from a snowflake ID."""
-    from .core.snowflake import Snowflake
-    return datetime.fromtimestamp(
-        ((snowflake >> 22) + Snowflake.EPOCH) / 1000,
-        tz=timezone.utc,
-    )
-
-
-def chunk_list(lst: list, size: int):
-    """Yield successive chunks of a list."""
-    for i in range(0, len(lst), size):
-        yield lst[i : i + size]
-
-
-def find(predicate, iterable):
-    """Return the first item in iterable matching predicate."""
-    for item in iterable:
-        if predicate(item):
-            return item
-    return None
-
-
-def get(iterable, **attrs):
-    """Return the first item in iterable with matching attributes."""
-    for item in iterable:
-        if all(getattr(item, k, None) == v for k, v in attrs.items()):
-            return item
-    return None
-
-
-def oauth_url(client_id: int, *, permissions: int = 0, guild_id: int | None = None):
-    """Generate an OAuth2 authorization URL."""
-    url = f"https://discord.com/oauth2/authorize?client_id={client_id}&scope=bot"
-    if permissions:
-        url += f"&permissions={permissions}"
-    if guild_id:
-        url += f"&guild_id={guild_id}"
-    return url
-
-
-def send_notification(
-    title: str,
-    message: str,
-    image_url: Optional[str] = None,
-    timeout: int = 5,
-    app_name: str = "modifyself"
-) -> bool:
-    """
-    Send a system notification with an optional image.
-    
-    Args:
-        title: Notification title
-        message: Notification message
-        image_url: Optional URL to an image to show as the app icon
-        timeout: How long to show the notification (seconds)
-        app_name: Name of the app
-    
-    Returns:
-        True if notification was sent, False otherwise
-    """
-    if not NOTIFICATION_AVAILABLE:
-        try:
-            import plyer
-        except ImportError:
-            print("[modifyself] plyer not installed. Install with: pip install plyer pillow requests")
-            return False
-        except Exception as e:
-            print(f"[modifyself] Could not initialize notifications: {e}")
-            return False
-    
-    try:
-        icon_path = None
-        
-        # Download image if provided
-        if image_url:
-            try:
-                response = requests.get(image_url, timeout=10, stream=True)
-                if response.status_code == 200:
-                    # Always use .ico extension for Windows
-                    is_windows = sys.platform.startswith('win')
-                    suffix = '.ico' if is_windows else '.png'
-                    
-                    # Create temp file with correct extension
-                    icon_temp = tempfile.NamedTemporaryFile(suffix=suffix, delete=False)
-                    icon_temp.write(response.content)
-                    icon_temp.close()  # CRITICAL: Close the file before using it
-                    icon_path = icon_temp.name
-                    
-                    # On Windows, ensure it's a valid ICO
-                    if is_windows:
-                        try:
-                            # Open the file to verify it's an image
-                            with Image.open(icon_path) as img:
-                                # If it's not already ICO, convert it
-                                if img.format != 'ICO':
-                                    ico_path = icon_path.replace('.ico', '_converted.ico')
-                                    # Save as ICO with common sizes
-                                    img.save(ico_path, format='ICO', sizes=[(32, 32), (48, 48), (64, 64)])
-                                    # Close the image
-                                    img.close()
-                                    # Delete original
-                                    try:
-                                        os.unlink(icon_path)
-                                    except:
-                                        pass
-                                    icon_path = ico_path
-                        except Exception as e:
-                            print(f"[modifyself] ICO conversion warning: {e}")
-                            # Keep the original if conversion fails
-                            pass
-                else:
-                    print(f"[modifyself] Could not download notification image (status {response.status_code})")
-            except Exception as e:
-                print(f"[modifyself] Error downloading notification image: {e}")
-        
-        # Send the notification
-        notification.notify(
-            title=title,
-            message=message,
-            app_name=app_name,
-            app_icon=icon_path,
-            timeout=timeout
-        )
-        
-        # Clean up temp file
-        if icon_path and os.path.exists(icon_path):
-            try:
-                os.unlink(icon_path)
-            except Exception:
-                pass
-        
-        return True
-        
-    except Exception as e:
-        print(f"[modifyself] Failed to send notification: {e}")
-        return False
-
-# Default notification images - using GitHub raw URL
-START_IMAGE = None
-ERROR_IMAGE = None