Skip to content

Commit 525ab10

Browse files
committed
feat GroupOpRobotEvent;
Support logs do not output files
1 parent c25b766 commit 525ab10

18 files changed

+244
-20
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.kloping</groupId>
88
<artifactId>bot-qqpd-java</artifactId>
9-
<version>1.5.1-Beta1</version>
9+
<version>1.5.1-Beta2</version>
1010

1111
<packaging>jar</packaging>
1212
<name>bot-qqpd-java</name>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
/**
77
* @author github.kloping
88
*/
9-
public interface GroupEvent extends Event {
9+
public interface GroupEvent extends Event, V2Event {
1010
Group getGroup();
1111

1212
String getGroupId();
13+
14+
default String getGroupOpenId() {
15+
return getGroupId();
16+
}
1317
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package io.github.kloping.qqbot.api.v2;
2+
3+
/**
4+
* @author github.kloping
5+
*/
6+
public interface GroupOpRobotEvent extends GroupEvent {
7+
String getOpMemberOpenid();
8+
9+
Long getTimestamp();
10+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* @author github.kloping
1212
*/
13-
public interface MessageV2Event extends Event, Sender {
13+
public interface MessageV2Event extends Event, Sender, V2Event {
1414
/**
1515
* 发送纯文本
1616
*
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package io.github.kloping.qqbot.api.v2;
2+
3+
/**
4+
* 机器人群聊事件
5+
*
6+
* @author github.kloping
7+
*/
8+
public interface V2Event {
9+
/**
10+
* 事件id
11+
*
12+
* @return
13+
*/
14+
String getId();
15+
16+
/**
17+
* 事情群聊openid
18+
*
19+
* @return
20+
*/
21+
String getGroupOpenId();
22+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class Pack {
1616
private Number s;
1717
private Object d;
1818
private String t;
19+
private String id;
1920

2021
public <T> T dAsMapGet(Object key, Class<T> cla) {
2122
if (d instanceof Map) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public Result send(SenderAndCidMidGetter er) {
9999
if (Judge.isNotEmpty(er.getMid())) data.setMsg_id(er.getMid());
100100
data.setMedia(new V2MsgData.Media(result.getFile_info()));
101101
data.setMsg_seq(v2.getMsgSeq());
102-
103102
return new Result<V2Result>(v2.getV2().send(er.getCid(), data.toString(), SEND_MESSAGE_HEADERS));
104103
}
105104
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class MessageAsyncBuilder implements Builder<SendAble, SendAble> {
1515

1616
private final MessageChain chain = new MessageChain();
1717

18-
1918
@Override
2019
public MessageAsyncBuilder append(SendAble sendAble) {
2120
chain.append(sendAble);
@@ -47,4 +46,11 @@ public MessageAsyncBuilder image(byte[] bytes) {
4746
public MessageAsyncBuilder text(String text) {
4847
return append(new PlainText(text));
4948
}
49+
50+
/**
51+
* @return
52+
*/
53+
public boolean isEmpty() {
54+
return chain.isEmpty();
55+
}
5056
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ public Result send(SenderAndCidMidGetter er) {
137137
} else if (e0 instanceof Markdown) {
138138
result = ((Markdown) e0).send(er, v2.getMsgSeq());
139139
sent++;
140+
} else if (e0 instanceof Keyboard) {
141+
data.setKeyboard(e0);
142+
data.setMsg_type(2);
140143
} else {
141144
data.setContent(data.getContent() + e0.toString());
142145
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public String getClassName() {
4141

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

0 commit comments

Comments
 (0)