Merge branch 'main' of https://github.com/TimMcCool/scratchattach

Author: TheCommCraft

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,44 @@
+name: Bug report
+description: File a bug report.
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: scratchattach-version
+    attributes:
+      label: scratchattach version
+      description: The version of scratchattach you have installed. Can be found using `python -m pip show scratchattach`
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+    validations:
+      required: true
+  - type: dropdown
+    id: cloudvariables-location
+    attributes:
+      label: Cloud variables
+      description: If your bug is based in some form on cloud variables, which cloud variable server did you use? If your bug doesn't have anything to do with cloud variables, submit "No cloud vars"
+      options:
+        - Scratch
+        - TurboWarp
+        - Custom Cloud Server
+        - Other
+        - No cloud vars
+      default: 0
+    validations:
+      required: true
+  - type: textarea
+    id: traceback
+    attributes:
+      label: Traceback
+      description: If you received a traceback, please copy paste the full traceback here. Otherwise write "none".
+      render: txt
+    validations:
+      required: true

scratchattach/eventhandlers/cloud_requests.py

@@ -69,7 +69,6 @@ def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8
         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 @@ def request(self, function=None, *, enabled=True, name=None, thread=True, respon
         """
         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,

scratchattach/eventhandlers/combine.py

@@ -11,7 +11,7 @@ def request(self, function, *args, **kwargs):
 
     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 @@ def pause(self, *args, **kwargs):
 
     def resume(self, *args, **kwargs):
         for handler in self.handlers:
-            handler.resume(*args, **kwargs)
+            handler.resume(*args, **kwargs)

scratchattach/site/user.py

@@ -260,7 +260,7 @@ def studio_count(self):
 
     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 (", ")")