scratchattach 2.1.10a2__tar.gz → 2.1.11__tar.gz

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a2
+Version: 2.1.11
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/scratchattach/eventhandlers/cloud_requests.py

@@ -23,7 +23,7 @@ class Request:
         self.enabled = enabled
         self.response_priority = response_priority
         self.cloud_requests = cloud_requests # the corresponding CloudRequests object
-        self.debug = debug
+        self.debug = debug or self.cloud_requests.debug
         
     def __call__(self, received_request):
         if not self.enabled:
@@ -63,7 +63,7 @@ class CloudRequests(CloudEvents):
 
     # The CloudRequests class is built upon CloudEvents, similar to how Filterbot is built upon MessageEvents
 
-    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive"):
+    def __init__(self, cloud, used_cloud_vars=["1", "2", "3", "4", "5", "6", "7", "8", "9"], no_packet_loss=False, respond_order="receive", debug=False):
         super().__init__(cloud)
         # Setup
         self._requests = {}
@@ -73,6 +73,7 @@ class CloudRequests(CloudEvents):
         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
+        self.debug = debug
 
         # Lists and dicts for saving request-related stuff
         self.request_parts = {} # Dict (key: request_id) for saving the parts of the requests not fully received yet
@@ -99,7 +100,7 @@ class CloudRequests(CloudEvents):
 
     # -- Adding and removing requests --
 
-    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0):
+    def request(self, function=None, *, enabled=True, name=None, thread=True, response_priority=0, debug=False):
         """
         Decorator function. Adds a request to the request handler.
         """
@@ -113,7 +114,8 @@ class CloudRequests(CloudEvents):
                 thread=thread,
                 response_priority=response_priority,
                 on_call=function,
-                cloud_requests=self
+                cloud_requests=self,
+                debug=debug
             )
 
         if function is None:

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/scratchattach/site/_base.py

@@ -4,9 +4,10 @@ from abc import ABC, abstractmethod
 
 import requests
 from ..utils import exceptions, commons
+from typing import TypeVar
 from types import FunctionType
 
-
+C = TypeVar("C", bound="BaseSiteComponent")
 class BaseSiteComponent(ABC):
     @abstractmethod
     def __init__(self):
@@ -51,7 +52,7 @@ class BaseSiteComponent(ABC):
             raise exceptions.Unauthenticated(
                 "You need to use session.connect_xyz (NOT get_xyz) in order to perform this operation.")
 
-    def _make_linked_object(self, identificator_id, identificator, Class, NotFoundException) -> BaseSiteComponent:
+    def _make_linked_object(self, identificator_id, identificator, Class: type[C], NotFoundException) -> C:
         """
         Internal function for making a linked object (authentication kept) based on an identificator (like a project id or username)
         Class must inherit from BaseSiteComponent

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/scratchattach/site/project.py

@@ -136,8 +136,6 @@ class PartialProject(BaseSiteComponent):
         """
         self._assert_auth()
 
-        global CREATE_PROJECT_USES
-
         if title is None:
             if "title" in self.__dict__:
                 title = self.title+" remix"

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/scratchattach/site/user.py

@@ -19,6 +19,17 @@ from . import activity
 
 from ..utils.requests import Requests as requests
 
+class Verificator:
+
+    def __init__(self, user: User, project_id: int):
+        self.project = user._make_linked_object("id", project_id, project.Project, exceptions.ProjectNotFound)
+        self.projecturl = self.project.url
+        self.code = ''.join(random.choices(string.ascii_letters + string.digits, k=8))
+        self.username = user.username
+
+    def check(self) -> bool:
+        return bool(list(filter(lambda x : x.author_name == self.username and (x.content == self.code or x.content.startswith(self.code) or x.content.endswith(self.code)), self.project.comments())))
+
 class User(BaseSiteComponent):
 
     '''
@@ -799,20 +810,8 @@ class User(BaseSiteComponent):
         It will return True if the user commented the code.
         """
 
-        class Verificator:
-
-            def __init__(self, user):
-                self.project = user._make_linked_object("id", verification_project_id, project.Project, exceptions.ProjectNotFound)
-                self.projecturl = self.project.url
-                self.code = ''.join(random.choices(string.ascii_letters + string.digits, k=130))
-                self.username = user.username
-
-            def check(self):
-                return list(filter(lambda x : x.author_name == self.username, self.project.comments())) != []
-
-        v = Verificator(self)
-        print(f"{self.username} has to go to {v.projecturl} and comment {v.code} to verify their identity")
-        return Verificator(self)
+        v = Verificator(self, verification_project_id)
+        return v
 
 # ------ #
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scratchattach
-Version: 2.1.10a2
+Version: 2.1.11
 Summary: A Scratch API Wrapper
 Home-page: https://scratchattach.tim1de.net
 Author: TimMcCool

{scratchattach-2.1.10a2 → scratchattach-2.1.11}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '2.1.10a2'
+VERSION = '2.1.11'
 DESCRIPTION = 'A Scratch API Wrapper'
 LONG_DESCRIPTION = DESCRIPTION