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();
 }

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

@@ -15,20 +15,24 @@ public class At implements SendAble {
     public static final String MEMBER_TYPE = "member";
     public static final String CHANNEL_TYPE = "channel";
 
-    private String type;
+    private String type = "member";
     private String targetId;
 
     public At(String type, String targetId) {
         this.type = type;
         this.targetId = targetId;
     }
 
+    public At(String targetId) {
+        this.targetId = targetId;
+    }
+
     @Override
     public String toString() {
         if (CHANNEL_TYPE.equals(type)) {
             return "<#" + targetId + ">";
         } else if (MEMBER_TYPE.equals(type)) {
-            return "<@!" + targetId + ">";
+            return String.format("<qqbot-at-user id=\"%s\" />", targetId);
         } else return "@";
     }
 

src/main/java/io/github/kloping/qqbot/entities/ex/enums/EnvType.java

@@ -6,5 +6,5 @@
  * @author github.kloping
  */
 public enum EnvType {
-    GUILD, GROUP, GROUP_USER
+    GUILD, GROUP, GROUP_USER, USER
 }

src/main/java/io/github/kloping/qqbot/entities/qqpd/data/Emoji.java

@@ -285,6 +285,56 @@ public class Emoji implements SendAble {
     public static final Emoji 你真棒棒 = new Emoji(1, 346, "你真棒棒");
     public static final Emoji 大展宏兔 = new Emoji(1, 347, "大展宏兔");
     public static final Emoji 福萝卜 = new Emoji(1, 348, "福萝卜");
+    public static final Emoji 亲亲 = new Emoji(1, 360, "亲亲");
+    public static final Emoji 狗狗笑哭 = new Emoji(1, 361, "狗狗笑哭");
+    public static final Emoji 好兄弟 = new Emoji(1, 362, "好兄弟");
+    public static final Emoji 狗狗可怜 = new Emoji(1, 363, "狗狗可怜");
+    public static final Emoji 超级赞 = new Emoji(1, 364, "超级赞");
+    public static final Emoji 狗狗生气 = new Emoji(1, 365, "狗狗生气");
+    public static final Emoji 芒狗 = new Emoji(1, 366, "芒狗");
+    public static final Emoji 狗狗疑问 = new Emoji(1, 367, "狗狗疑问");
+    public static final Emoji 奥特笑哭 = new Emoji(1, 368, "奥特笑哭");
+    public static final Emoji 彩虹 = new Emoji(1, 369, "彩虹");
+    public static final Emoji 祝贺 = new Emoji(1, 370, "祝贺");
+    public static final Emoji 冒泡 = new Emoji(1, 371, "冒泡");
+    public static final Emoji 气呼呼 = new Emoji(1, 372, "气呼呼");
+    public static final Emoji 忙 = new Emoji(1, 373, "忙");
+    public static final Emoji 波波流泪 = new Emoji(1, 374, "波波流泪");
+    public static final Emoji 超级鼓掌 = new Emoji(1, 375, "超级鼓掌");
+    public static final Emoji 跺脚 = new Emoji(1, 376, "跺脚");
+    public static final Emoji 嗨 = new Emoji(1, 377, "嗨");
+    public static final Emoji 企鹅笑哭 = new Emoji(1, 378, "企鹅笑哭");
+    public static final Emoji 企鹅流泪 = new Emoji(1, 379, "企鹅流泪");
+    public static final Emoji 真棒 = new Emoji(1, 380, "真棒");
+    public static final Emoji 路过 = new Emoji(1, 381, "路过");
+    public static final Emoji emo = new Emoji(1, 382, "emo");
+    public static final Emoji 企鹅爱心 = new Emoji(1, 383, "企鹅爱心");
+    public static final Emoji 晚安 = new Emoji(1, 384, "晚安");
+    public static final Emoji 太气了 = new Emoji(1, 385, "太气了");
+    public static final Emoji 呜呜呜 = new Emoji(1, 386, "呜呜呜");
+    public static final Emoji 太好笑 = new Emoji(1, 387, "太好笑");
+    public static final Emoji 太头疼 = new Emoji(1, 388, "太头疼");
+    public static final Emoji 太赞了 = new Emoji(1, 389, "太赞了");
+    public static final Emoji 太头秃 = new Emoji(1, 390, "太头秃");
+    public static final Emoji 太沧桑 = new Emoji(1, 391, "太沧桑");
+    public static final Emoji 狼狗 = new Emoji(1, 396, "狼狗");
+    public static final Emoji 抛媚眼 = new Emoji(1, 397, "抛媚眼");
+    public static final Emoji 超级ok = new Emoji(1, 398, "超级ok");
+    public static final Emoji tui = new Emoji(1, 399, "tui");
+    public static final Emoji 快乐 = new Emoji(1, 400, "快乐");
+    public static final Emoji 超级旋转 = new Emoji(1, 401, "超级旋转");
+    public static final Emoji 别说话 = new Emoji(1, 402, "别说话");
+    public static final Emoji 出去玩 = new Emoji(1, 403, "出去玩");
+    public static final Emoji 闪亮登场 = new Emoji(1, 404, "闪亮登场");
+    public static final Emoji 好运来 = new Emoji(1, 405, "好运来");
+    public static final Emoji 姐是女王 = new Emoji(1, 406, "姐是女王");
+    public static final Emoji 我听听 = new Emoji(1, 407, "我听听");
+    public static final Emoji 臭美 = new Emoji(1, 408, "臭美");
+    public static final Emoji 送你花花 = new Emoji(1, 409, "送你花花");
+    public static final Emoji 么么哒 = new Emoji(1, 410, "么么哒");
+    public static final Emoji 一起嗨 = new Emoji(1, 411, "一起嗨");
+    public static final Emoji 开心 = new Emoji(1, 412, "开心");
+    public static final Emoji 摇起来 = new Emoji(1, 413, "摇起来");
     /**
      * 以上是qq emoji
      * <hr>
@@ -335,7 +385,7 @@ public class Emoji implements SendAble {
     public static final Emoji 汗2 = new Emoji(2, 128531, "😓 汗");
     public static final Emoji 失落 = new Emoji(2, 128532, "😔 失落");
     public static final Emoji 飞吻2 = new Emoji(2, 128536, "😘 飞吻");
-    public static final Emoji 亲亲 = new Emoji(2, 128538, "😚 亲亲");
+    public static final Emoji 亲亲2 = new Emoji(2, 128538, "😚 亲亲");
     public static final Emoji 淘气 = new Emoji(2, 128540, "😜 淘气");
     public static final Emoji 吐舌 = new Emoji(2, 128541, "😝 吐舌");
     public static final Emoji 大哭2 = new Emoji(2, 128557, "😭 大哭");

src/main/java/io/github/kloping/qqbot/entities/qqpd/v2/Friend.java

@@ -0,0 +1,64 @@
+package io.github.kloping.qqbot.entities.qqpd.v2;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import io.github.kloping.qqbot.api.SendAble;
+import io.github.kloping.qqbot.api.SenderAndCidMidGetter;
+import io.github.kloping.qqbot.api.SenderV2;
+import io.github.kloping.qqbot.entities.ex.enums.EnvType;
+import io.github.kloping.qqbot.entities.qqpd.Channel;
+import io.github.kloping.qqbot.entities.qqpd.message.RawMessage;
+import io.github.kloping.qqbot.http.BaseV2;
+import io.github.kloping.qqbot.http.data.Result;
+import io.github.kloping.qqbot.http.data.V2MsgData;
+import io.github.kloping.qqbot.http.data.V2Result;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author github.kloping
+ */
+@EqualsAndHashCode(callSuper = true)
+public class Friend extends Contact implements SenderAndCidMidGetter, SenderV2 {
+    public Friend(JSONObject mate) {
+        super(mate);
+        if (getMeta().containsKey("openid")) {
+            String id = getMeta().getString("openid");
+            this.setId(id);
+            this.setOpenid(openid);
+        } else {
+            this.setId(this.getMeta().getString("id"));
+            this.setOpenid(this.getMeta().getString("user_openid"));
+        }
+    }
+
+    @Override
+    public Result<V2Result> send(String text) {
+        V2MsgData data = new V2MsgData().setContent(text);
+        return new Result<V2Result>(bot.userBaseV2.send(getOpenid(), JSON.toJSONString(data), Channel.SEND_MESSAGE_HEADERS));
+    }
+
+    @Override
+    public Result<V2Result> send(String text, RawMessage message) {
+        return message.send(text);
+    }
+
+    @Override
+    public Result send(SendAble msg) {
+        return msg.send(this);
+    }
+
+    @Override
+    public String getCid() {
+        return getOpenid();
+    }
+
+    @Override
+    public EnvType getEnvType() {
+        return EnvType.GROUP_USER;
+    }
+
+    @Override
+    public BaseV2 getV2() {
+        return getBot().userBaseV2;
+    }
+}

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

@@ -22,4 +22,9 @@ public BaseChannelEvent(JSONObject jo, Bot bot) {
     public Channel getChannel() {
         return channel;
     }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
+    }
 }

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

@@ -41,6 +41,11 @@ 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-Beta3", bot.getConfig().getAppid());
+        return String.format("Bot(%s) Connected! By author kloping of bot-qqpd-java for version 1.5.1-L3", bot.getConfig().getAppid());
+    }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
     }
 }

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

@@ -31,4 +31,9 @@ public String getUnionWorldId() {
     public String toString() {
         return String.format("guild(%s) id(%s) info change", guild.getName(), guild.getId());
     }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
+    }
 }

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

@@ -68,4 +68,9 @@ public String toString() {
                 , getInterAction().getData().getResolved().getButton_id()
                 , getInterAction().getCid());
     }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
+    }
 }

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

@@ -31,4 +31,9 @@ public MemberWithGuildID getMember() {
     public String toString() {
         return String.format("member(%s) remove from %s", member.getNick(), guild.getName());
     }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
+    }
 }

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

@@ -32,4 +32,9 @@ public MemberWithGuildID getMember() {
     public String toString() {
         return String.format("member(%s) in %s info change", member.getNick(), guild.getName());
     }
+
+    @Override
+    public String getId() {
+        return getMetadata().get("id").toString();
+    }
 }

src/main/java/io/github/kloping/qqbot/impl/message/BaseMessageEvent.java

@@ -126,4 +126,9 @@ public MessageChain getMessage() {
     public void setFilter(Class<?>[] filters) {
         this.filters = filters;
     }
+
+    @Override
+    public String getId() {
+        return getRawMessage().getId();
+    }
 }