GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: face msg faceType

Browse Source
This commit is contained in:
linyuchen 2024-04-11 18:57:58 +08:00
parent b5e578733f
commit f8890b309b
5 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -1,10 +1,10 @@
{ {
"manifest_version": 4, "manifest_version": 4,
"type": "extension", "type": "extension",
"name": "LLOneBot v3.22.0", "name": "LLOneBot v3.22.1",
"slug": "LLOneBot", "slug": "LLOneBot",
"description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新", "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
"version": "3.22.0", "version": "3.22.1",
"icon": "./icon.jpg", "icon": "./icon.jpg",
"authors": [ "authors": [
{ {

9
src/ntqqapi/constructor.ts
View File

@ -1,6 +1,6 @@
import { import {
AtType, AtType,
ElementType, ElementType, FaceIndex,
FaceType, FaceType,
PicType, PicType,
SendArkElement, SendArkElement,
@ -249,12 +249,13 @@ export class SendMsgElementConstructor {
} }
static face(faceId: number): SendFaceElement { static face(faceId: number): SendFaceElement {
faceId = parseInt(faceId.toString());
return { return {
elementType: ElementType.FACE, elementType: ElementType.FACE,
elementId: "", elementId: "",
faceElement: { faceElement: {
faceIndex: faceId, faceIndex: faceId,
faceType: FaceType.normal faceType: faceId < 222 ? FaceType.normal : FaceType.normal2,
} }
} }
} }
@ -268,7 +269,7 @@ export class SendMsgElementConstructor {
elementType: ElementType.FACE, elementType: ElementType.FACE,
elementId: "", elementId: "",
faceElement: { faceElement: {
faceIndex: 358, faceIndex: FaceIndex.dice,
faceType: FaceType.dice, faceType: FaceType.dice,
"faceText": "[骰子]", "faceText": "[骰子]",
"packId": "1", "packId": "1",
@ -290,7 +291,7 @@ export class SendMsgElementConstructor {
elementType: ElementType.FACE, elementType: ElementType.FACE,
elementId: "", elementId: "",
faceElement: { faceElement: {
"faceIndex": 359, "faceIndex": FaceIndex.RPS,
"faceText": "[包剪锤]", "faceText": "[包剪锤]",
"faceType": 3, "faceType": 3,
"packId": "1", "packId": "1",

6
src/ntqqapi/types/msg.ts
View File

@ -214,9 +214,15 @@ export interface GrayTipElement {
export enum FaceType { export enum FaceType {
normal=1, // 小黄脸 normal=1, // 小黄脸
normal2=2, // 新小黄脸, 从faceIndex 222开始？
dice=3 // 骰子 dice=3 // 骰子
} }
export enum FaceIndex {
dice = 358,
RPS = 359 // 石头剪刀布
}
export interface FaceElement { export interface FaceElement {
faceIndex: number, faceIndex: number,
faceType: FaceType, faceType: FaceType,

17
src/onebot11/constructor.ts
View File

@ -10,7 +10,7 @@ import {
} from "./types"; } from "./types";
import { import {
AtType, AtType,
ChatType, ChatType, FaceIndex,
GrayTipElementSubType, GrayTipElementSubType,
Group, Group,
GroupMember, GroupMember,
@ -227,8 +227,19 @@ export class OB11Constructor {
message_data["type"] = OB11MessageDataType.json; message_data["type"] = OB11MessageDataType.json;
message_data["data"]["data"] = element.arkElement.bytesData; message_data["data"]["data"] = element.arkElement.bytesData;
} else if (element.faceElement) { } else if (element.faceElement) {
message_data["type"] = OB11MessageDataType.face; const faceId = element.faceElement.faceIndex;
message_data["data"]["id"] = element.faceElement.faceIndex.toString(); if (faceId === FaceIndex.dice){
message_data["type"] = OB11MessageDataType.dice
message_data["data"]["result"] = element.faceElement.resultId;
}
else if (faceId === FaceIndex.RPS){
message_data["type"] = OB11MessageDataType.RPS
message_data["data"]["result"] = element.faceElement.resultId;
}
else{
message_data["type"] = OB11MessageDataType.face;
message_data["data"]["id"] = element.faceElement.faceIndex.toString();
}
} else if (element.marketFaceElement) { } else if (element.marketFaceElement) {
message_data["type"] = OB11MessageDataType.mface; message_data["type"] = OB11MessageDataType.mface;
message_data["data"]["text"] = element.marketFaceElement.faceName; message_data["data"]["text"] = element.marketFaceElement.faceName;

2
src/version.ts
View File

@ -1 +1 @@
export const version = "3.22.0" export const version = "3.22.1"