fix: active user charge bug (#177)

Author: erfjab

app/api/types/marzneshin/user.py

@@ -103,12 +103,20 @@ def is_expired(self) -> bool:
     @property
     def time_to_second(self) -> int:
         if self.expire_strategy == UserExpireStrategy.NEVER:
-            return None
+            return 0
         elif self.expire_strategy == UserExpireStrategy.FIXED_DATE and self.expire_date:
-            return self.expire_date.second
-        elif self.expire_strategy == UserExpireStrategy.START_ON_FIRST_USE:
+            return int(
+                (
+                    self.expire_date.astimezone(timezone.utc)
+                    - datetime.now(timezone.utc)
+                ).total_seconds()
+            )
+        elif (
+            self.expire_strategy == UserExpireStrategy.START_ON_FIRST_USE
+            and self.usage_duration
+        ):
             return self.usage_duration
-        return None
+        return 0
 
     @property
     def data_percent(self) -> int:

app/routers/users/data.py

@@ -24,7 +24,6 @@ async def data(callback: CallbackQuery, callback_data: PageCB):
     user = await ClinetManager.get_user(server, callback_data.dataid)
     if not user:
         return await callback.answer(text=MessageTexts.NOT_FOUND, show_alert=True)
-
     return await callback.message.edit_text(
         text=user.format_data_str(),
         reply_markup=BotKeys.selector(

app/settings/utils/user.py

@@ -156,12 +156,12 @@ def advenced_charge_user_data(
                 if user.data_limit
                 else 0,
                 expire_strategy=expire_strategy,
-                expire_date=(user.expire_date or datetime.utcnow())
-                + timedelta(days=int(datelimit))
+                expire_date=timedelta(
+                    seconds=user.time_to_second + int(datelimit * (24 * 60 * 60))
+                )
                 if expire_strategy == MarzneshinUserExpireStrategy.FIXED_DATE
                 else None,
-                usage_duration=(user.usage_duration or 0)
-                + (int(datelimit) * (24 * 60 * 60))
+                usage_duration=user.time_to_second + (int(datelimit) * (24 * 60 * 60))
                 if expire_strategy == MarzneshinUserExpireStrategy.START_ON_FIRST_USE
                 else None,
             ).dict()