diff --git a/app/db/crud.py b/app/db/crud.py index 7f4d31f..0992032 100644 --- a/app/db/crud.py +++ b/app/db/crud.py @@ -788,9 +788,7 @@ def get_node_usage( while current <= end.replace(tzinfo=timezone.utc): usage = usages.get(current.timestamp()) or 0 - result.usages.append( - (int(current.timestamp()), usage) - ) + result.usages.append((int(current.timestamp()), usage)) result.total += usage current += timedelta(hours=1) diff --git a/app/db/models.py b/app/db/models.py index d3ef5b1..40bee45 100644 --- a/app/db/models.py +++ b/app/db/models.py @@ -264,7 +264,9 @@ class User(Base): @property def subscription_url(self): - prefix = self.admin.subscription_url_prefix or SUBSCRIPTION_URL_PREFIX + prefix = ( + self.admin.subscription_url_prefix if self.admin else None + ) or SUBSCRIPTION_URL_PREFIX return ( prefix.replace("*", secrets.token_hex(8)) + f"/sub/{self.username}/{self.key}" @@ -272,7 +274,7 @@ class User(Base): @hybrid_property def owner_username(self): - return self.admin.username + return self.admin.username if self.admin else None class Backend(Base): diff --git a/app/models/user.py b/app/models/user.py index 88c4397..81506e1 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -140,7 +140,7 @@ class UserResponse(User): created_at: datetime service_ids: list[int] subscription_url: str - owner_username: str + owner_username: str | None traffic_reset_at: datetime | None model_config = ConfigDict(from_attributes=True)