Skip to content

fix(entities): 修复 InterAction.getEnvType 对 chat_type 的空指针 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnnaofArendelle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(entities): 修复 InterAction.getEnvType 对 chat_type 的空指针 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/io/github/kloping/qqbot/entities/qqpd/InterAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
*/
@Data
public class InterAction implements SenderV2, SenderAndCidMidGetter {
/**
* {@link #scene} 的频道场景取值，用于 {@link #chat_type} 缺失时判定环境
*/
private static final String SCENE_GUILD = "guild";

private String id;
private Integer type;
private String scene;
Expand Down Expand Up @@ -72,7 +77,12 @@ public String getMid() {

@Override
public EnvType getEnvType() {
return chat_type == 0 ? EnvType.GUILD : EnvType.GROUP;
if (chat_type != null) {
return chat_type == 0 ? EnvType.GUILD : EnvType.GROUP;
}
// chat_type 并非每次都会下发；scene 字段承载同一信息（guild / group / c2c），
// 两者皆缺失时按群聊处理，与 chat_type 非 0 时的既有行为一致。
return SCENE_GUILD.equals(scene) ? EnvType.GUILD : EnvType.GROUP;
}

@Setter
Expand Down