From ae1d7987954839c6411e9b170c557a4d612aff07 Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Tue, 14 Mar 2023 10:53:30 +0800
Subject: [PATCH] feat: countdown rest time use uoj-countdown

---
 web/app/controllers/index.php        | 12 +++++++-----
 web/app/controllers/super_manage.php |  2 +-
 web/app/locale/basic/en.php          | 23 +++++++++++++----------
 web/app/locale/basic/zh-cn.php       |  7 +++++--
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/web/app/controllers/index.php b/web/app/controllers/index.php
index 516dbe4..cee4de5 100644
--- a/web/app/controllers/index.php
+++ b/web/app/controllers/index.php
@@ -90,15 +90,17 @@ $friend_links = DB::selectAll([
 				<ul class="list-unstyled mb-0">
 					<?php foreach ($countdowns as $countdown) : ?>
 						<?php
-						$enddate = strtotime($countdown['end_time']);
-						$nowdate = time();
-						$diff = ceil(($enddate - $nowdate) / (24 * 60 * 60));
+						$end_time = UOJTime::str2time($countdown['end_time'])->getTimestamp();
+						$now_time = UOJTime::$time_now->getTimestamp();
+						$diff = floor(($end_time - $now_time) / (24 * 60 * 60));
 						?>
 						<li>
 							<?php if ($diff > 0) : ?>
-								<?= UOJLocale::get('x days until countdown title', $countdown['title'], $diff) ?>
+								<?= UOJLocale::get('x days before countdown {title}', $countdown['title'], $diff) ?>
+							<?php elseif ($diff == 0) : ?>
+								<?= UOJLocale::get('{rest} before countdown {title}', $countdown['title'], $end_time - $now_time) ?>
 							<?php else : ?>
-								<?= UOJLocale::get("countdown title has begun", $countdown['title']) ?>
+								<?= UOJLocale::get("countdown {title} has begun", $countdown['title']) ?>
 							<?php endif ?>
 						</li>
 					<?php endforeach ?>
diff --git a/web/app/controllers/super_manage.php b/web/app/controllers/super_manage.php
index 8982783..c576e83 100644
--- a/web/app/controllers/super_manage.php
+++ b/web/app/controllers/super_manage.php
@@ -190,7 +190,7 @@ if ($cur_tab == 'index') {
 				return '标题不能为空';
 			}
 
-			$vdata['title'] = $title;
+			$vdata['title'] = HTML::escape($title);
 
 			return '';
 		},
diff --git a/web/app/locale/basic/en.php b/web/app/locale/basic/en.php
index 258ff0b..34820da 100644
--- a/web/app/locale/basic/en.php
+++ b/web/app/locale/basic/en.php
@@ -25,7 +25,7 @@ return [
 	'all the announcements' => 'All the Announcements……',
 	'solved' => 'Solved',
 	'top solver' => 'Top solver',
-	'n accepted in last year' => function($n) {
+	'n accepted in last year' => function ($n) {
 		return "Submitted $n AC code" . ($n > 1 ? "s" : "") . " in last year";
 	},
 	'help' => 'Help',
@@ -53,8 +53,8 @@ return [
 	'browse' => 'Browse',
 	'score range' => 'Score range',
 	'details' => 'Details',
-	'hours' => function($h) {
-		return "$h ".($h <= 1 ? 'hour' : 'hours');
+	'hours' => function ($h) {
+		return "$h " . ($h <= 1 ? 'hour' : 'hours');
 	},
 	'title' => 'Title',
 	'content' => 'Content',
@@ -64,15 +64,15 @@ return [
 	'user profile' => 'User profile',
 	'send private message' => 'Send private message',
 	'modify my profile' => 'Modify my profile',
-	'modify his profile' => function($name) {
+	'modify his profile' => function ($name) {
 		return "Modify $name's profile";
 	},
-	'visit his blog' => function($name) {
+	'visit his blog' => function ($name) {
 		return "Visit $name's blog";
 	},
 	'accepted problems' => 'Accepted problems',
-	'n problems in total' => function($n) {
-		return "$n ".($n <= 1 ? 'problem' : 'problems');
+	'n problems in total' => function ($n) {
+		return "$n " . ($n <= 1 ? 'problem' : 'problems');
 	},
 	'please enter your password for authorization' => 'Please enter your password for authorization',
 	'please enter your new profile' => 'Please enter your new profile',
@@ -90,11 +90,14 @@ return [
 	'male' => 'Male',
 	'female' => 'Female',
 	'countdowns' => 'Countdowns',
-	'countdown title has begun' => function($title) {
+	'countdown {title} has begun' => function ($title) {
 		return "<b>$title</b> has begun.";
 	},
-	'x days until countdown title' => function($title, $days) {
-		return "<b>$days</b> ".($days <= 1 ? 'day' : 'days')." until <b>$title</b>.";
+	'{rest} before countdown {title}' => function ($title, $rest_seconds) {
+		return '<b><span class="countdown" data-rest="' . $rest_seconds . '">less than a day</span></b>' . " before <b>$title</b>.";
+	},
+	'x days before countdown {title}' => function ($title, $days) {
+		return "<b>$days</b> " . ($days <= 1 ? 'day' : 'days') . " before <b>$title</b>.";
 	},
 	'friend links' => 'Frequently Used Links',
 	'server time' => 'Server Time',
diff --git a/web/app/locale/basic/zh-cn.php b/web/app/locale/basic/zh-cn.php
index 185da5d..d2d44da 100644
--- a/web/app/locale/basic/zh-cn.php
+++ b/web/app/locale/basic/zh-cn.php
@@ -90,10 +90,13 @@ return [
 	'male' => '男',
 	'female' => '女',
 	'countdowns' => '倒计时',
-	'countdown title has begun' => function($title) {
+	'countdown {title} has begun' => function($title) {
 		return "<b>$title</b> 已开始。";
 	},
-	'x days until countdown title' => function($title, $days) {
+	'{rest} before countdown {title}' => function ($title, $rest_seconds) {
+		return "距离 <b>$title</b> 还有 " . '<b><span class="countdown" data-rest="' . $rest_seconds . '">不足 1 天</span></b>。';
+	},
+	'x days before countdown {title}' => function($title, $days) {
 		return "距离 <b>$title</b> 还有 <b>$days</b> 天。";
 	},
 	'friend links' => '常用链接',