diff options
Diffstat (limited to 'packages/meshbay-node/src/meshbay_node/roster.py')
| -rw-r--r-- | packages/meshbay-node/src/meshbay_node/roster.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/packages/meshbay-node/src/meshbay_node/roster.py b/packages/meshbay-node/src/meshbay_node/roster.py index 8c9b3ef..9478a32 100644 --- a/packages/meshbay-node/src/meshbay_node/roster.py +++ b/packages/meshbay-node/src/meshbay_node/roster.py @@ -24,13 +24,11 @@ from __future__ import annotations import hashlib import json import logging -import os import secrets -from datetime import datetime, timedelta, timezone +from datetime import UTC, datetime, timedelta from pathlib import Path import aiosqlite - from meshbay_common.paths import fold log = logging.getLogger(__name__) @@ -194,11 +192,11 @@ def hash_code(code: str) -> str: def _now() -> str: - return datetime.now(timezone.utc).isoformat(timespec="seconds") + return datetime.now(UTC).isoformat(timespec="seconds") def _iso_in(seconds: int) -> str: - return (datetime.now(timezone.utc) + return (datetime.now(UTC) + timedelta(seconds=seconds)).isoformat(timespec="seconds") @@ -1073,7 +1071,7 @@ class Roster: (group_id, user_id), ) code = generate_code() - expires = datetime.now(timezone.utc) + timedelta(seconds=ttl) + expires = datetime.now(UTC) + timedelta(seconds=ttl) await self._db.execute( "INSERT INTO invites (code_hash, group_id, user_id, username, role, " "created_by, created_at, expires_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", @@ -1106,7 +1104,7 @@ class Roster: # redeemed by whoever finds it first. if invite["user_id"] != user_id: return None - if datetime.fromisoformat(invite["expires_at"]) < datetime.now(timezone.utc): + if datetime.fromisoformat(invite["expires_at"]) < datetime.now(UTC): return None cur = await self._db.execute( |