scratchattach 2.1.11__tar.gz → 2.1.13__tar.gz

{scratchattach-2.1.11 → scratchattach-2.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.11
+Version: 2.1.13
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool
@@ -18,6 +18,7 @@ Requires-Dist: websocket-client
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: SimpleWebSocketServer
+Requires-Dist: typing-extensions
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/cloud/_base.py

@@ -142,7 +142,7 @@ class WebSocketEventStream(EventStream):
         i = 0
         with self.reading:
             try:
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()
@@ -150,7 +150,7 @@ class WebSocketEventStream(EventStream):
                     i += 1
             except Exception:
                 self.source_cloud.reconnect()
-                self.receive_new(True)
+                self.receive_new(amount != -1)
                 while (self.packets_left and amount == -1) or (amount != -1 and i < amount):
                     if not self.packets_left and amount != -1:
                         self.receive_new()

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/editor/block.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import warnings
-from typing import Optional, Iterable, Self
+from typing import Optional, Iterable
+from typing_extensions import Self
 
 from . import base, sprite, mutation, field, inputs, commons, vlb, blockshape, prim, comment, build_defaulting
 from ..utils import exceptions

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/eventhandlers/_base.py

@@ -36,7 +36,7 @@ class BaseEventHandler(ABC):
                 self._thread = None
                 self._updater()
     
-    def call_event(self, event_name, args=[]):
+    def call_event(self, event_name, args : list = []):
         try:
             if event_name in self._threaded_events:
                 for func in self._threaded_events[event_name]:

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/eventhandlers/cloud_requests.py

@@ -69,7 +69,6 @@ class CloudRequests(CloudEvents):
         self._requests = {}
         self.event(self.on_set, thread=False)
         self.event(self.on_reconnect, thread=True)
-        self.respond_in_thread = False
         self.no_packet_loss = no_packet_loss # When enabled, query the clouddata log regularly for missed requests and reconnect after every single request (reduces packet loss a lot, but is spammy and can make response duration longer)
         self.used_cloud_vars = used_cloud_vars
         self.respond_order = respond_order
@@ -106,8 +105,6 @@ class CloudRequests(CloudEvents):
         """
         def inner(function):
             # called if the decorator provides arguments
-            if thread:
-                self.respond_in_thread = True
             self._requests[function.__name__ if name is None else name] = Request(
                 function.__name__ if name is None else name,
                 enabled = enabled,
@@ -302,7 +299,7 @@ class CloudRequests(CloudEvents):
                 request_id=request_id,
                 activity=activity
             )
-            self.call_event("on_request", received_request)
+            self.call_event("on_request", [received_request])
             if received_request.request.thread:
                 self.executed_requests[request_id] = received_request
                 Thread(target=received_request.request, args=[received_request]).start() # Execute the request function directly in a thread

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/eventhandlers/combine.py

@@ -11,7 +11,7 @@ class MultiEventHandler:
 
     def event(self, function, *args, **kwargs):
         for handler in self.handlers:
-            handler.request(function, *args, **kwargs)
+            handler.event(function, *args, **kwargs)
 
     def start(self, *args, **kwargs):
         for handler in self.handlers:
@@ -27,4 +27,4 @@ class MultiEventHandler:
 
     def resume(self, *args, **kwargs):
         for handler in self.handlers:
-            handler.resume(*args, **kwargs)
+            handler.resume(*args, **kwargs)

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/site/activity.py

@@ -14,9 +14,9 @@ class Activity(BaseSiteComponent):
     """
 
     def __repr__(self):
-        return repr(self.raw)
+        return f"Activity({repr(self.raw)})"
 
-    def str(self):
+    def __str__(self):
         return str(self.raw)
 
     def __init__(self, **entries):

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/site/session.py

@@ -76,6 +76,7 @@ class Session(BaseSiteComponent):
         mute_status: Information about commenting restrictions of the associated account
         banned: Returns True if the associated account is banned
     """
+    session_string: str | None = None
 
     def __str__(self) -> str:
         return f"Login for account {self.username!r}"
@@ -977,6 +978,9 @@ sess
     def connect_filterbot(self, *, log_deletions=True) -> filterbot.Filterbot:
         return filterbot.Filterbot(user.User(username=self.username, _session=self), log_deletions=log_deletions)
 
+    def get_session_string(self) -> str:
+        assert self.session_string
+        return self.session_string
 
 # ------ #
 
@@ -1001,10 +1005,10 @@ def issue_login_warning() -> None:
     if getattr(suppressed_login_warning, "suppressed", 0):
         return
     warnings.warn(
-        "IMPORTANT: If you included login credentials directly in your code (e.g. session_id, session_string, ...), \
-        then make sure to EITHER instead load them from environment variables or files OR remember to remove them before \
-        you share your code with anyone else. If you want to remove this warning, \
-        use `warnings.filterwarnings('ignore', category=scratchattach.LoginDataWarning)`",
+        "IMPORTANT: If you included login credentials directly in your code (e.g. session_id, session_string, ...), "
+        "then make sure to EITHER instead load them from environment variables or files OR remember to remove them before "
+        "you share your code with anyone else. If you want to remove this warning, "
+        "use `warnings.filterwarnings('ignore', category=scratchattach.LoginDataWarning)`",
         exceptions.LoginDataWarning
     )
 
@@ -1033,7 +1037,7 @@ def login_by_id(session_id: str, *, username: Optional[str] = None, password: Op
     issue_login_warning()
     if password is not None:
         session_data = dict(session_id=session_id, username=username, password=password)
-        session_string = base64.b64encode(json.dumps(session_data).encode())
+        session_string = base64.b64encode(json.dumps(session_data).encode()).decode()
     else:
         session_string = None
     _session = Session(id=session_id, username=username, session_string=session_string, xtoken=xtoken)

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach/site/user.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 import json
 import random
 import string
+from datetime import datetime
 
 from ..eventhandlers import message_events
 from . import project
@@ -259,7 +260,7 @@ class User(BaseSiteComponent):
 
     def studios_following_count(self):
         text = requests.get(
-            f"https://scratch.mit.edu/users/{self.username}/studios/",
+            f"https://scratch.mit.edu/users/{self.username}/studios_following/",
             headers = self._headers
         ).text
         return commons.webscrape_count(text, "Studios I Follow (", ")")
@@ -555,6 +556,12 @@ class User(BaseSiteComponent):
             if '{"error": "isFlood"}' in text:
                 raise(exceptions.CommentPostFailure(
                     "You are being rate-limited for running this operation too often. Implement a cooldown of about 10 seconds."))
+            elif '<script id="error-data" type="application/json">' in text:
+                raw_error_data = text.split('<script id="error-data" type="application/json">')[1].split('</script>')[0]
+                error_data = json.loads(raw_error_data)
+                expires = error_data['mute_status']['muteExpiresAt']
+                expires = datetime.utcfromtimestamp(expires)
+                raise(exceptions.CommentPostFailure(f"You have been muted. Mute expires on {expires}"))
             else:
                 raise(exceptions.FetchError(f"Couldn't parse API response: {r.text!r}"))
 

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.11
+Version: 2.1.13
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool
@@ -18,6 +18,7 @@ Requires-Dist: websocket-client
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: SimpleWebSocketServer
+Requires-Dist: typing-extensions
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach.egg-info/SOURCES.txt

@@ -64,4 +64,5 @@ scratchattach/utils/encoder.py
 scratchattach/utils/enums.py
 scratchattach/utils/exceptions.py
 scratchattach/utils/requests.py
+tests/test1.py
 tests/test_import.py

{scratchattach-2.1.11 → scratchattach-2.1.13}/scratchattach.egg-info/requires.txt

@@ -2,3 +2,4 @@ websocket-client
 requests
 bs4
 SimpleWebSocketServer
+typing-extensions

{scratchattach-2.1.11 → scratchattach-2.1.13}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '2.1.11'
+VERSION = '2.1.13'
 DESCRIPTION = 'A Scratch API Wrapper'
 LONG_DESCRIPTION = DESCRIPTION
 
@@ -16,7 +16,7 @@ setup(
     long_description_content_type="text/markdown",
     long_description=open('README.md', encoding='utf-8').read(),
     packages=find_packages(),
-    install_requires=["websocket-client","requests","bs4","SimpleWebSocketServer"],
+    install_requires=["websocket-client","requests","bs4","SimpleWebSocketServer", "typing-extensions"],
     keywords=['scratch api', 'scratchattach', 'scratch api python', 'scratch python', 'scratch for python', 'scratch', 'scratch cloud', 'scratch cloud variables', 'scratch bot'],
     url='https://scratchattach.tim1de.net',
     classifiers=[

scratchattach-2.1.13/tests/test1.py

@@ -0,0 +1,20 @@
+exit()
+import dotenv
+dotenv.load_dotenv()
+import scratchattach
+import os
+
+session_string = os.getenv("SCRATCH_SESSION_STRING")
+assert session_string
+
+session = scratchattach.login_by_session_string(session_string)
+
+cloud = session.connect_cloud(693122627)
+client = cloud.requests()
+
+@client.request(name="get")
+def get(user1, user2):
+    print(user1, user2, client.get_requester())
+    return "hi"
+
+client.start()