Cleanup event base definitions

chats/Twitch/sources/TwitchIRC.py

@@ -9,7 +9,7 @@ from miniirc import ircv3_message_parser
 from PIL import Image
 
 from events.Message import Message, USER_TYPE
-from events.Subscription import Subscription
+from events import Subscription
 
 from .NonBlockingWebsocket import NonBlockingWebsocket
 from ..Events import Raid

events/Delete.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass, asdict
+
+from . import Event
+
+
+@dataclass
+class Delete(Event):
+    target_id: int
+    show_masked: bool = False
+    reason: str = None
+
+    def to_dict(self):
+        return asdict(self)

events/EventBase.py

@@ -0,0 +1,14 @@
+import random
+from dataclasses import dataclass, field, asdict
+
+
+@dataclass
+class Event:
+    via: str
+    timestamp: float
+    id: int = field(default_factory=lambda: random.getrandbits(32), init=False)
+    # TODO: Needs a raw data field and timestamp to default to time.time().
+    #       This depends on the kw_only feature coming in python 3.10
+
+    def to_dict(self):
+        return asdict(self)

events/__init__.py

@@ -1,24 +1,4 @@
-import random
-from dataclasses import dataclass, field, asdict
-
-
-@dataclass
-class Delete:
-    id: int
-    show_masked: bool = False
-    reason: str = None
-
-    def to_dict(self):
-        return asdict(self)
-
-
-@dataclass
-class Event:
-    via: str
-    timestamp: float
-    id: int = field(default_factory=lambda: random.getrandbits(32), init=False)
-    # TODO: Needs a raw data field and timestamp to default to time.time().
-    #       This depends on the kw_only feature coming in python 3.10
-
-    def to_dict(self):
-        return asdict(self)
+from .EventBase import Event
+from .Message import Message
+from .Delete import Delete
+from .Subscription import Subscription

plugins/Info/InfoPlugin.py

@@ -1,5 +1,5 @@
 from plugins import PluginBase, TriggerInterface
-from events.Message import Message
+from events import Message
 
 
 class InfoPlugin(PluginBase, TriggerInterface):

plugins/PhraseCounter/PhraseCounter.py

@@ -1,5 +1,5 @@
 from plugins import PluginBase
-from events.Message import Message
+from events import Message
 
 from .Formatter import PhraseCountFormatter