mirror of
https://github.com/LLOneBot/LLOneBot.git
synced 2024-11-22 01:56:33 +00:00
fix: some id(int and string) compatibility
This commit is contained in:
parent
0eeba1d29e
commit
963aad1510
@ -4,7 +4,7 @@
|
||||
"name": "LLOneBot",
|
||||
"slug": "LLOneBot",
|
||||
"description": "LiteLoaderQQNT的OneBotApi",
|
||||
"version": "3.1.0",
|
||||
"version": "3.1.2",
|
||||
"thumbnail": "./icon.png",
|
||||
"authors": [{
|
||||
"name": "linyuchen",
|
||||
|
@ -63,7 +63,7 @@ function onLoad() {
|
||||
if (debug) {
|
||||
msg.raw = message;
|
||||
}
|
||||
if (msg.user_id == selfInfo.uin && !reportSelfMessage) {
|
||||
if (msg.user_id.toString() == selfInfo.uin && !reportSelfMessage) {
|
||||
return
|
||||
}
|
||||
postMsg(msg);
|
||||
|
@ -18,14 +18,14 @@ export class OB11Constructor {
|
||||
const {enableBase64} = getConfigUtil().getConfig()
|
||||
const message_type = msg.chatType == ChatType.group ? "group" : "private";
|
||||
const resMsg: OB11Message = {
|
||||
self_id: selfInfo.uin,
|
||||
user_id: msg.senderUin,
|
||||
self_id: parseInt(selfInfo.uin),
|
||||
user_id: parseInt(msg.senderUin),
|
||||
time: parseInt(msg.msgTime) || 0,
|
||||
message_id: msg.msgShortId,
|
||||
real_id: msg.msgId,
|
||||
message_type: msg.chatType == ChatType.group ? "group" : "private",
|
||||
sender: {
|
||||
user_id: msg.senderUin,
|
||||
user_id: parseInt(msg.senderUin),
|
||||
nickname: msg.sendNickName,
|
||||
card: msg.sendMemberName || "",
|
||||
},
|
||||
@ -37,7 +37,7 @@ export class OB11Constructor {
|
||||
}
|
||||
if (msg.chatType == ChatType.group) {
|
||||
resMsg.sub_type = "normal"
|
||||
resMsg.group_id = msg.peerUin
|
||||
resMsg.group_id = parseInt(msg.peerUin)
|
||||
const member = await getGroupMember(msg.peerUin, msg.senderUin);
|
||||
if (member) {
|
||||
resMsg.sender.role = OB11Constructor.groupMemberRole(member.role);
|
||||
@ -135,7 +135,7 @@ export class OB11Constructor {
|
||||
|
||||
static friend(friend: User): OB11User {
|
||||
return {
|
||||
user_id: friend.uin,
|
||||
user_id: parseInt(friend.uin),
|
||||
nickname: friend.nick,
|
||||
remark: friend.remark
|
||||
}
|
||||
@ -144,7 +144,7 @@ export class OB11Constructor {
|
||||
|
||||
static selfInfo(selfInfo: SelfInfo): OB11User {
|
||||
return {
|
||||
user_id: selfInfo.uin,
|
||||
user_id: parseInt(selfInfo.uin),
|
||||
nickname: selfInfo.nick
|
||||
}
|
||||
}
|
||||
@ -163,8 +163,8 @@ export class OB11Constructor {
|
||||
|
||||
static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
|
||||
return {
|
||||
group_id,
|
||||
user_id: member.uin,
|
||||
group_id: parseInt(group_id),
|
||||
user_id: parseInt(member.uin),
|
||||
nickname: member.nick,
|
||||
card: member.cardName
|
||||
}
|
||||
@ -177,7 +177,7 @@ export class OB11Constructor {
|
||||
|
||||
static group(group: Group): OB11Group {
|
||||
return {
|
||||
group_id: group.groupCode,
|
||||
group_id: parseInt(group.groupCode),
|
||||
group_name: group.groupName
|
||||
}
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ export function startWSServer(port: number) {
|
||||
export function postMsg(msg: OB11Message) {
|
||||
const {reportSelfMessage} = getConfigUtil().getConfig()
|
||||
if (!reportSelfMessage) {
|
||||
if (msg.user_id == selfInfo.uin) {
|
||||
if (msg.user_id.toString() == selfInfo.uin) {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,7 @@ import { AtType } from "../ntqqapi/types";
|
||||
import { RawMessage } from "../ntqqapi/types";
|
||||
|
||||
export interface OB11User{
|
||||
user_id: string;
|
||||
user_id: number;
|
||||
nickname: string;
|
||||
remark?: string
|
||||
}
|
||||
@ -20,8 +20,8 @@ export enum OB11GroupMemberRole{
|
||||
}
|
||||
|
||||
export interface OB11GroupMember {
|
||||
group_id: string
|
||||
user_id: string
|
||||
group_id: number
|
||||
user_id: number
|
||||
nickname: string
|
||||
card?: string
|
||||
sex?: OB11UserSex
|
||||
@ -34,14 +34,14 @@ export interface OB11GroupMember {
|
||||
}
|
||||
|
||||
export interface OB11Group{
|
||||
group_id: string
|
||||
group_id: number
|
||||
group_name: string
|
||||
member_count?: number
|
||||
max_member_count?: number
|
||||
}
|
||||
|
||||
interface OB11Sender {
|
||||
user_id: string,
|
||||
user_id: number,
|
||||
nickname: string,
|
||||
sex?: OB11UserSex,
|
||||
age?: number,
|
||||
@ -56,12 +56,12 @@ export enum OB11MessageType {
|
||||
}
|
||||
|
||||
export interface OB11Message {
|
||||
self_id?: string,
|
||||
self_id?: number,
|
||||
time: number,
|
||||
message_id: number,
|
||||
real_id: string,
|
||||
user_id: string,
|
||||
group_id?: string,
|
||||
user_id: number,
|
||||
group_id?: number,
|
||||
message_type: "private" | "group",
|
||||
sub_type?: "friend" | "group" | "normal",
|
||||
sender: OB11Sender,
|
||||
|
Loading…
x
Reference in New Issue
Block a user