Merge branch 'ImMohammad20000-more_format_variables' into dev

Gozargah · Nov 18, 2023 · 472e5d3 · 472e5d3
2 parents 43ae256 + 9969200
commit 472e5d3
Show file tree

Hide file tree

Showing 7 changed files with 204 additions and 161 deletions.
diff --git a/app/dashboard/public/locales/en.json b/app/dashboard/public/locales/en.json
@@ -75,6 +75,8 @@
   "hostsDialog.remainingData": "Remaining data of the user",
   "hostsDialog.dataLimit": "The usage limit of the user",
   "hostsDialog.remainingDays": "Remaining days of the user",
+  "hostsDialog.expireDate": "Expiry date of the user",
+  "hostsDialog.jalaliExpireDate": "Expiry date of the user in solar calendar",
   "hostsDialog.remainingTime": "Remaining time of the user",
   "hostsDialog.statusEmoji": "User status as an emoji (✅,⌛️,🪫,❌)",
   "hostsDialog.proxyProtocol": "Proxy protocol (e.g. VMess)",

diff --git a/app/dashboard/public/locales/fa.json b/app/dashboard/public/locales/fa.json
@@ -78,6 +78,8 @@
   "hostsDialog.remainingData": "حجم باقی‌مانده کاربر",
   "hostsDialog.dataLimit": "حد مصرف کاربر",
   "hostsDialog.remainingDays": "روزهای باقی مانده کاربر",
+  "hostsDialog.expireDate": "تاریخ انقضای کاربر به میلادی",
+  "hostsDialog.jalaliExpireDate": "تاریخ انقضای کاربر به شمسی",
   "hostsDialog.remainingTime": "زمان باقی مانده کاربر",
   "hostsDialog.statusEmoji": "وضعیت کاربر در قالب اموجی (✅,⌛️,🪫,❌)",
   "hostsDialog.proxyProtocol": "پروتکل پروکسی (مانند VMess)",

diff --git a/app/dashboard/public/locales/ru.json b/app/dashboard/public/locales/ru.json
diff --git a/app/dashboard/public/locales/zh.json b/app/dashboard/public/locales/zh.json
@@ -71,6 +71,8 @@
   "hostsDialog.remainingData": "用户剩余流量情况",
   "hostsDialog.dataLimit": "用户的流量限制",
   "hostsDialog.remainingDays": "用户的剩余天数",
+  "hostsDialog.expireDate": "用户的有效期",
+  "hostsDialog.jalaliExpireDate": "用户阳历有效日期",
   "hostsDialog.remainingTime": "用户剩余时间",
   "hostsDialog.statusEmoji": "用户状态作为表情符号 (✅,⌛️,🪫,❌)",
   "hostsDialog.proxyProtocol": "代理协议（例如 VMess）",
@@ -130,4 +132,4 @@
   "resetAllUsage.prompt": "此操作将清除所有用户统计，您确定要执行此操作吗？ 这不能被撤消！",
   "resetAllUsage.success": "所有统计重置完成。",
   "resetAllUsage.error": "重置失败，请稍候再试！"
-}
+}
diff --git a/app/dashboard/src/components/HostsDialog.tsx b/app/dashboard/src/components/HostsDialog.tsx
@@ -7,7 +7,7 @@ import {
   Badge,
   Box,
   Button,
-  chakra,
+  Select as ChakraSelect,
   FormControl,
   FormErrorMessage,
   FormLabel,
@@ -28,11 +28,11 @@ import {
   PopoverContent,
   PopoverTrigger,
   Portal,
-  Select as ChakraSelect,
   Text,
   Tooltip,
-  useToast,
   VStack,
+  chakra,
+  useToast,
 } from "@chakra-ui/react";
 import { InformationCircleIcon, LinkIcon } from "@heroicons/react/24/outline";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -271,6 +271,18 @@ const AccordionInbound: FC<AccordionInboundType> = ({
                                   </Badge>{" "}
                                   {t("hostsDialog.remainingDays")}
                                 </Text>
+                                <Text mt={1}>
+                                  <Badge>
+                                    {"{"}EXPIRE_DATE{"}"}
+                                  </Badge>{" "}
+                                  {t("hostsDialog.expireDate")}
+                                </Text>
+                                <Text mt={1}>
+                                  <Badge>
+                                    {"{"}JALALI_EXPIRE_DATE{"}"}
+                                  </Badge>{" "}
+                                  {t("hostsDialog.jalaliExpireDate")}
+                                </Text>
                                 <Text mt={1}>
                                   <Badge>
                                     {"{"}TIME_LEFT{"}"}
@@ -369,6 +381,18 @@ const AccordionInbound: FC<AccordionInboundType> = ({
                                   </Badge>{" "}
                                   {t("hostsDialog.remainingDays")}
                                 </Text>
+                                <Text mt={1}>
+                                  <Badge>
+                                    {"{"}EXPIRE_DATE{"}"}
+                                  </Badge>{" "}
+                                  {t("hostsDialog.expireDate")}
+                                </Text>
+                                <Text mt={1}>
+                                  <Badge>
+                                    {"{"}JALALI_EXPIRE_DATE{"}"}
+                                  </Badge>{" "}
+                                  {t("hostsDialog.jalaliExpireDate")}
+                                </Text>
                                 <Text mt={1}>
                                   <Badge>
                                     {"{"}TIME_LEFT{"}"}

diff --git a/app/utils/share.py b/app/utils/share.py
@@ -8,6 +8,7 @@
 from uuid import UUID
 
 import yaml
+from jdatetime import date as jd
 
 from app import xray
 from app.models.proxy import FormatVariables
@@ -811,19 +812,26 @@ def setup_format_variables(extra_data: dict) -> dict:
     if user_status != UserStatus.on_hold:
         if expire_timestamp is not None and expire_timestamp >= 0:
             seconds_left = expire_timestamp - int(dt.utcnow().timestamp())
-            days_left = (dt.fromtimestamp(
-                expire_timestamp) - dt.utcnow()).days + 1
+            expire_datetime = dt.fromtimestamp(expire_timestamp)
+            expire_date = expire_datetime.date()
+            jalali_expire_date = jd.fromgregorian(
+                year=expire_date.year, month=expire_date.month, day=expire_date.day).strftime("%Y-%m-%d")
+            days_left = (expire_datetime - dt.utcnow()).days + 1
             time_left = format_time_left(seconds_left)
         else:
             days_left = '∞'
             time_left = '∞'
+            expire_date = '∞'
+            jalali_expire_date = '∞'
     else:
         if on_hold_expire_duration is not None and on_hold_expire_duration >= 0:
             days_left = timedelta(seconds=on_hold_expire_duration).days
             time_left = format_time_left(on_hold_expire_duration)
         else:
             days_left = '∞'
             time_left = '∞'
+            expire_date = '∞'
+            jalali_expire_date = '∞'
 
     if extra_data.get('data_limit'):
         data_limit = readable_size(extra_data['data_limit'])
@@ -844,6 +852,8 @@ def setup_format_variables(extra_data: dict) -> dict:
         "DATA_LIMIT": data_limit,
         "DATA_LEFT": data_left,
         "DAYS_LEFT": days_left,
+        "EXPIRE_DATE": expire_date,
+        "JALALI_EXPIRE_DATE": jalali_expire_date,
         "TIME_LEFT": time_left,
         "STATUS_EMOJI": status_emoji
     }

diff --git a/requirements.txt b/requirements.txt
@@ -21,6 +21,7 @@ httptools==0.5.0
 idna==3.4
 importlib-metadata==5.1.0
 importlib-resources==5.10.0
+jdatetime==4.1.1
 Jinja2==3.1.2
 Mako==1.2.4
 markdown-it-py==2.2.0