" + MsgEscape.escapeHtml(resultString) + "%s [UTC+8]\n- %s before",
MsgEscape.escapeHtml(
- CommonFormatUtils.formatDate((long)lastDinnerData.forwardDate()*1000, 8)
+ CommonFormat.formatDate((long)lastDinnerData.forwardDate()*1000, 8)
), MsgEscape.escapeHtml(
- CommonFormatUtils.formatDuration(System.currentTimeMillis()-(long)lastDinnerData.forwardDate()*1000)
+ CommonFormat.formatDuration(System.currentTimeMillis()-(long)lastDinnerData.forwardDate()*1000)
)
)
).replyToMessageId(sendResp.message().messageId()).parseMode(ParseMode.HTML));
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnCallMsgSend.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnCallMsgSend.java
index b5d7a34..d02beae 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnCallMsgSend.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnCallMsgSend.java
@@ -22,7 +22,8 @@ import cc.sukazyo.cono.morny.data.TelegramStickers;
import com.pengrad.telegrambot.response.GetChatResponse;
import com.pengrad.telegrambot.response.SendResponse;
-import static cc.sukazyo.untitled.util.telegram.formatting.MsgEscape.escapeHtml;
+import static cc.sukazyo.cono.morny.util.tgapi.formatting.MsgEscape.escapeHtml;
+
public class OnCallMsgSend extends EventListener {
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnEventHackHandle.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnEventHackHandle.java
index 7189857..ffba9b5 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnEventHackHandle.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnEventHackHandle.java
@@ -2,7 +2,7 @@ package cc.sukazyo.cono.morny.bot.event;
import cc.sukazyo.cono.morny.MornyCoeur;
import cc.sukazyo.cono.morny.bot.api.EventListener;
-import cc.sukazyo.untitled.util.telegram.formatting.MsgEscape;
+import cc.sukazyo.cono.morny.util.tgapi.formatting.MsgEscape;
import com.google.gson.GsonBuilder;
import com.pengrad.telegrambot.model.Update;
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnTelegramCommand.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnTelegramCommand.java
index 0266cfa..a74e7a5 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnTelegramCommand.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnTelegramCommand.java
@@ -2,7 +2,7 @@ package cc.sukazyo.cono.morny.bot.event;
import cc.sukazyo.cono.morny.MornyCoeur;
import cc.sukazyo.cono.morny.bot.api.EventListener;
-import cc.sukazyo.untitled.util.telegram.object.InputCommand;
+import cc.sukazyo.cono.morny.util.tgapi.InputCommand;
import com.pengrad.telegrambot.model.Update;
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserRandoms.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserRandoms.java
index 3655a97..898bdac 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserRandoms.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserRandoms.java
@@ -2,7 +2,7 @@ package cc.sukazyo.cono.morny.bot.event;
import cc.sukazyo.cono.morny.MornyCoeur;
import cc.sukazyo.cono.morny.bot.api.EventListener;
-import cc.sukazyo.untitled.util.command.CommonCommand;
+import cc.sukazyo.cono.morny.util.UniversalCommand;
import com.pengrad.telegrambot.model.Update;
import com.pengrad.telegrambot.request.SendMessage;
import org.jetbrains.annotations.NotNull;
@@ -22,7 +22,7 @@ public class OnUserRandoms extends EventListener {
if (update.message().text() == null) return false;
if (!update.message().text().startsWith("/")) return false;
- final String[] preProcess = CommonCommand.format(update.message().text());
+ final String[] preProcess = UniversalCommand.format(update.message().text());
if (preProcess.length > 1) return false;
final String query = preProcess[0];
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserSlashAction.java b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserSlashAction.java
index 900f387..cf1910b 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserSlashAction.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/event/OnUserSlashAction.java
@@ -2,9 +2,8 @@ package cc.sukazyo.cono.morny.bot.event;
import cc.sukazyo.cono.morny.MornyCoeur;
import cc.sukazyo.cono.morny.bot.api.EventListener;
-import cc.sukazyo.cono.morny.util.tgapi.TGToStringFromMessage;
-import cc.sukazyo.untitled.util.command.CommonCommand;
-import cc.sukazyo.untitled.util.string.StringArrays;
+import cc.sukazyo.cono.morny.util.UniversalCommand;
+import cc.sukazyo.cono.morny.util.tgapi.formatting.TGToString;
import com.pengrad.telegrambot.model.Message;
import com.pengrad.telegrambot.model.Update;
@@ -13,7 +12,8 @@ import com.pengrad.telegrambot.request.SendMessage;
import javax.annotation.Nonnull;
-import static cc.sukazyo.untitled.util.telegram.formatting.MsgEscape.escapeHtml;
+import static cc.sukazyo.cono.morny.util.CommonConvert.stringsConnecting;
+import static cc.sukazyo.cono.morny.util.tgapi.formatting.MsgEscape.escapeHtml;
public class OnUserSlashAction extends EventListener {
@@ -38,7 +38,7 @@ public class OnUserSlashAction extends EventListener {
// return false;
// }
- final String[] action = CommonCommand.format(text);
+ final String[] action = UniversalCommand.format(text);
action[0] = action[0].substring(1);
if (action[0].matches("^\\w+(@\\w+)?$")) {
@@ -53,7 +53,7 @@ public class OnUserSlashAction extends EventListener {
final boolean hasObject = action.length != (isHardParse?2:1);
final String object =
hasObject ?
- StringArrays.connectStringArray(action, " ", isHardParse?2:1, action.length-1) :
+ stringsConnecting(action, " ", isHardParse?2:1, action.length-1) :
"";
final Message origin = event.message();
final Message target = (event.message().replyToMessage() == null ? (
@@ -66,11 +66,11 @@ public class OnUserSlashAction extends EventListener {
event.message().chat().id(),
String.format(
"%s %s%s %s %s!",
- TGToStringFromMessage.as(origin).getSenderFirstNameRefHtml(),
+ TGToString.as(origin).getSenderFirstNameRefHtml(),
escapeHtml(verb), escapeHtml((hasObject?"":"了")),
origin==target ?
- "自己" :
- TGToStringFromMessage.as(target).getSenderFirstNameRefHtml(),
+ "自己" :
+ TGToString.as(target).getSenderFirstNameRefHtml(),
escapeHtml(hasObject ? object+" " : "")
)
).parseMode(ParseMode.HTML).replyToMessageId(event.message().messageId()));
diff --git a/src/main/java/cc/sukazyo/cono/morny/bot/query/ITelegramQuery.java b/src/main/java/cc/sukazyo/cono/morny/bot/query/ITelegramQuery.java
index b0fa978..c79ab37 100644
--- a/src/main/java/cc/sukazyo/cono/morny/bot/query/ITelegramQuery.java
+++ b/src/main/java/cc/sukazyo/cono/morny/bot/query/ITelegramQuery.java
@@ -4,11 +4,12 @@ import javax.annotation.Nullable;
import cc.sukazyo.cono.morny.bot.api.InlineQueryUnit;
import com.pengrad.telegrambot.model.Update;
-import com.pengrad.telegrambot.model.request.InlineQueryResult;
-public interface ITelegramQuery
+ * the AV id is a number; the BV id is a special base58 number, it shows as String in programming.
+ * eg:
+ * while the link {@code https://www.bilibili.com/video/BV17x411w7KC/}
+ * shows the same with {@code https://www.bilibili.com/video/av170001/},
+ * the AV id is {@code 170001}, the BV id is {@code 17x411w7KC}
+ *
+ * for now , the BV id has 10 digits. + * the method available while the av-id < 2^27, while it theoretically available when the av-id < 2^30. + * + * @see mcfx的回复: 如何看待 2020 年 3 月 23 日哔哩哔哩将稿件的「av 号」变更为「BV 号」？ + * + * @param bv the BV id, a string in (a special) base58 number format, without "BV" prefix. + * @return the AV id corresponding to this bv id in Bilibili, formatted as a number. + */ + @Nonnegative + public static long toAv (@Nonnull String bv) { + long av = 0; + for (int i = 0; i < BV_TEMPLATE_FILTER.length; i++) { + av += BV_TABLE_REVERSED.get(bv.charAt(BV_TEMPLATE_FILTER[i])) * Math.pow(TABLE_INT,i); + } + return (av-V_CONV_ADD)^V_CONV_XOR; + } + + /** + * Convert a Bilibili BV video id format to AV id format. + *
+ * the AV id is a number; the BV id is a special base58 number, it shows as String in programming.
+ * eg:
+ * while the link {@code https://www.bilibili.com/video/BV17x411w7KC/}
+ * shows the same with {@code https://www.bilibili.com/video/av170001/},
+ * the AV id is {@code 170001}, the BV id is {@code 17x411w7KC}
+ *
+ * for now , the BV id has 10 digits. + * the method available while the av-id < 2^27, while it theoretically available when the av-id < 2^30. + * + * @see mcfx的回复: 如何看待 2020 年 3 月 23 日哔哩哔哩将稿件的「av 号」变更为「BV 号」？ + * + * @param av the (base10) AV id. + * @return the AV id corresponding to this bv id in Bilibili, + * as a (special) base 58 number format without "BV" prefix. + */ + @Nonnull + public static String toBv (@Nonnegative long av) { + av = (av^V_CONV_XOR)+V_CONV_ADD; + final char[] bv = BV_TEMPLATE.clone(); + for (int i = 0; i < BV_TEMPLATE_FILTER.length; i++) { + bv[BV_TEMPLATE_FILTER[i]] = BV_TABLE[(int)(Math.floor(av/(Math.pow(TABLE_INT, i)))%TABLE_INT)]; + } + return String.copyValueOf(bv); + } + +} diff --git a/src/main/java/cc/sukazyo/cono/morny/util/CommonConvert.java b/src/main/java/cc/sukazyo/cono/morny/util/CommonConvert.java new file mode 100644 index 0000000..907cdd5 --- /dev/null +++ b/src/main/java/cc/sukazyo/cono/morny/util/CommonConvert.java @@ -0,0 +1,61 @@ +package cc.sukazyo.cono.morny.util; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +/** + * 进行简单类型转换等工作的类. + */ +public class CommonConvert { + + /** + * 将字节数组转换成 hex 字符串. + * @param b 字节数组 + * @return String 格式的字节数组的 hex 值（每个字节当中没有分隔符） + * @see #byteToHex(byte) + */ + @Nonnull + public static String byteArrayToHex(@Nonnull byte[] b){ + StringBuilder sb = new StringBuilder(); + for (byte value : b) { + sb.append(byteToHex(value)); + } + return sb.toString(); + } + + /** + * 将一个字节转换成十六进制 hex 字符串. + * @param b 字节值 + * @return String 格式的字节的 hex 值（小写） + */ + @Nonnull + public static String byteToHex(byte b) { + final String hex = Integer.toHexString(b & 0xff); + return hex.length()<2?"0"+hex:hex; + } + + /** + * 将一个字符串数组按照一定规则连接. + *
+ * 连接的方式类似于"数据1+分隔符+数据2+分隔符+...+数据n-1+分隔符+数据n" + * + * @param array 需要进行连接的字符串数组，数组中每一个元素会是一个数据 + * @param connector 在每两个传入数据中插入的分隔符 + * @param startIndex 从传入的数据组中的哪一个位置开始（第一个元素的位置是 {@code 0}） + * @param stopIndex 从传入的数据组中的哪一个位置停止（元素位置计算方式同上） + * @return 连接好的字符串 + */ + @Nonnull + public static String stringsConnecting ( + @Nonnull String[] array, @Nonnull String connector, @Nonnegative int startIndex, @Nonnegative int stopIndex + ) { + final StringBuilder builder = new StringBuilder(); + for (int i = startIndex; i < stopIndex; i++) { + builder.append(array[i]); + builder.append(connector); + } + builder.append(array[stopIndex]); + return builder.toString(); + } + +} diff --git a/src/main/java/cc/sukazyo/cono/morny/util/CommonEncrypt.java b/src/main/java/cc/sukazyo/cono/morny/util/CommonEncrypt.java new file mode 100644 index 0000000..0e9c35d --- /dev/null +++ b/src/main/java/cc/sukazyo/cono/morny/util/CommonEncrypt.java @@ -0,0 +1,144 @@ +package cc.sukazyo.cono.morny.util; + +import javax.annotation.Nonnull; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; + +/** + * 用于数据加密或编解码的工具类. + *
+ * 出于 java std 中 Base64 的 {@link Base64.Encoder encode}/{@link Base64.Decoder decode} 十分好用，在此不再进行包装。 + */ +public class CommonEncrypt { + + /** + * 在使用加密算法处理字符串时默认会使用的字符串编码. + *
+ * Morny 使用 UTF-8 编码因为这是一般而言加解密工具的默认行为 + */ + public static final Charset ENCRYPT_STANDARD_CHARSET = StandardCharsets.UTF_8; + + @Nonnull + private static byte[] hashAsJavaMessageDigest(String algorithm, @Nonnull byte[] data) { + try { + return MessageDigest.getInstance(algorithm).digest(data); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException(e); + } + } + + /** + * 取得数据的 md5 散列值. + * + * @param data byte 数组形式的数据体 + * @return 二进制(byte数组)格式的数据的 md5 散列值 + */ + @Nonnull + public static byte[] hashMd5 (@Nonnull byte[] data) { + return hashAsJavaMessageDigest("md5", data); + } + + /** + * 取得一个字符串的 md5 散列值. + *
+ * 输入的字符串将会以 {@link #ENCRYPT_STANDARD_CHARSET 默认的 UTF-8} 编码进行解析 + * + * @param originString 要进行散列的字符串 + * @return 二进制(byte数组)格式的 md5 散列值 + */ + @Nonnull + public static byte[] hashMd5 (String originString) { + return hashMd5(originString.getBytes(ENCRYPT_STANDARD_CHARSET)); + } + + /** + * 取得数据的 sha1 散列值. + * + * @param data byte 数组形式的数据体 + * @return 二进制(byte数组)格式的数据的 sha1 散列值 + */ + @Nonnull + public static byte[] hashSha1 (@Nonnull byte[] data) { + return hashAsJavaMessageDigest("sha1", data); + } + + /** + * 取得一个字符串的 sha1 散列值. + *
+ * 输入的字符串将会以 {@link #ENCRYPT_STANDARD_CHARSET 默认的 UTF-8} 编码进行解析 + * + * @param originString 要进行散列的字符串 + * @return 二进制(byte数组)格式的 sha1 散列值 + */ + @Nonnull + public static byte[] hashSha1 (String originString) { + return hashMd5(originString.getBytes(ENCRYPT_STANDARD_CHARSET)); + } + + /** + * 取得数据的 sha256 散列值. + * + * @param data byte 数组形式的数据体 + * @return 二进制(byte数组)格式的数据的 sha256 散列值 + */ + @Nonnull + public static byte[] hashSha256 (@Nonnull byte[] data) { + return hashAsJavaMessageDigest("sha256", data); + } + + /** + * 取得一个字符串的 sha256 散列值. + *
+ * 输入的字符串将会以 {@link #ENCRYPT_STANDARD_CHARSET 默认的 UTF-8} 编码进行解析 + * + * @param originString 要进行散列的字符串 + * @return 二进制(byte数组)格式的 sha256 散列值 + */ + @Nonnull + public static byte[] hashSha256 (String originString) { + return hashMd5(originString.getBytes(ENCRYPT_STANDARD_CHARSET)); + } + + /** + * 取得数据的 sha512 散列值. + * + * @param data byte 数组形式的数据体 + * @return 二进制(byte数组)格式的数据的 sha512 散列值 + */ + @Nonnull + public static byte[] hashSha512 (@Nonnull byte[] data) { + return hashAsJavaMessageDigest("md5", data); + } + + /** + * 取得一个字符串的 sha512 散列值. + *
+ * 输入的字符串将会以 {@link #ENCRYPT_STANDARD_CHARSET 默认的 UTF-8} 编码进行解析
+ *
+ * @param originString 要进行散列的字符串
+ * @return 二进制(byte数组)格式的 sha512 散列值
+ */
+ @Nonnull
+ public static byte[] hashSha512 (String originString) {
+ return hashMd5(originString.getBytes(ENCRYPT_STANDARD_CHARSET));
+ }
+
+ @Nonnull
+ public static String base64FilenameLint (String inputName) {
+ if (inputName.endsWith(".b64")) {
+ return inputName.substring(0, inputName.length()-".b64".length());
+ } else if (inputName.endsWith(".b64.txt")) {
+ return inputName.substring(0, inputName.length()-".b64.txt".length());
+ } else if (inputName.endsWith(".base64")) {
+ return inputName.substring(0, inputName.length()-".base64".length());
+ } else if (inputName.endsWith(".base64.txt")) {
+ return inputName.substring(0, inputName.length()-".base64.txt".length());
+ } else {
+ return inputName;
+ }
+ }
+
+}
diff --git a/src/main/java/cc/sukazyo/cono/morny/util/CommonFormatUtils.java b/src/main/java/cc/sukazyo/cono/morny/util/CommonFormat.java
similarity index 79%
rename from src/main/java/cc/sukazyo/cono/morny/util/CommonFormatUtils.java
rename to src/main/java/cc/sukazyo/cono/morny/util/CommonFormat.java
index c629548..0598ba6 100644
--- a/src/main/java/cc/sukazyo/cono/morny/util/CommonFormatUtils.java
+++ b/src/main/java/cc/sukazyo/cono/morny/util/CommonFormat.java
@@ -6,10 +6,12 @@ import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
-public class CommonFormatUtils {
+public class CommonFormat {
+
+ public static final String DATE_TIME_PATTERN_FULL_MILLIS = "yyyy-MM-dd HH:mm:ss:SSS";
public static String formatDate (long timestamp, int utcOffset) {
- return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss:SSS").format(LocalDateTime.ofInstant(
+ return DateTimeFormatter.ofPattern(DATE_TIME_PATTERN_FULL_MILLIS).format(LocalDateTime.ofInstant(
Instant.ofEpochMilli(timestamp),
ZoneId.ofOffset("UTC", ZoneOffset.ofHours(utcOffset))
));
diff --git a/src/main/java/cc/sukazyo/cono/morny/util/EncryptUtils.java b/src/main/java/cc/sukazyo/cono/morny/util/EncryptUtils.java
deleted file mode 100644
index 243389a..0000000
--- a/src/main/java/cc/sukazyo/cono/morny/util/EncryptUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cc.sukazyo.cono.morny.util;
-
-import javax.annotation.Nonnull;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-/**
- * 用于数据加密或编码的工具类
- * 显然大部分代码是抄来的
- *