feat GroupOpRobotEvent;

Support logs do not output files

Author: Kloping

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.kloping</groupId>
     <artifactId>bot-qqpd-java</artifactId>
-    <version>1.5.1-Beta1</version>
+    <version>1.5.1-Beta2</version>
 
     <packaging>jar</packaging>
     <name>bot-qqpd-java</name>

src/main/java/io/github/kloping/qqbot/api/v2/GroupEvent.java

@@ -6,8 +6,12 @@
 /**
  * @author github.kloping
  */
-public interface GroupEvent extends Event {
+public interface GroupEvent extends Event, V2Event {
     Group getGroup();
 
     String getGroupId();
+
+    default String getGroupOpenId() {
+        return getGroupId();
+    }
 }

src/main/java/io/github/kloping/qqbot/api/v2/GroupOpRobotEvent.java

@@ -0,0 +1,10 @@
+package io.github.kloping.qqbot.api.v2;
+
+/**
+ * @author github.kloping
+ */
+public interface GroupOpRobotEvent extends GroupEvent {
+    String getOpMemberOpenid();
+
+    Long getTimestamp();
+}

src/main/java/io/github/kloping/qqbot/api/v2/MessageV2Event.java

@@ -10,7 +10,7 @@
 /**
  * @author github.kloping
  */
-public interface MessageV2Event extends Event, Sender {
+public interface MessageV2Event extends Event, Sender, V2Event {
     /**
      * 发送纯文本
      *

src/main/java/io/github/kloping/qqbot/api/v2/V2Event.java

@@ -0,0 +1,22 @@
+package io.github.kloping.qqbot.api.v2;
+
+/**
+ * 机器人群聊事件
+ *
+ * @author github.kloping
+ */
+public interface V2Event {
+    /**
+     * 事件id
+     *
+     * @return
+     */
+    String getId();
+
+    /**
+     * 事情群聊openid
+     *
+     * @return
+     */
+    String getGroupOpenId();
+}

src/main/java/io/github/kloping/qqbot/entities/Pack.java

@@ -16,6 +16,7 @@ public class Pack {
     private Number s;
     private Object d;
     private String t;
+    private String id;
 
     public <T> T dAsMapGet(Object key, Class<T> cla) {
         if (d instanceof Map) {

src/main/java/io/github/kloping/qqbot/entities/ex/Image.java

@@ -99,7 +99,6 @@ public Result send(SenderAndCidMidGetter er) {
             if (Judge.isNotEmpty(er.getMid())) data.setMsg_id(er.getMid());
             data.setMedia(new V2MsgData.Media(result.getFile_info()));
             data.setMsg_seq(v2.getMsgSeq());
-
             return new Result<V2Result>(v2.getV2().send(er.getCid(), data.toString(), SEND_MESSAGE_HEADERS));
         }
     }

src/main/java/io/github/kloping/qqbot/entities/ex/MessageAsyncBuilder.java

@@ -15,7 +15,6 @@ public class MessageAsyncBuilder implements Builder<SendAble, SendAble> {
 
     private final MessageChain chain = new MessageChain();
 
-
     @Override
     public MessageAsyncBuilder append(SendAble sendAble) {
         chain.append(sendAble);
@@ -47,4 +46,11 @@ public MessageAsyncBuilder image(byte[] bytes) {
     public MessageAsyncBuilder text(String text) {
         return append(new PlainText(text));
     }
+
+    /**
+     * @return
+     */
+    public boolean isEmpty() {
+        return chain.isEmpty();
+    }
 }

src/main/java/io/github/kloping/qqbot/entities/ex/msg/MessageChain.java

@@ -137,6 +137,9 @@ public Result send(SenderAndCidMidGetter er) {
                 } else if (e0 instanceof Markdown) {
                     result = ((Markdown) e0).send(er, v2.getMsgSeq());
                     sent++;
+                } else if (e0 instanceof Keyboard) {
+                    data.setKeyboard(e0);
+                    data.setMsg_type(2);
                 } else {
                     data.setContent(data.getContent() + e0.toString());
                 }

src/main/java/io/github/kloping/qqbot/impl/BaseConnectedEvent.java

@@ -41,6 +41,6 @@ public String getClassName() {
 
     @Override
     public String toString() {
-        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-Beta1", bot.getConfig().getAppid());
+        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-Beta2", bot.getConfig().getAppid());
     }
 }