feat: display the date of the next subs quota refresh

Author: Sh1n3zZ

app/src/api/addition.ts

@@ -20,6 +20,8 @@ type SubscriptionResponse = {
   usage: Record<string, number>;
   level: number;
   expired_at?: string;
+  refresh?: number;
+  refresh_at?: string;
 };
 
 type BuySubscriptionResponse = {

app/src/resources/i18n/cn.json

@@ -507,6 +507,8 @@
     "expired": "订阅剩余天数",
     "quota-manage": "订阅配额",
     "expired-days": "您的订阅将于 {{days}} 天后到期",
+    "refresh-days": "您的配额将于 {{refresh_days}} 天后刷新",
+    "get-refresh-days": "开始使用配额以获取刷新日期",
     "time": {
       "1": "1个月",
       "3": "3个月",

app/src/resources/i18n/en.json

@@ -303,7 +303,9 @@
     "total-price": "Total Price",
     "upgrade-price-label": "Upgrading Cost",
     "upgrade-price-notice": "For  information only",
-    "upgrade-price-notice-tip": "The upgrade fee is for reference only, and the actual price is based on the exact calculation of the server."
+    "upgrade-price-notice-tip": "The upgrade fee is for reference only, and the actual price is based on the exact calculation of the server.",
+    "refresh-days": "Your quota will refresh in {{refresh_days}} days",
+    "get-refresh-days": "Get started with quotas to get refresh dates"
   },
   "cancel": "Cancel",
   "confirm": "Confirm",

app/src/resources/i18n/ja.json

@@ -303,7 +303,9 @@
     "total-price": "合計価格",
     "upgrade-price-label": "アップグレード料金",
     "upgrade-price-notice": "参考用",
-    "upgrade-price-notice-tip": "アップグレード料金は参考用であり、実際の価格はサーバーの正確な計算に基づいています。"
+    "upgrade-price-notice-tip": "アップグレード料金は参考用であり、実際の価格はサーバーの正確な計算に基づいています。",
+    "refresh-days": "クォータは{{refresh_days}}日後に更新されます",
+    "get-refresh-days": "クォータを使用して日付を更新する"
   },
   "cancel": "キャンセル",
   "confirm": "確認",

app/src/resources/i18n/ru.json

@@ -303,7 +303,9 @@
     "total-price": "Общая цена",
     "upgrade-price-label": "Плата за повышение класса обслуживания",
     "upgrade-price-notice": "Только для информации",
-    "upgrade-price-notice-tip": "Плата за обновление указана только для справки, а фактическая цена основана на точном расчете сервера."
+    "upgrade-price-notice-tip": "Плата за обновление указана только для справки, а фактическая цена основана на точном расчете сервера.",
+    "refresh-days": "Квота обновится через {{refresh_days}} дн.",
+    "get-refresh-days": "Начните с квот, чтобы получить даты обновления"
   },
   "cancel": "Отмена",
   "confirm": "Подтвердить",

app/src/resources/i18n/tw.json

@@ -375,7 +375,9 @@
     "upgrade-price-notice": "僅供參考",
     "upgrade-price-notice-tip": "升級費用僅供參考，實際價格以伺服器精準計算為準",
     "quota-manage": "訂閱配額",
-    "expired-days": "您的訂閱將於 {{days}} 天後到期"
+    "expired-days": "您的訂閱將於 {{days}} 天後到期",
+    "refresh-days": "您的配額將於{{refresh_days}} 天後刷新",
+    "get-refresh-days": "開始使用配額以取得刷新日期"
   },
   "cancel": "取消",
   "confirm": "確認",

app/src/routes/Wallet.tsx

@@ -30,6 +30,7 @@ import {
   isSubscribedSelector,
   levelSelector,
   usageSelector,
+  refreshSelector,
 } from "@/store/subscription.ts";
 import { subscriptionDataSelector } from "@/store/globals.ts";
 import { motion, AnimatePresence } from "framer-motion";
@@ -256,6 +257,7 @@ function WalletPlanBox() {
   const subscription = useSelector(isSubscribedSelector);
   const level = useSelector(levelSelector);
   const expired = useSelector(expiredSelector);
+  const refresh = useSelector(refreshSelector);
   const usage = useSelector(usageSelector);
   const [isYearly, setIsYearly] = useState(true);
   const subscriptionData = useSelector(subscriptionDataSelector);
@@ -379,6 +381,11 @@ function WalletPlanBox() {
                     <p className="text-xs text-secondary">
                       {t("sub.expired-days", { days: expired })}
                     </p>
+                    <p className="text-xs text-secondary">
+                      {refresh > 0
+                        ? t("sub.refresh-days", { refresh_days: refresh })
+                        : t("sub.get-refresh-days")}
+                    </p>
                   </div>
                 </AccordionTrigger>
                 <AccordionContent className="p-0 h-fit">

app/src/store/subscription.ts

@@ -9,6 +9,8 @@ export const subscriptionSlice = createSlice({
     enterprise: false,
     expired: 0,
     expired_at: "",
+    refresh: 0,
+    refresh_at: "",
     usage: {},
   },
   reducers: {},
@@ -25,6 +27,8 @@ export const subscriptionSlice = createSlice({
       state.enterprise = action.payload.enterprise || false;
       state.level = action.payload.level;
       state.expired_at = action.payload.expired_at || "";
+      state.refresh = action.payload.refresh || 0;
+      state.refresh_at = action.payload.refresh_at || "";
     });
   },
 });
@@ -38,6 +42,10 @@ export const expiredSelector = (state: any): number =>
   state.subscription.expired;
 export const expiredAtSelector = (state: any): string =>
   state.subscription.expired_at;
+export const refreshSelector = (state: any): number =>
+  state.subscription.refresh;
+export const refreshAtSelector = (state: any): string =>
+  state.subscription.refresh_at;
 export const usageSelector = (state: any): any => state.subscription.usage;
 
 export const refreshSubscription = createAsyncThunk(

auth/controller.go

@@ -386,6 +386,9 @@ func SubscriptionAPI(c *gin.Context) {
 			"is_subscribed": false,
 			"enterprise":    false,
 			"expired":       0,
+			"expired_at":    "1970-01-01 00:00:00",
+			"refresh":       0,
+			"refresh_at":    "1970-01-01 00:00:00",
 			"usage":         channel.UsageMap{},
 		})
 	}
@@ -396,6 +399,9 @@ func SubscriptionAPI(c *gin.Context) {
 		"is_subscribed": user.IsSubscribe(db),
 		"enterprise":    user.IsEnterprise(db),
 		"expired":       user.GetSubscriptionExpiredDay(db),
+		"expired_at":    user.GetSubscriptionExpiredAt(db).Format("2006-01-02 15:04:05"),
+		"refresh":       user.GetSubscriptionRefreshDay(db, cache),
+		"refresh_at":    user.GetSubscriptionRefreshAt(db, cache).Format("2006-01-02 15:04:05"),
 		"usage":         user.GetSubscriptionUsage(db, cache),
 	})
 }

auth/usage.go

@@ -3,10 +3,43 @@ package auth
 import (
 	"chat/channel"
 	"database/sql"
+	"math"
+	"time"
+
 	"github.com/go-redis/redis/v8"
 )
 
 func (u *User) GetSubscriptionUsage(db *sql.DB, cache *redis.Client) channel.UsageMap {
 	plan := u.GetPlan(db)
 	return plan.GetUsage(u, db, cache)
 }
+
+func (u *User) GetSubscriptionRefreshAt(db *sql.DB, cache *redis.Client) time.Time {
+	if disableSubscription() || !u.IsSubscribe(db) {
+		return time.Unix(0, 0)
+	}
+
+	plan := u.GetPlan(db)
+	if len(plan.Items) == 0 {
+		return time.Unix(0, 0)
+	}
+
+	var next time.Time
+	for i, item := range plan.Items {
+		_, offset := channel.GetSubscriptionUsage(cache, u, item.Id)
+		n := offset.AddDate(0, 1, 0)
+		if i == 0 || n.Before(next) {
+			next = n
+		}
+	}
+	return next
+}
+
+func (u *User) GetSubscriptionRefreshDay(db *sql.DB, cache *redis.Client) int {
+	at := u.GetSubscriptionRefreshAt(db, cache)
+	if at.Unix() <= 0 {
+		return 0
+	}
+	diff := time.Until(at)
+	return int(math.Round(diff.Hours() / 24))
+}