v1.5.1-L3 fix bug #27;

初步支持消息列表(好友)事件;
完善新版emoji 新增超级表情emoji;

Author: Kloping

.gitignore

@@ -1,3 +1,4 @@
+logs/*
 temp*
 # Project exclude paths
 src/test/java/temp/gs/**
@@ -9,7 +10,6 @@ temp.json
 temp.http
 bot-qqpd-java.iml
 test_temp.java
-logs
 src/test/java/temp/*
 /src/test/java/test_temp_public.java
 /src/test/java/test_temp_private.java

pom.xml

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

src/main/java/io/github/kloping/qqbot/api/event/Event.java

@@ -23,6 +23,13 @@ public interface Event {
      */
     Bot getBot();
 
+    /**
+     * 事件id
+     *
+     * @return
+     */
+    String getId();
+
     default String getClassName() {
         return this.getClass().getSimpleName();
     }

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

@@ -0,0 +1,7 @@
+package io.github.kloping.qqbot.api.v2;
+
+/**
+ * @author github.kloping
+ */
+public interface FriendAdd extends FriendEvent {
+}

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

@@ -0,0 +1,16 @@
+package io.github.kloping.qqbot.api.v2;
+
+import io.github.kloping.qqbot.entities.qqpd.v2.Contact;
+import io.github.kloping.qqbot.entities.qqpd.v2.Friend;
+
+/**
+ * @author github.kloping
+ */
+public interface FriendEvent extends V2Event {
+    /**
+     * get friend
+     *
+     * @return
+     */
+    Friend getFriend();
+}

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

@@ -0,0 +1,14 @@
+package io.github.kloping.qqbot.api.v2;
+
+import io.github.kloping.qqbot.entities.qqpd.v2.Friend;
+
+/**
+ * @author github.kloping
+ */
+public interface FriendMessageEvent extends FriendEvent, MessageV2Event {
+    @Override
+    Friend getSender();
+
+    @Override
+    Friend getSubject();
+}

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

@@ -1,17 +1,21 @@
 package io.github.kloping.qqbot.api.v2;
 
-import io.github.kloping.qqbot.api.event.Event;
 import io.github.kloping.qqbot.entities.qqpd.v2.Group;
 
 /**
  * @author github.kloping
  */
-public interface GroupEvent extends Event, V2Event {
+public interface GroupEvent extends V2Event {
     Group getGroup();
 
     String getGroupId();
 
     default String getGroupOpenId() {
         return getGroupId();
     }
+
+    @Override
+    default String getOpenId() {
+        return getGroupOpenId();
+    }
 }

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

@@ -15,12 +15,4 @@ public interface GroupMessageEvent extends GroupEvent, MessageEvent<Contact,Grou
      * @return
      */
     Group getSubject();
-
-
-    /**
-     * 设置消息序列号并返回原序列号
-     * @param seq
-     * @return
-     */
-    Integer setMsgSeq(Integer seq);
 }

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

@@ -42,4 +42,12 @@ public interface MessageV2Event extends Event, Sender, V2Event {
      * @return
      */
     Contact getSubject();
+
+
+    /**
+     * 设置消息序列号并返回原序列号
+     * @param seq
+     * @return
+     */
+    Integer setMsgSeq(Integer seq);
 }

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

@@ -1,22 +1,14 @@
 package io.github.kloping.qqbot.api.v2;
 
+import io.github.kloping.qqbot.api.event.Event;
+
 /**
- * 机器人群聊事件
- *
  * @author github.kloping
  */
-public interface V2Event {
-    /**
-     * 事件id
-     *
-     * @return
-     */
-    String getId();
-
+public interface V2Event extends Event {
     /**
-     * 事情群聊openid
-     *
-     * @return
+     * 所处环境 openid  可能是 user openid 或 group openid
+      * @return
      */
-    String getGroupOpenId();
+    String getOpenId();
 }