From 1f48b3ffdca808740803b9c665a8e9c2d78692f0 Mon Sep 17 00:00:00 2001 From: LamGC Date: Mon, 25 May 2020 09:21:46 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20MessageSender,=20MessageEvent=20?= =?UTF-8?q?=E5=85=81=E8=AE=B8'senderMessage(String)'=E6=8A=9B=E5=87=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8;=20[Change]=20RandomRankingArtworksSender=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA;=20[Change]=20MiraiMessageEvent,=20?= =?UTF-8?q?MiraiMessageSender,=20SpringCQMessageEvent=20=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=9B=B4=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java | 4 ++-- src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java | 3 ++- .../cgj/bot/framework/coolq/message/SpringCQMessageEvent.java | 2 +- .../cgj/bot/framework/mirai/message/MiraiMessageEvent.java | 2 +- .../cgj/bot/framework/mirai/message/MiraiMessageSender.java | 2 +- src/main/java/net/lamgc/cgj/bot/message/MessageSender.java | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java index 8cb366d..f27e37c 100644 --- a/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java +++ b/src/main/java/net/lamgc/cgj/bot/RandomRankingArtworksSender.java @@ -92,8 +92,8 @@ public class RandomRankingArtworksSender extends AutoSender { message.append(BotCommandProcess.getImageById(0, illustId, quality, 1)); message.append("\n如有不当作品，可使用\".cgj report -id ").append(illustId).append("\"向色图姬反馈。"); getMessageSender().sendMessage(message.toString()); - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("发送随机作品时发生异常", e); } } } diff --git a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java index 1af51d7..9f52006 100644 --- a/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/event/MessageEvent.java @@ -19,9 +19,10 @@ public abstract class MessageEvent implements EventObject, MessageSender { * 发送消息 * @param message 消息内容 * @return 成功返回MessageId, 如没有MessageId则返回0, 失败返回负数错误码 + * @throws Exception 该方法根据不同实现, 可能会抛出不同异常, 详见实现所标识的文档内容. */ @Override - public abstract int sendMessage(final String message); + public abstract int sendMessage(final String message) throws Exception; /** * 获取图片下载地址. diff --git a/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java index d9b2067..6a4b056 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java @@ -36,7 +36,7 @@ public class SpringCQMessageEvent extends MessageEvent { } @Override - public int sendMessage(final String message) { + public int sendMessage(final String message) throws Exception { return messageSender.sendMessage(message); } diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java index baa8344..035e804 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java @@ -38,7 +38,7 @@ public class MiraiMessageEvent extends net.lamgc.cgj.bot.event.MessageEvent { } @Override - public int sendMessage(final String message) { + public int sendMessage(final String message) throws Exception { return messageSender.sendMessage(message); } diff --git a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java index c2680ec..22fdc98 100644 --- a/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java +++ b/src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java @@ -77,7 +77,7 @@ public class MiraiMessageSender implements MessageSender { .replaceAll("&38", "&") .split("\\|"); - MessageChain messages = MessageUtils.newChain().plus(""); + MessageChain messages = MessageUtils.newChain(); int codeIndex = 0; for(String text : texts) { if(text.equals("{BotCode}")) { diff --git a/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java b/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java index 759cb51..7e59b2c 100644 --- a/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java +++ b/src/main/java/net/lamgc/cgj/bot/message/MessageSender.java @@ -9,7 +9,8 @@ public interface MessageSender { * 返回0则发送器不支持消息Id, * 返回非0正整数则为消息Id, * 返回负数则为错误. + * @throws Exception 该方法根据不同实现, 可能会抛出不同异常, 详见实现所标识的文档内容. */ - int sendMessage(final String message); + int sendMessage(final String message) throws Exception; }