Improve timestamp parsing

Author: henry232323

src/spectrum/client.py

@@ -241,7 +241,8 @@ async def subscribe_to_all(self, max_threads=50):
         await self.subscribe_to_topic(*thread_keys, scope='content')
 
     async def subscribe_to_default(self):
-        """Subscribe to the default set of topics, including the public SC community and all direct messages and group messages."""
+        """Subscribe to the default set of topics, including the public SC community and all direct messages and
+        group messages."""
         keys = []
         for lobby in self.group_messages or []:
             keys.append(lobby.subscription_key)
@@ -260,3 +261,7 @@ def _replace_lobby(self, payload: dict):
         lobby = super()._replace_lobby(payload)
         asyncio.ensure_future(lobby.fetch_presence())
         return lobby
+
+    def close(self):
+        """End the run task"""
+        self._gateway.close()

src/spectrum/gateway.py

@@ -125,3 +125,6 @@ async def received_message(self, data):
         if isinstance(payload, dict):
             log.debug('Received %s', payload)
             await self._client._dispatch_event(payload['type'], payload)
+
+    def close(self):
+        self._running = False

src/spectrum/models/activity.py

@@ -1,6 +1,8 @@
 import dataclasses
 from datetime import datetime
 
+from spectrum.util.datetime import parse_timestamp
+
 
 @dataclasses.dataclass
 class Activity:
@@ -12,4 +14,4 @@ class Activity:
     def __post_init__(self):
         self.member_id = self.member_id or int(self.member['id'])
         self.highlight_role_id = int(self.highlight_role_id) if self.highlight_role_id else None
-        self.time_created = datetime.utcfromtimestamp(self.time_created)
+        self.time_created = parse_timestamp(self.time_created)

src/spectrum/models/lobby.py

@@ -1,7 +1,6 @@
-from datetime import datetime
-
 from . import message, abc
 from .. import httpclient
+from ..util.datetime import parse_timestamp
 from ..util.entity_ranges import get_entity_ranges
 
 
@@ -55,7 +54,7 @@ def __init__(self, client: 'httpclient.HTTPClient', payload: dict):
         self.description = payload['description']
         self.color = payload['color']
         self.icon = payload['icon']
-        self.time_created = datetime.utcfromtimestamp(payload['time_created'])
+        self.time_created = parse_timestamp(payload['time_created'])
         self.subscription_key = payload['subscription_key']
         self.leader_id = int(payload['leader_id']) if payload['leader_id'] else None
         self.online_members_count = payload.get('online_members_count')
@@ -88,7 +87,6 @@ async def send(self, content: str, add_links=True):
         if add_links:
             entity_ranges = get_entity_ranges(content)
 
-
         payload = await self._client._http.send_message({
             "lobby_id": self.id,
             "content_state": {"blocks": [

src/spectrum/models/reply.py

@@ -1,8 +1,7 @@
-from datetime import datetime
-
 from . import abc
-from .. import httpclient
 from .content import ContentBlock
+from .. import httpclient
+from ..util.datetime import parse_timestamp
 
 
 class Reply(abc.Identifier):
@@ -95,8 +94,8 @@ def __init__(self, client: 'httpclient.HTTPClient', payload: dict):
         self._client = client
         self.id = int(payload["id"])
         self.thread_id = int(payload["thread_id"])
-        self.time_created = datetime.utcfromtimestamp(payload["time_created"])
-        self.time_modified = datetime.utcfromtimestamp(payload["time_modified"]) if payload["time_modified"] else None
+        self.time_created = parse_timestamp(payload["time_created"])
+        self.time_modified = parse_timestamp(payload["time_modified"])
         self.content_blocks = [ContentBlock(**block) for block in payload["content_blocks"]]
         self.is_erased = payload["is_erased"]
         self.erased_by = payload["erased_by"]

src/spectrum/models/thread.py

@@ -1,11 +1,11 @@
 import dataclasses
-from datetime import datetime
 from typing import Optional
 
 from . import abc
 from .activity import Activity
 from .content import ContentBlock
 from .. import httpclient
+from ..util.datetime import parse_timestamp
 
 
 @dataclasses.dataclass
@@ -339,8 +339,8 @@ class Thread(abc.Identifier, abc.Subscription):
     def __init__(self, client: 'httpclient.HTTPClient', payload: dict):
         self._client = client
         self.id = int(payload["id"])
-        self.time_created = datetime.utcfromtimestamp(payload["time_created"])
-        self.time_modified = datetime.utcfromtimestamp(payload["time_modified"]) if payload["time_modified"] else None
+        self.time_created = parse_timestamp(payload["time_created"])
+        self.time_modified = parse_timestamp(payload["time_modified"])
 
         self.channel_id = int(payload["channel_id"])
         self.community_id = int(payload["community_id"])

src/spectrum/util/datetime.py

@@ -0,0 +1,8 @@
+from datetime import datetime, UTC
+
+
+def parse_timestamp(s):
+    try:
+        return datetime.fromtimestamp(s, UTC) if s else None
+    except OSError:
+        return None