Revert recent commits (that were meant to be in a pr):

Revert "parse alerts"

This reverts commit 685700f.

Revert "remove redundant arguments"

This reverts commit 13aa853.

Revert "fix: pass an actual session"

This reverts commit 1a5932a.

Revert "feat: create enum for classroom alerts"

This reverts commit d3811f0.

Revert "feat: add more parsing based on scratch html & add message property"

This reverts commit 37e44cd.

Revert "fix: classroom activity - some cases lead to same outcome"

This reverts commit 576d33b.

Revert "fix: remove redundant/commented-out code"

This reverts commit 75c48a1.

Author: faretek1

scratchattach/site/activity.py

@@ -80,9 +80,8 @@ def _update_from_json(self, data: dict):
         else:
             recipient_username = None
 
-        default_case = True
-        # Even if `activity_type` is an invalid value; it will default to 'user performed an action'
-
+        default_case = False
+        """Whether this is 'blank'; it will default to 'user performed an action'"""
         if activity_type == 0:
             # follow
             followed_username = data["followed_username"]
@@ -151,7 +150,13 @@ def _update_from_json(self, data: dict):
             self.project_id = project_id
             self.recipient_username = recipient_username
 
-        elif activity_type in (8, 9, 10):
+        elif activity_type == 8:
+            default_case = True
+
+        elif activity_type == 9:
+            default_case = True
+
+        elif activity_type == 10:
             # Share/Reshare project
             project_id = data["project"]
             is_reshare = data["is_reshare"]
@@ -182,6 +187,9 @@ def _update_from_json(self, data: dict):
             self.project_id = parent_id
             self.recipient_username = recipient_username
 
+        elif activity_type == 12:
+            default_case = True
+
         elif activity_type == 13:
             # Create ('add') studio
             studio_id = data["gallery"]
@@ -208,7 +216,16 @@ def _update_from_json(self, data: dict):
             self.username = username
             self.gallery_id = studio_id
 
-        elif activity_type in (16, 17, 18, 19):
+        elif activity_type == 16:
+            default_case = True
+
+        elif activity_type == 17:
+            default_case = True
+
+        elif activity_type == 18:
+            default_case = True
+
+        elif activity_type == 19:
             # Remove project from studio
 
             project_id = data["project"]
@@ -223,7 +240,13 @@ def _update_from_json(self, data: dict):
             self.username = username
             self.project_id = project_id
 
-        elif activity_type in (20, 21, 22):
+        elif activity_type == 20:
+            default_case = True
+
+        elif activity_type == 21:
+            default_case = True
+
+        elif activity_type == 22:
             # Was promoted to manager for studio
             studio_id = data["gallery"]
 
@@ -237,7 +260,13 @@ def _update_from_json(self, data: dict):
             self.recipient_username = recipient_username
             self.gallery_id = studio_id
 
-        elif activity_type in (23, 24, 25):
+        elif activity_type == 23:
+            default_case = True
+
+        elif activity_type == 24:
+            default_case = True
+
+        elif activity_type == 25:
             # Update profile
             raw = f"{username} made a profile update"
 
@@ -247,7 +276,10 @@ def _update_from_json(self, data: dict):
 
             self.username = username
 
-        elif activity_type in (26, 27):
+        elif activity_type == 26:
+            default_case = True
+
+        elif activity_type == 27:
             # Comment (quite complicated)
             comment_type: int = data["comment_type"]
             fragment = data["comment_fragment"]
@@ -282,10 +314,12 @@ def _update_from_json(self, data: dict):
             self.comment_obj_title = comment_obj_title
             self.comment_id = comment_id
 
+        else:
+            default_case = True
 
         if default_case:
             # This is coded in the scratch HTML, haven't found an example of it though
-            raw = f"{username} performed an action."
+            raw = f"{username} performed an action"
 
             self.raw = raw
             self.datetime_created = _time

scratchattach/site/alert.py

@@ -31,7 +31,7 @@
 
 from bs4 import BeautifulSoup
 
-from . import activity, classroom, forum, studio, user, project, backpack_asset, alert
+from . import activity, classroom, forum, studio, user, project, backpack_asset
 # noinspection PyProtectedMember
 from ._base import BaseSiteComponent
 from ..cloud import cloud, _base
@@ -265,9 +265,7 @@ def classroom_alerts(self, _classroom: Optional[classroom.Classroom | int] = Non
                             params={"page": page, "ascsort": ascsort, "descsort": descsort},
                             headers=self._headers, cookies=self._cookies).json()
 
-        alerts = [alert.EducatorAlert.from_json(alert_data, self) for alert_data in data]
-
-        return alerts
+        return data
 
     def clear_messages(self):
         """

scratchattach/site/session.py

@@ -4,12 +4,13 @@
 """
 from __future__ import annotations
 
-from dataclasses import dataclass
 from enum import Enum
+from dataclasses import dataclass
+
 from typing import Optional, Callable, Iterable
 
 
-@dataclass
+@dataclass(init=True, repr=True)
 class Language:
     name: str = None
     code: str = None
@@ -43,7 +44,7 @@ def apply_func(x):
 
                 if apply_func(_val) == value:
                     return item_obj
-
+                  
             except TypeError:
                 pass
 
@@ -166,7 +167,7 @@ def all_of(cls, attr_name: str = "name", apply_func: Optional[Callable] = None)
         return super().all_of(attr_name, apply_func)
 
 
-@dataclass
+@dataclass(init=True, repr=True)
 class TTSVoice:
     name: str
     gender: str
@@ -194,40 +195,3 @@ def find(cls, value, by: str = "name", apply_func: Optional[Callable] = None) ->
     def all_of(cls, attr_name: str = "name", apply_func: Optional[Callable] = None) -> Iterable:
         return super().all_of(attr_name, apply_func)
 
-
-@dataclass
-class AlertType:
-    id: int
-    message: str
-
-
-class AlertTypes(_EnumWrapper):
-    # Reference: https://github.com/TimMcCool/scratchattach/issues/304#issuecomment-2800110811
-    # NOTE: THE TEXT WITHIN THE BRACES HERE MATTERS! IF YOU WANT TO CHANGE IT, MAKE SURE TO EDIT `site.alert.EducatorAlert`!
-    ban = AlertType(0, "{username} was banned.")
-    unban = AlertType(1, "{username} was unbanned.")
-    excluded_from_homepage = AlertType(2, "{username} was excluded from homepage")
-    excluded_from_homepage2 = AlertType(3, "{username} was excluded from homepage") # for some reason there are duplicates
-    notified = AlertType(4, "{username} was notified by a Scratch Administrator. Notification type: {notification_type}")
-    autoban = AlertType(5, "{username} was banned automatically")
-    autoremoved = AlertType(6, "{project} by {username} was removed automatically")
-    project_censored2 = AlertType(7, "{project} by {username} was censored.")  # <empty #7>
-    project_censored = AlertType(20, "{project} by {username} was censored.")
-    project_uncensored = AlertType(8, "{project} by {username} was uncensored.")
-    project_reviewed2 = AlertType(9, "{project} by {username} was reviewed by a Scratch Administrator.")  # <empty #9>
-    project_reviewed = AlertType(10, "{project} by {username} was reviewed by a Scratch Administrator.")
-    project_deleted = AlertType(11, "{project} by {username} was deleted by a Scratch Administrator.")
-    user_deleted2 = AlertType(12, "{username} was deleted by a Scratch Administrator")  # <empty #12>
-    user_deleted = AlertType(17, "{username} was deleted by a Scratch Administrator")
-    studio_reviewed2 = AlertType(13, "{studio} was reviewed by a Scratch Administrator.")  # <empty #13>
-    studio_reviewed = AlertType(14, "{studio} was reviewed by a Scratch Administrator.")
-    studio_deleted = AlertType(15, "{studio} was deleted by a Scratch Administrator.")
-    email_confirm2 = AlertType(16, "The email address of {username} was confirmed by a Scratch Administrator")  # <empty #16>
-    email_confirm = AlertType(18, "The email address of {username} was confirmed by a Scratch Administrator") # no '.' in HTML
-    email_unconfirm = AlertType(19, "The email address of {username} was set as not confirmed by a Scratch Administrator")
-    automute = AlertType(22, "{username} was automatically muted by our comment filters. The comment they tried to post was: {comment}")
-    default = AlertType(-1, "{username} had an admin action performed.") # default case
-
-    @classmethod
-    def find(cls, value, by: str = "id", apply_func: Optional[Callable] = None) -> AlertType:
-        return super().find(value, by, apply_func)