scratchattach 2.1.11__py3-none-any.whl → 2.1.13__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → scratchattach-2.1.13.dist-info}/METADATA

@@ -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.dist-info → scratchattach-2.1.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 scratchattach/__init__.py,sha256=2iiV0SghFUyJJrJYt668cSoDrxSjLCWNtzMdhttnMdA,1532
 scratchattach/cloud/__init__.py,sha256=MN7s4grQcciqUO7TiFjTbU2sC69m6XXlwOHNRbN3FKo,41
-scratchattach/cloud/_base.py,sha256=gMaZkiNL0MW7TjSmn_2d8en4GFYF5Bxyy-pPENKrBGc,17753
+scratchattach/cloud/_base.py,sha256=3Kc1VKX6ogDqyItLUbHPom9DeGq7EUjpS0bjr-JuTHQ,17769
 scratchattach/cloud/cloud.py,sha256=TcIcY0tMe1jRdzxJrz6AIL0gW9xeMc9x4vNUCvBbRWY,7735
 scratchattach/editor/__init__.py,sha256=gfTQrtyQ-oZJBanp-5eNae72cwm4WoKHzNtZ4rn1dqg,727
 scratchattach/editor/asset.py,sha256=jNXJA09hU5b4ZTLegu7c0azlwHo5k_XZJfDN24uDux8,6078
 scratchattach/editor/backpack_json.py,sha256=PZGNIFNf0MS3hn8cKZEp9ZeQWdBE-xWq5PEwiN8IzWM,3900
 scratchattach/editor/base.py,sha256=Aq_a9tAMgKuaG1mmkVDoPHaV-z1bn1UUz6YcU6jThqc,3914
-scratchattach/editor/block.py,sha256=1lqEmR_PK74pGurl-6rDJbGXpfkmCycsyheW-29BFdc,16274
+scratchattach/editor/block.py,sha256=q-xdjmczbI702lp_c4EdBMy5iose88MyluFXz-3ZVx8,16303
 scratchattach/editor/blockshape.py,sha256=a2WY_UPcLINNS-E2NB7uvnDrE1Z62LFTNybDX5DzZPw,25133
 scratchattach/editor/build_defaulting.py,sha256=SoIEw6iZO2y23Ry5uK8wLfJXdN3U7k30F3_OKWWYUgk,1254
 scratchattach/editor/comment.py,sha256=2kZYSAiILSlrWU7RfzNf9PJnuGHVKXLWGzWnD_PW8-M,2250
@@ -25,13 +25,13 @@ scratchattach/editor/sprite.py,sha256=wGDdaaP09UPY0XB9k2qbw9Ac0wwMukno8NPR9tFgOH
 scratchattach/editor/twconfig.py,sha256=JMqkZNtibH25t6BqXqql9Lv_3cAkMtYpLtX3cZvAu4Q,3313
 scratchattach/editor/vlb.py,sha256=1ejSsZcolNJ0xlD9nhbP6Gxf881cqJiLwyGri4ZQm1M,4158
 scratchattach/eventhandlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scratchattach/eventhandlers/_base.py,sha256=8NjYF7qOEhjUFksA0qKg4XDH5aXgEG5PSVgMAYDbGD4,3078
+scratchattach/eventhandlers/_base.py,sha256=yDTYLqWbFhOEEKcrxhncR8uHRSgom0_7lVkICgcbuBE,3087
 scratchattach/eventhandlers/cloud_events.py,sha256=iaUFo58D5JUCHstch2VhmhqMPq8WX_xrzPelFMCFRF8,4084
 scratchattach/eventhandlers/cloud_recorder.py,sha256=o4wcWJFCddpcSsPx5YU2DFFMFoKUknKM2RQ36HLpheQ,800
-scratchattach/eventhandlers/cloud_requests.py,sha256=jW3tLpfNmgsVuac5Y7vqx--qu1nQxytTV71Dx6ejGfU,22191
+scratchattach/eventhandlers/cloud_requests.py,sha256=49VB89H1V49L1MVlF0MXbmBRY7pmyLZrsGbfYOcI42o,22085
 scratchattach/eventhandlers/cloud_server.py,sha256=tah77FTr1Kp4DWpux48w8pJNZQL_1qL0hAXaAXlzQ9Y,12266
 scratchattach/eventhandlers/cloud_storage.py,sha256=9dvKPxbPZ_hBhw1HYlTl72YJmBo2OMwrSrMQ7kQwwOE,4660
-scratchattach/eventhandlers/combine.py,sha256=2n5SC6tSpgrmmK04sqsm4eqx26O9haBKA5YgsWNIoso,895
+scratchattach/eventhandlers/combine.py,sha256=YiWI6WI1BySioXpfYaMv8noBM14EjZa7dtsJsMTshEU,894
 scratchattach/eventhandlers/filterbot.py,sha256=RvGCm-2iaC8SAC4nDMlDv0MPp80CsRr4CFGmnIuEfg8,7462
 scratchattach/eventhandlers/message_events.py,sha256=99ez4HdsDKRjVUvPpNolDaOMtHrPlRJa8agi88EYc7E,1764
 scratchattach/other/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -39,7 +39,7 @@ scratchattach/other/other_apis.py,sha256=7EyB3uB-1AYAH7Nb6eZ3VmACGdXvEQ39NJ1iahU
 scratchattach/other/project_json_capabilities.py,sha256=qSlJIJOgAxhSchD3fOIhK57rCe0_GrHadXBs5UXKuFU,22622
 scratchattach/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scratchattach/site/_base.py,sha256=S-ynYKe7LslZxaZzE0hZsga0eLB2XlQo5erAfKct8yc,2193
-scratchattach/site/activity.py,sha256=a019lhoUwL9mdZI1Sz9mMg9EsDt2Lp5ziJSSDQ8-BWM,14319
+scratchattach/site/activity.py,sha256=fczH9_v5CoFuMTobm7BcbnMy2scf9c2ZjzfIqBEOBes,14338
 scratchattach/site/backpack_asset.py,sha256=V_ypvTi-hqf0LF8zks2uHIicraBssc1_eEHVqHMzikc,3286
 scratchattach/site/browser_cookies.py,sha256=aaYLawtifngZ0pgaXHjBiWvYHUfflS8ZcXRjTTrge3A,1566
 scratchattach/site/classroom.py,sha256=WKMOcmYzKZx_EZNR4qipHOB8nxaggFe84lxqnrWd24E,16463
@@ -47,17 +47,17 @@ scratchattach/site/cloud_activity.py,sha256=ie_DhChicks_RBagMM6_GfFIi1iAxf6UtJ3V
 scratchattach/site/comment.py,sha256=Yt86iqwKZhCKNTEvB9DNDj9mXRV6A9qXyy1MrE7rMnA,8377
 scratchattach/site/forum.py,sha256=BZ_2jqDW3o-22AG1vP9s1W7l9yBbjBkFqG_DGV9IDuA,14802
 scratchattach/site/project.py,sha256=_yMzacrTiy_LYfyEfWVeoHRHm5t9vBUr88eR_ULcK7Q,30931
-scratchattach/site/session.py,sha256=mP4tTSZUs9dz0e3Zk6JF9RmSizFaYExbbEEYmA5TBnM,48278
+scratchattach/site/session.py,sha256=0R3siN6CUjCHcQ-0oa27m5NBHjMULYheZamtmGQ0KEM,48439
 scratchattach/site/studio.py,sha256=Tv7AY1TwvlQpR9VjUEs-qmavrZsLxchkXk59aoH0_EI,22918
-scratchattach/site/user.py,sha256=TCO1QRtPeJdb3p-ziCwa6NqObHSNP0DMmcOl5De-Yl8,34496
+scratchattach/site/user.py,sha256=20fnNj_HL339xtmHq0OGAxAAXfWvhBUmbM5UDoa_RWI,35024
 scratchattach/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scratchattach/utils/commons.py,sha256=6yCfUvQlQbl2VPhxJiK1MSdBdXpBbkr5uYyB2LLIcdI,8155
 scratchattach/utils/encoder.py,sha256=rqJfQ5gmjf7s8aTiGhR0W1ejYN5tHbAgJlxv7JhGqZQ,2479
 scratchattach/utils/enums.py,sha256=93ylCrxWycunahISSIjBqTIJ2r1Hb2b9RMvvzmUiQ-c,8294
 scratchattach/utils/exceptions.py,sha256=hrnPuXRRwR-kTHnrQVyfAD6PDOg1hZQd-jaXuUSNKSQ,6274
 scratchattach/utils/requests.py,sha256=x_EfcbLdBpQQuH9g4MMSaM8RN3tUm9OtzPEJQQiwilY,2709
-scratchattach-2.1.11.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
-scratchattach-2.1.11.dist-info/METADATA,sha256=mC-Kltdsi4hFeQOpg44My3rIvG831mrvMJJdQGMLngY,5463
-scratchattach-2.1.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-scratchattach-2.1.11.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
-scratchattach-2.1.11.dist-info/RECORD,,
+scratchattach-2.1.13.dist-info/licenses/LICENSE,sha256=1PRKLhZU4wYt5M-C9f7q0W3go3u_ojnZMNOdR3g3J-E,1080
+scratchattach-2.1.13.dist-info/METADATA,sha256=M5czwHWY0s6qbdYrPBhI6Qo7N5dP9VGFX0f_I0fcsDU,5496
+scratchattach-2.1.13.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+scratchattach-2.1.13.dist-info/top_level.txt,sha256=gIwCwW39ohXn0JlnvSzAjV7VtL3qPlRnHiRqBbxsEUE,14
+scratchattach-2.1.13.dist-info/RECORD,,

{scratchattach-2.1.11.dist-info → scratchattach-2.1.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any