chore: unnecessary else

Author: M03ED

app/db/crud/user.py

@@ -504,9 +504,7 @@ async def remove_users(db: AsyncSession, db_users: list[User]):
     user_ids = [user.id for user in db_users]
 
     # Delete related subscription updates first
-    await db.execute(
-        delete(UserSubscriptionUpdate).where(UserSubscriptionUpdate.user_id.in_(user_ids))
-    )
+    await db.execute(delete(UserSubscriptionUpdate).where(UserSubscriptionUpdate.user_id.in_(user_ids)))
 
     await asyncio.gather(*[db.delete(user) for user in db_users])
     await db.commit()

app/operation/subscription.py

@@ -49,16 +49,14 @@ async def detect_client_type(user_agent: str, rules: list[SubRule]) -> ConfigFor
     def create_response_headers(user: UsersResponseWithInbounds, request_url: str, sub_settings: SubSettings) -> dict:
         """Create response headers for subscription responses, including user subscription info."""
         # Generate user subscription info
-        user_info = {"upload": 0, "download": user.used_traffic}
+        user_info = {"upload": 0, "download": user.used_traffic, "expire": 0}
 
         if user.data_limit:
             user_info["total"] = user.data_limit
-        
+
         # Always include expire key - use 0 if no expiration date
         if user.expire:
             user_info["expire"] = int(user.expire.timestamp())
-        else:
-            user_info["expire"] = 0
 
         # Create and return headers
         return {

app/subscription/singbox.py

@@ -136,13 +136,15 @@ def _transport_ws(self, config: WebSocketTransportConfig, path: str) -> dict:
 
     def _transport_grpc(self, config: GRPCTransportConfig, path: str) -> dict:
         """Handle GRPC transport - only gets GRPC config"""
-        return self._normalize_and_remove_none_values({
-            "type": "grpc",
-            "service_name": path,
-            "idle_timeout": f"{config.idle_timeout}s" if config.idle_timeout else "15s",
-            "ping_timeout": f"{config.health_check_timeout}s" if config.health_check_timeout else "15s",
-            "permit_without_stream": config.permit_without_stream,
-        })
+        return self._normalize_and_remove_none_values(
+            {
+                "type": "grpc",
+                "service_name": path,
+                "idle_timeout": f"{config.idle_timeout}s" if config.idle_timeout else "15s",
+                "ping_timeout": f"{config.health_check_timeout}s" if config.health_check_timeout else "15s",
+                "permit_without_stream": config.permit_without_stream,
+            }
+        )
 
     def _transport_httpupgrade(self, config: WebSocketTransportConfig, path: str) -> dict:
         """Handle HTTPUpgrade transport - only gets WS config (similar to WS)"""
@@ -190,7 +192,10 @@ def _apply_tls(self, tls_config: TLSConfig, fragment_settings: dict | None = Non
             if isinstance(tls_config.sni, str)
             else (tls_config.sni[0] if tls_config.sni else None),
             "insecure": tls_config.allowinsecure,
-            "utls": {"enabled": bool(tls_config.fingerprint) or tls_config.tls == "reality", "fingerprint": tls_config.fingerprint}
+            "utls": {
+                "enabled": bool(tls_config.fingerprint) or tls_config.tls == "reality",
+                "fingerprint": tls_config.fingerprint,
+            }
             if tls_config.fingerprint or tls_config.tls == "reality"
             else None,
             "alpn": tls_config.alpn_singbox,  # Pre-formatted for sing-box!
@@ -322,7 +327,7 @@ def _build_outbound(
         if inbound.mux_settings and (singbox_mux := inbound.mux_settings.get("sing_box")) and singbox_mux.get("enable"):
             # Filter out the enable field as it's not part of singbox multiplex config
             multiplex_config = {k: v for k, v in singbox_mux.items() if k != "enable"}
-            
+
             # Handle brutal configuration - only include if brutal.enable is True
             if "brutal" in multiplex_config:
                 brutal_config = multiplex_config["brutal"]
@@ -332,7 +337,7 @@ def _build_outbound(
                 else:
                     # Remove brutal config entirely if enable is False or brutal is None
                     multiplex_config.pop("brutal", None)
-            
+
             multiplex_config = self._normalize_and_remove_none_values(multiplex_config)
             config["multiplex"] = multiplex_config