From 9c0d207fbb39cb488484b10739fd98d63a8431f9 Mon Sep 17 00:00:00 2001
From: Eyre_S <sukazyo@outlook.com>
Date: Tue, 15 Mar 2022 23:10:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=20@Lapis-Apple=20=E4=B9=9F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20khh=20=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 NbnhhshQuery 类里遗留的测试 main()
- 删除 NbnhhshQuery.GuessReq 的冗余 static
- TelegramUserInformation 整理空行
---
 gradle.properties                                   |  2 +-
 .../sukazyo/cono/morny/GradleProjectConfigures.java |  4 ++--
 .../morny/bot/event/OnKuohuanhuanNeedSleep.java     | 13 +++++++++----
 .../cc/sukazyo/cono/morny/data/NbnhhshQuery.java    |  6 +-----
 .../cono/morny/util/TelegramUserInformation.java    |  1 +
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f0b6faa..8e2dad1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 ## Core
 
-VERSION = 0.6.0.2
+VERSION = 0.6.1.0
 
 # dependencies
 
diff --git a/src/main/java/cc/sukazyo/cono/morny/GradleProjectConfigures.java b/src/main/java/cc/sukazyo/cono/morny/GradleProjectConfigures.java
index 1316cb7..1bcf519 100644
--- a/src/main/java/cc/sukazyo/cono/morny/GradleProjectConfigures.java
+++ b/src/main/java/cc/sukazyo/cono/morny/GradleProjectConfigures.java
@@ -4,6 +4,6 @@ package cc.sukazyo.cono.morny;
  * the final field that will be updated by gradle automatically.
  */
 public class GradleProjectConfigures {
-	public static final String VERSION = "0.6.0.2";
-	public static final long COMPILE_TIMESTAMP = 1647237887029L;
+	public static final String VERSION = "0.6.1.0";
+	public static final long COMPILE_TIMESTAMP = 1647356707522L;
 }
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnKuohuanhuanNeedSleep.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnKuohuanhuanNeedSleep.java
index 3c7101c..8863f75 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnKuohuanhuanNeedSleep.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnKuohuanhuanNeedSleep.java
@@ -14,11 +14,16 @@ public class OnKuohuanhuanNeedSleep extends EventListener {
 	
 	@Override
 	public boolean onMessage (@Nonnull Update update) {
+		final GregorianCalendar time = new GregorianCalendar(Locale.TAIWAN);
+		time.setTimeInMillis(System.currentTimeMillis());
 		if (
-				update.message().from().id() == 786563752L && (
-						new GregorianCalendar(Locale.TAIWAN).get(Calendar.HOUR_OF_DAY) >= 23 ||
-						new GregorianCalendar(Locale.TAIWAN).get(Calendar.HOUR_OF_DAY) < 5
-				)
+				( update.message().from().id() == 786563752L && (
+						time.get(Calendar.HOUR_OF_DAY) >= 23 ||
+						time.get(Calendar.HOUR_OF_DAY) < 5
+				)) || ( update.message().from().id() == 1075871712L && (
+						(time.get(Calendar.HOUR_OF_DAY) >= 22 && time.get(Calendar.MINUTE) >= 30) ||
+						time.get(Calendar.HOUR_OF_DAY) < 5
+				))
 		) {
 			MornyCoeur.extra().exec(
 					new DeleteMessage(update.message().chat().id(),
diff --git a/src/main/java/cc/sukazyo/cono/morny/data/NbnhhshQuery.java b/src/main/java/cc/sukazyo/cono/morny/data/NbnhhshQuery.java
index 90119aa..cd1be74 100644
--- a/src/main/java/cc/sukazyo/cono/morny/data/NbnhhshQuery.java
+++ b/src/main/java/cc/sukazyo/cono/morny/data/NbnhhshQuery.java
@@ -23,7 +23,7 @@ public class NbnhhshQuery {
 		public Word[] words;
 	}
 	
-	public static record GuessReq (String text) {
+	public record GuessReq (String text) {
 	}
 	
 	public static final String API_URL = "https://lab.magiconch.com/api/nbnhhsh/";
@@ -47,8 +47,4 @@ public class NbnhhshQuery {
 		}
 	}
 	
-	public static void main(String[] args) {
-		System.out.println(new Gson().toJson(new GuessReq("8h28oey8 qe89 aoHO*)I'[ IK\"@+ )EOI)D\"{AIR\")Q @}")));
-	}
-	
 }
diff --git a/src/main/java/cc/sukazyo/cono/morny/util/TelegramUserInformation.java b/src/main/java/cc/sukazyo/cono/morny/util/TelegramUserInformation.java
index 011e4da..1514d56 100644
--- a/src/main/java/cc/sukazyo/cono/morny/util/TelegramUserInformation.java
+++ b/src/main/java/cc/sukazyo/cono/morny/util/TelegramUserInformation.java
@@ -3,6 +3,7 @@ package cc.sukazyo.cono.morny.util;
 import com.pengrad.telegrambot.model.User;
 
 import static cc.sukazyo.untitled.util.telegram.formatting.MsgEscape.escapeHtml;
+
 public class TelegramUserInformation {
 	
 	public static String informationOutputHTML (User user) {